Changeset 13926 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2018-06-13T01:33:47+02:00 (6 years ago)

Author:

Don-vip

Message:

add AbstractOsmDataLayer, MainLayerManager.getActiveData, Main.getInProgressISelection

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -63 +63 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -230 +232 @@
 
     private final PreferenceChangedListener preferenceListener = e -> {
-                if (MainApplication.getLayerManager().getActiveDataSet() != null) {
+                if (MainApplication.getLayerManager().getActiveData() != null) {
                     // Re-load data when display preference change
                     updateSelection();
@@ -488 +490 @@
         OsmDataLayer layer = MainApplication.getLayerManager().getActiveDataLayer();
         if (!layer.isLocked()) {
-            RelationEditor.getEditor(
-                    layer, relation, ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
+            List<RelationMember> members = new ArrayList<>();
+            for (IRelationMember<?> rm : ((MemberInfo) membershipData.getValueAt(row, 1)).role) {
+                if (rm instanceof RelationMember) {
+                    members.add((RelationMember) rm);
+                }
+            }
+            RelationEditor.getEditor(layer, relation, members).setVisible(true);
         }
     }
@@ -533 +540 @@
     public void setVisible(boolean b) {
         super.setVisible(b);
-        if (b && MainApplication.getLayerManager().getActiveDataSet() != null) {
+        if (b && MainApplication.getLayerManager().getActiveData() != null) {
             updateSelection();
         }
@@ -559 +566 @@
 
         // Ignore parameter as we do not want to operate always on real selection here, especially in draw mode
-        Collection<OsmPrimitive> newSel = Optional.ofNullable(Main.main.getInProgressSelection()).orElseGet(Collections::emptyList);
+        Collection<? extends IPrimitive> newSel = Optional.ofNullable(Main.main.getInProgressISelection()).orElseGet(Collections::emptyList);
         String selectedTag;
         Relation selectedRelation = null;
@@ -578 +585 @@
         valueCount.clear();
         Set<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
-        for (OsmPrimitive osm : newSel) {
+        for (IPrimitive osm : newSel) {
             types.add(TaggingPresetType.forPrimitive(osm));
             for (String key : osm.keySet()) {
@@ -610 +617 @@
         membershipData.setRowCount(0);
 
-        Map<Relation, MemberInfo> roles = new HashMap<>();
-        for (OsmPrimitive primitive: newSel) {
-            for (OsmPrimitive ref: primitive.getReferrers(true)) {
-                if (ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted()) {
-                    Relation r = (Relation) ref;
+        Map<IRelation<?>, MemberInfo> roles = new HashMap<>();
+        for (IPrimitive primitive: newSel) {
+            for (IPrimitive ref: primitive.getReferrers(true)) {
+                if (ref instanceof IRelation && !ref.isIncomplete() && !ref.isDeleted()) {
+                    IRelation<?> r = (IRelation<?>) ref;
                     MemberInfo mi = Optional.ofNullable(roles.get(r)).orElseGet(() -> new MemberInfo(newSel));
                     roles.put(r, mi);
                     int i = 1;
-                    for (RelationMember m : r.getMembers()) {
+                    for (IRelationMember<?> m : r.getMembers()) {
                         if (m.getMember() == primitive) {
                             mi.add(m, i);
@@ -628 +635 @@
         }
 
-        List<Relation> sortedRelations = new ArrayList<>(roles.keySet());
+        List<IRelation<?>> sortedRelations = new ArrayList<>(roles.keySet());
         sortedRelations.sort((o1, o2) -> {
             int comp = Boolean.compare(o1.isDisabledAndHidden(), o2.isDisabledAndHidden());
@@ -634 +641 @@
         });
 
-        for (Relation r: sortedRelations) {
+        for (IRelation<?> r: sortedRelations) {
             membershipData.addRow(new Object[]{r, roles.get(r)});
         }
@@ -888 +895 @@
 
     static class MemberInfo {
-        private final List<RelationMember> role = new ArrayList<>();
-        private Set<OsmPrimitive> members = new HashSet<>();
+        private final List<IRelationMember<?>> role = new ArrayList<>();
+        private Set<IPrimitive> members = new HashSet<>();
         private List<Integer> position = new ArrayList<>();
-        private Collection<OsmPrimitive> selection;
+        private Collection<? extends IPrimitive> selection;
         private String positionString;
         private String roleString;
 
-        MemberInfo(Collection<OsmPrimitive> selection) {
+        MemberInfo(Collection<? extends IPrimitive> selection) {
             this.selection = selection;
         }
 
-        void add(RelationMember r, Integer p) {
+        void add(IRelationMember<?> r, Integer p) {
             role.add(r);
             members.add(r.getMember());
@@ -921 +928 @@
         String getRoleString() {
             if (roleString == null) {
-                for (RelationMember r : role) {
+                for (IRelationMember<?> r : role) {
                     if (roleString == null) {
                         roleString = r.getRole();
@@ -1175 +1182 @@
                 return;
             String key = editHelper.getDataKey(tagTable.getSelectedRow());
-            Collection<OsmPrimitive> sel = Main.main.getInProgressSelection();
+            Collection<? extends IPrimitive> sel = Main.main.getInProgressISelection();
             if (sel.isEmpty())
                 return;
@@ -1183 +1190 @@
     }
 
-    static SearchSetting createSearchSetting(String key, Collection<OsmPrimitive> sel, boolean sameType) {
+    static SearchSetting createSearchSetting(String key, Collection<? extends IPrimitive> sel, boolean sameType) {
         String sep = "";
         StringBuilder s = new StringBuilder();
         Set<String> consideredTokens = new TreeSet<>();
-        for (OsmPrimitive p : sel) {
+        for (IPrimitive p : sel) {
             String val = p.get(key);
             if (val == null || (!sameType && consideredTokens.contains(val))) {