Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ModuleSelection.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | c26fb37899ca |
comparison
equal
deleted
inserted
replaced
8854:7bbfb24e6eec | 8860:28df64078f27 |
---|---|
57 | 57 |
58 /** */ | 58 /** */ |
59 protected Module[] modules; | 59 protected Module[] modules; |
60 | 60 |
61 /** The ModuleService used to retrieve the available modules of a user.*/ | 61 /** The ModuleService used to retrieve the available modules of a user.*/ |
62 protected ModuleServiceAsync moduleService = GWT.create(ModuleService.class); | 62 protected ModuleServiceAsync moduleService = GWT.create( |
63 ModuleService.class); | |
63 | 64 |
64 private Map<String, List<String> > modulesRiverMap; | 65 private Map<String, List<String> > modulesRiverMap; |
65 protected Map<String, HLayout> rivers; | 66 protected Map<String, HLayout> rivers; |
66 | 67 |
67 /** | 68 /** |
121 | 122 |
122 private void checkRivers(String selected) { | 123 private void checkRivers(String selected) { |
123 if (selected == null) { | 124 if (selected == null) { |
124 selected = getSelectedModule(); | 125 selected = getSelectedModule(); |
125 } | 126 } |
126 if (rivers != null && !rivers.isEmpty() && modules != null && selected != null) { | 127 if (rivers != null |
128 && !rivers.isEmpty() | |
129 && modules != null | |
130 && selected != null | |
131 ) { | |
127 List<String> allowedRivers = modulesRiverMap.get(selected); | 132 List<String> allowedRivers = modulesRiverMap.get(selected); |
128 if ( allowedRivers == null ) { | 133 if ( allowedRivers == null ) { |
129 GWT.log("No configured rivers for module: " + selected); | 134 GWT.log("No configured rivers for module: " + selected); |
130 } | 135 } |
131 for (Map.Entry<String, HLayout> s: rivers.entrySet()) { | 136 for (Map.Entry<String, HLayout> s: rivers.entrySet()) { |
141 } | 146 } |
142 } | 147 } |
143 } | 148 } |
144 | 149 |
145 private void setModules() { | 150 private void setModules() { |
146 LinkedHashMap<String, String> values = new LinkedHashMap<String, String>(); | 151 LinkedHashMap<String, String> values = |
152 new LinkedHashMap<String, String>(); | |
147 | 153 |
148 if (this.modules!= null) { | 154 if (this.modules!= null) { |
149 for(Module module : this.modules) { | 155 for(Module module : this.modules) { |
150 values.put(module.getName(), module.getLocalizedName()); | 156 values.put(module.getName(), module.getLocalizedName()); |
151 if (module.isSelected()) { | 157 if (module.isSelected()) { |