| ... |
... |
@@ -24,9 +24,12 @@ package fr.ird.observe.client.ui.tree.selection.nodes; |
|
24
|
24
|
|
|
25
|
25
|
import com.google.common.collect.ImmutableList;
|
|
26
|
26
|
import com.google.common.collect.ImmutableSet;
|
|
|
27
|
+import fr.ird.observe.client.ObserveSwingApplicationContext;
|
|
|
28
|
+import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper;
|
|
27
|
29
|
import fr.ird.observe.services.dto.referential.ReferentialDto;
|
|
28
|
30
|
import java.util.Iterator;
|
|
29
|
31
|
import org.apache.commons.collections4.EnumerationUtils;
|
|
|
32
|
+import org.jetbrains.annotations.NotNull;
|
|
30
|
33
|
|
|
31
|
34
|
|
|
32
|
35
|
import static org.nuiton.i18n.I18n.t;
|
| ... |
... |
@@ -41,7 +44,7 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri |
|
41
|
44
|
|
|
42
|
45
|
public static ReferentialsSelectionTreeNode of(String name, ImmutableSet<Class<? extends ReferentialDto>> types) {
|
|
43
|
46
|
ReferentialsSelectionTreeNode result = new ReferentialsSelectionTreeNode(t(name));
|
|
44
|
|
- for (Class<? extends ReferentialDto> aClass : types) {
|
|
|
47
|
+ for (Class<? extends ReferentialDto> aClass : ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale())) {
|
|
45
|
48
|
ReferentialSelectionTreeNode child = new ReferentialSelectionTreeNode<>(aClass);
|
|
46
|
49
|
result.add(child);
|
|
47
|
50
|
}
|
| ... |
... |
@@ -56,7 +59,7 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri |
|
56
|
59
|
}
|
|
57
|
60
|
}
|
|
58
|
61
|
|
|
59
|
|
- public ReferentialsSelectionTreeNode(String name) {
|
|
|
62
|
+ private ReferentialsSelectionTreeNode(String name) {
|
|
60
|
63
|
super(name, true);
|
|
61
|
64
|
}
|
|
62
|
65
|
|
| ... |
... |
@@ -80,8 +83,10 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri |
|
80
|
83
|
return null;
|
|
81
|
84
|
}
|
|
82
|
85
|
|
|
|
86
|
+ @NotNull
|
|
83
|
87
|
@Override
|
|
84
|
88
|
public Iterator<ReferentialSelectionTreeNode<?>> iterator() {
|
|
|
89
|
+ //noinspection unchecked
|
|
85
|
90
|
return (Iterator) EnumerationUtils.toList(children()).iterator();
|
|
86
|
91
|
}
|
|
87
|
92
|
|