Changeset 34005 in osm for applications/editors/josm/plugins/indoorhelper/src/model

Timestamp:

2018-01-13T18:19:22+01:00 (7 years ago)

Author:

donvip

Message:

code cleanup

Location:

applications/editors/josm/plugins/indoorhelper/src/model

Files:

• IndoorHelperModel.java (modified) (11 diffs)
• PresetCounter.java (modified) (1 diff)
• TagCatalog.java (modified) (5 diffs)

applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java

@@ -46 +46 @@
  * @author rebsc
  */
-public class IndoorHelperModel{
+public class IndoorHelperModel {
 
     private TagCatalog tags;
@@ -74 +74 @@
      * directly to the relation otherwise add it to nodes and/or ways.
      *
+     * @author rebsc
      * @param object the object which defines the tag-set you want to add
      * @param userTags the tags which are given by the user input
-     * @author rebsc
-     */
-        public void addTagsToOSM(IndoorObject object, List<Tag> userTags) {
+     */
+    public void addTagsToOSM(IndoorObject object, List<Tag> userTags) {
         if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
 
-                DataSet ds = Main.main.getEditDataSet();
+            DataSet ds = Main.main.getEditDataSet();
             List<Tag> tags = this.getObjectTags(object);
             Collection<Relation> relations = ds.getRelations();
@@ -92 +92 @@
 
             // Put value on {@link relationToAdd} if selected object is a relation.
-            relationToAdd = getRelationFromDataSet(ds,relations);
-
-            if(relationToAdd != null) {
-                //Add tags to relation
-                for (Tag t : tags) {
-                                Main.main.undoRedo.add(new ChangePropertyCommand(relationToAdd, t.getKey(), t.getValue()));
-                }
-            }else{
-                //Add tags to ways or nodes
-                    for (Tag t : tags) {
-                        Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
-                    }
+            relationToAdd = getRelationFromDataSet(ds, relations);
+
+            if (relationToAdd != null) {
+                //Add tags to relation
+                for (Tag t : tags) {
+                        Main.main.undoRedo.add(new ChangePropertyCommand(relationToAdd, t.getKey(), t.getValue()));
+                }
+            } else {
+                //Add tags to ways or nodes
+                for (Tag t : tags) {
+                    Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
+                }
             }
         //If the selected dataset is empty
         } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
 
-                JOptionPane.showMessageDialog(null, tr("No data selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, tr("No data selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -117 +117 @@
      * @param object the object which defines the tag-set you want to add
      */
-        public void addTagsToOSM(IndoorObject object) {
+    public void addTagsToOSM(IndoorObject object) {
 
         if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
@@ -138 +138 @@
      * Method which adds a list of tag-sets to the currently selected OSM data. Tags directly to ways and/or nodes.
      *
+     * @author rebsc
      * @param userTags the tags which are given by the user input
-     * @author rebsc
-     */
-        public void addTagsToOSM(List<Tag> userTags) {
+     */
+    public void addTagsToOSM(List<Tag> userTags) {
 
         if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
@@ -149 +149 @@
                 Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
             }
-        }
-        else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
+        } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
             JOptionPane.showMessageDialog(null, tr("No data selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
         }
@@ -158 +157 @@
      * Method which adds the relation to OSM data. Also adds the selected tag-set to relation object.
      *
+     * @author rebsc
      * @param String the Multipolygon Role as String
-     * @author rebsc
-     */
-        public void addRelation(String role){
-        Relation newRelation = new Relation();
-        RelationMember newMember;
-        DataSet ds = Main.main.getEditDataSet();
+     */
+    public void addRelation(String role) {
+        Relation newRelation = new Relation();
+        RelationMember newMember;
+        DataSet ds = Main.main.getEditDataSet();
 
         // Create new relation and add a new member with specific role
-        if(!MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
-                for (OsmPrimitive osm : ds.getSelected()) {
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
+            for (OsmPrimitive osm : ds.getSelected()) {
                  newMember = new RelationMember(role == null ? "" : role, osm);
                  newRelation.addMember(newMember);
             }
-        }
-        // Add relation to OSM data
+        }
+        // Add relation to OSM data
         MainApplication.undoRedo.add(new AddCommand(MainApplication.getLayerManager().getEditDataSet(), newRelation));
     }
@@ -180 +179 @@
      * Method which edits the selected object to the currently selected OSM data (relations).
      *
+     * @author rebsc
      * @param role The Multipolygon Role as String
-     * @param relation
-     * @author rebsc
-     */
-        public void editRelation(String role, Collection<OsmPrimitive> innerRelation){
-
-        RelationMember newMember;
-        DataSet ds = Main.main.getEditDataSet();
-        Collection<Relation> relations = ds.getRelations();
-        Relation relation = getRelationFromDataSet(ds,relations);
+     */
+    public void editRelation(String role, Collection<OsmPrimitive> innerRelation) {
+
+        RelationMember newMember;
+        DataSet ds = Main.main.getEditDataSet();
+        Collection<Relation> relations = ds.getRelations();
+        Relation relation = getRelationFromDataSet(ds, relations);
 
         if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty() &&
-                        !innerRelation.isEmpty() && getRole(ds,relations).equals("outer")) {
-
-                //Add new relation member to selected relation
+                !innerRelation.isEmpty() && getRole(ds, relations).equals("outer")) {
+
+            //Add new relation member to selected relation
             for (OsmPrimitive osm : innerRelation) {
                  newMember = new RelationMember(role == null ? "" : role, osm);
@@ -201 +199 @@
 
         //Check if dataset is not empty or if {@link innerRelation} has no value
-        }else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty() || innerRelation.isEmpty()) {
+        } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty() || innerRelation.isEmpty()) {
             JOptionPane.showMessageDialog(null, tr("No data selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
 
         //If selected object is not a relation member or not a relation member with role "outer"
-        }else if(!getRole(ds,relations).equals("outer")) {
-                JOptionPane.showMessageDialog(null, tr("No relation or no relation member with role \"outer\" selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
-        }
-
-    }
-
-  /**
+        } else if (!getRole(ds, relations).equals("outer")) {
+            JOptionPane.showMessageDialog(null,
+                    tr("No relation or no relation member with role \"outer\" selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    /**
      * Returns the current ranking of the preset counter, which includes the 4 most used items.
      *
@@ -220 +218 @@
     }
 
-
-
-/*************************************************
-* HELPER METHODS
-*
-*/
-
     /**
      * Function which returns the the relation (if any) of the currently selected object.
      * If not returns null.
+     * @author rebsc
      * @param ds actual working dataset
      * @param relations collection of relations in the dataset
      * @return relation of currently selected dataset
-     * @author rebsc
      */
     private Relation getRelationFromDataSet(DataSet ds, Collection<Relation> relations) {
-        for(Relation r: relations) {
-                for(RelationMember rm: r.getMembers()) {
-                        for(OsmPrimitive osm: ds.getSelected()) {
-                                if(rm.refersTo(osm)) {
-                                        return r;
-                                }
-                        }
-                }
-        }
-        return null;
+        for (Relation r: relations) {
+            for (RelationMember rm: r.getMembers()) {
+                for (OsmPrimitive osm: ds.getSelected()) {
+                    if (rm.refersTo(osm)) {
+                        return r;
+                    }
+                }
+            }
+        }
+        return null;
     }
 
@@ -251 +242 @@
      * Function which returns the relation role (if any) of the currently selected object.
      * If object is not a relation returns empty string.
+     * @author rebsc
      * @param ds active dataset
      * @param relations collection of relations in the dataset
      * @return role of currently selected relation member if any
-     * @author rebsc
      */
     private String getRole(DataSet ds, Collection<Relation> relations) {
 
-        if(isRelationMember(ds,relations)) {
-                for(Relation r: relations) {
-                        for(RelationMember rm: r.getMembers()) {
-                                for(OsmPrimitive osm: ds.getSelected()) {
-                                        if(rm.refersTo(osm)) {
-                                                return rm.getRole();
-                                        }
-                                }
-                        }
-                }
-        }
-        return "";
+        if (isRelationMember(ds, relations)) {
+            for (Relation r: relations) {
+                for (RelationMember rm: r.getMembers()) {
+                    for (OsmPrimitive osm: ds.getSelected()) {
+                        if (rm.refersTo(osm)) {
+                            return rm.getRole();
+                        }
+                    }
+                }
+            }
+        }
+        return "";
     }
 
     /**
      * Function which returns true if the currently selected object is a relation
+     * @author rebsc
      * @param ds active dataset
      * @return true if selected object is a relation
-     * @author rebsc
      */
     private boolean isRelationMember(DataSet ds, Collection<Relation> relations) {
-        for(Relation r: relations) {
-                for(RelationMember rm: r.getMembers()) {
-                        for(OsmPrimitive osm: ds.getSelected()) {
-                                if(rm.refersTo(osm)) {
-                                        return true;
-                                }
-                        }
-                }
-        }
-        return false;
-    }
-
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*/
+        for (Relation r: relations) {
+            for (RelationMember rm: r.getMembers()) {
+                for (OsmPrimitive osm: ds.getSelected()) {
+                    if (rm.refersTo(osm)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }

applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java

@@ -137 +137 @@
             return 0;
         }
-
     }
-
-
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*/
 }

applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java

@@ -19 +19 @@
 
 package model;
-
-/**
- * Class to provide the indoor tagging catalog.
- *
- * @author egru
- * @author rebsc
- *
- */
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -53 +44 @@
         case DOOR_PRIVATE:
             tagList.add(new Tag("door", "yes"));
-            tagList.add(new Tag ("access","private"));
+            tagList.add(new Tag("access", "private"));
             return tagList;
         case DOOR_PUBLIC:
             tagList.add(new Tag("door", "yes"));
-            tagList.add(new Tag ("access","public"));
+            tagList.add(new Tag("access", "public"));
             return tagList;
         case ELEVATOR:
@@ -69 +60 @@
             return tagList;
         case ACCESS_PRIVATE:
-                tagList.add(new Tag("access","private"));
-                return tagList;
+            tagList.add(new Tag("access", "private"));
+            return tagList;
         case ACCESS_PUBLIC:
-                tagList.add(new Tag("access","public"));
-                return tagList;
+            tagList.add(new Tag("access", "public"));
+            return tagList;
         case TOILET_FEMALE:
             tagList.add(new Tag("indoor", "room"));
@@ -95 +86 @@
             return tagList;
         case CORRIDOR:
-                tagList.add(new Tag("indoor", "corridor"));
-                return tagList;
+            tagList.add(new Tag("indoor", "corridor"));
+            return tagList;
         case BENCH:
-                tagList.add(new Tag("amenity","bench"));
-                return tagList;
+            tagList.add(new Tag("amenity", "bench"));
+            return tagList;
         case ZONE:
-                tagList.add(new Tag("area","zone"));
-                return tagList;
+            tagList.add(new Tag("area", "zone"));
+            return tagList;
         case NONE:
-                return tagList;
+            return tagList;
         default:
             tagList = null;
@@ -116 +107 @@
      * @author egru
      * @author rebsc
-     *
      */
     public enum IndoorObject {
         CONCRETE_WALL, GLASS_WALL, ROOM, TOILET_MALE, TOILET_FEMALE, ELEVATOR, DOOR_PRIVATE, DOOR_PUBLIC, ENTRANCE,
-        ENTRANCE_EXIT_ONLY,ACCESS_PRIVATE,ACCESS_PUBLIC,STEPS,CORRIDOR,BENCH,ZONE,NONE;
+        ENTRANCE_EXIT_ONLY, ACCESS_PRIVATE, ACCESS_PUBLIC, STEPS, CORRIDOR, BENCH, ZONE, NONE;
     }
-
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*/
 }