Changeset 34005 in osm for applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

Timestamp:

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

Author:

donvip

Message:

code cleanup

File:

• applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (modified) (26 diffs)

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -83 +83 @@
    private EnterAction EnterAction;
    private transient Shortcut EnterShortcut;
-   private boolean OuterHelp,InnerHelp,LevelHelp;
+   private boolean OuterHelp, InnerHelp, LevelHelp;
    private Collection<OsmPrimitive> innerRelation;
    private LevelSelectorView selectorView;
@@ -93 +93 @@
    public IndoorHelperController() {
 
-           this.model = new IndoorHelperModel();
+       this.model = new IndoorHelperModel();
        this.toolboxView = new ToolBoxView();
 
@@ -115 +115 @@
                "", KeyEvent.VK_SPACE, Shortcut.DIRECT);
        this.SpaceAction = new SpaceAction();
-       MainApplication.registerActionShortcut(SpaceAction,SpaceShortcut);
+       MainApplication.registerActionShortcut(SpaceAction, SpaceShortcut);
 
        EnterShortcut = Shortcut.registerShortcut("mapmode:ALT",
                "", KeyEvent.VK_ENTER, Shortcut.DIRECT);
        this.EnterAction = new EnterAction();
-       MainApplication.registerActionShortcut(EnterAction,EnterShortcut);
+       MainApplication.registerActionShortcut(EnterAction, EnterShortcut);
 
        // Helper
@@ -126 +126 @@
        InnerHelp = false;
        LevelHelp = false;
-           innerRelation = null;
-           levelValue = new String();
-           levelNum = new String();
+       innerRelation = null;
+       levelValue = new String();
+       levelNum = new String();
 
    }
@@ -166 +166 @@
     }
 
-/*************************************************
-* TOOLBOX LISTENER
-*
-*/
-
    /**
     * The listener which provides the handling of the apply button.
@@ -186 +181 @@
            IndoorObject indoorObject = toolboxView.getSelectedObject();
 
-                   // collecting all tags
+               // collecting all tags
                List<Tag> tags = new ArrayList<>();
                if (toolboxView.getLevelCheckBoxStatus() == false && !levelValue.equals("")) {
-                   tags.add(new Tag("level",levelValue));
+                   tags.add(new Tag("level", levelValue));
                }
-                   if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
-                           tags.add(new Tag("level_name",toolboxView.getLevelNameText()));
-                   }
+                  if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
+                      tags.add(new Tag("level_name", toolboxView.getLevelNameText()));
+                  }
                if (!toolboxView.getNameText().isEmpty()) {
                    tags.add(new Tag("name", toolboxView.getNameText()));
@@ -200 +195 @@
                    tags.add(new Tag("ref", toolboxView.getRefText()));
                }
-               if (!toolboxView.getRepeatOnText().isEmpty()){
-                                tags.add(new Tag("repeat_on",toolboxView.getRepeatOnText()));
-                   }
-                   if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
-                           tags.add(new Tag("level_name",toolboxView.getLevelNameText()));
-                   }
+               if (!toolboxView.getRepeatOnText().isEmpty()) {
+                       tags.add(new Tag("repeat_on", toolboxView.getRepeatOnText()));
+                  }
+                  if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
+                      tags.add(new Tag("level_name", toolboxView.getLevelNameText()));
+                  }
 
            // Tagging to OSM Data
@@ -236 +231 @@
                toolboxView.setNRUiElementsEnabled(true);
                toolboxView.setROUiElementsEnabled(false);
-           }
-           else if (toolboxView.getSelectedObject().equals(IndoorObject.STEPS) ||
-                        toolboxView.getSelectedObject().equals(IndoorObject.ELEVATOR)) {
-                        toolboxView.setROUiElementsEnabled(true);
-                        toolboxView.setNRUiElementsEnabled(true);
-                }
-           else {
+           } else if (toolboxView.getSelectedObject().equals(IndoorObject.STEPS) ||
+                   toolboxView.getSelectedObject().equals(IndoorObject.ELEVATOR)) {
+                    toolboxView.setROUiElementsEnabled(true);
+                    toolboxView.setNRUiElementsEnabled(true);
+           } else {
                toolboxView.setROUiElementsEnabled(false);
            }
@@ -253 +246 @@
     * @author rebsc
     */
-   class ToolLevelCheckBoxListener implements ItemListener{
+   class ToolLevelCheckBoxListener implements ItemListener {
        @Override
        public void itemStateChanged(ItemEvent e) {
-           if(e.getStateChange() == ItemEvent.SELECTED) {
-                   toolboxView.setLVLUiElementsEnabled(false);
-           }
-           else {
-                   toolboxView.setLVLUiElementsEnabled(true);
-           }
+           if (e.getStateChange() == ItemEvent.SELECTED) {
+               toolboxView.setLVLUiElementsEnabled(false);
+           } else {
+               toolboxView.setLVLUiElementsEnabled(true);
+           }
        }
    }
@@ -270 +262 @@
     * @author rebsc
     */
-   static class ToolHelpButtonListener implements ActionListener{
-
-           @Override
-           public void actionPerformed(ActionEvent e) {
-                   String topic = "indoorHelper";
-                   //Open HelpBrowser for short description about the plugin
-                   HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/"));
-           }
+   static class ToolHelpButtonListener implements ActionListener {
+
+       @Override
+       public void actionPerformed(ActionEvent e) {
+           String topic = "indoorHelper";
+           //Open HelpBrowser for short description about the plugin
+           HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/"));
+       }
    }
 
@@ -285 +277 @@
     * @author rebsc
     */
-   class ToolAddLevelButtonListener implements ActionListener{
-
-           @Override
-           public void actionPerformed(ActionEvent e) {
-
-                   if(selectorView == null) {
-                           selectorView = new LevelSelectorView();
-                           addLevelSelectorListeners();
-
-                           //Show LevelSelectorView
-                           selectorView.setVisible(true);
-                   } else {
-                           //Put focus back on LevelSelectorView
-                           selectorView.toFront();
-                   }
-
-           }
+   class ToolAddLevelButtonListener implements ActionListener {
+
+       @Override
+       public void actionPerformed(ActionEvent e) {
+
+           if (selectorView == null) {
+               selectorView = new LevelSelectorView();
+               addLevelSelectorListeners();
+
+               //Show LevelSelectorView
+               selectorView.setVisible(true);
+           } else {
+               //Put focus back on LevelSelectorView
+               selectorView.toFront();
+           }
+
+       }
    }
 
@@ -309 +301 @@
     * @author rebsc
     */
-   class ToolMultiCheckBoxListener implements ItemListener{
+   class ToolMultiCheckBoxListener implements ItemListener {
        @Override
        public void itemStateChanged(ItemEvent e) {
-           if(e.getStateChange() == ItemEvent.SELECTED) {
-                   toolboxView.setMultiUiElementsEnabled(false);
-           }
-           else {
-                   toolboxView.setMultiUiElementsEnabled(true);
-           }
+           if (e.getStateChange() == ItemEvent.SELECTED) {
+               toolboxView.setMultiUiElementsEnabled(false);
+           } else {
+               toolboxView.setMultiUiElementsEnabled(true);
+           }
        }
    }
@@ -326 +317 @@
     * @author rebsc
     */
-   class ToolOuterButtonListener implements ActionListener{
-
-           @Override
-           public void actionPerformed(ActionEvent e) {
-                   // Select drawing action
-                   map.selectMapMode(drawAction);
-
-                   // For space shortcut to add the relation after spacebar got pushed {@link SpaceAction}
-                   OuterHelp = true;
-                   InnerHelp = false;
-           }
+   class ToolOuterButtonListener implements ActionListener {
+
+       @Override
+       public void actionPerformed(ActionEvent e) {
+           // Select drawing action
+           map.selectMapMode(drawAction);
+
+           // For space shortcut to add the relation after spacebar got pushed {@link SpaceAction}
+           OuterHelp = true;
+           InnerHelp = false;
+       }
    }
 
@@ -345 +336 @@
     */
    class ToolInnerButtonListener implements ActionListener {
-           @Override
-           public void actionPerformed(ActionEvent e) {
-                   // Select drawing action
-                   map.selectMapMode(drawAction);
-
-                   // For space shortcut to edit the relation after enter got pushed {@link SpaceAction}{@link EnterAction}
-                   InnerHelp = true;
-                   OuterHelp = false;
-
-           }
+       @Override
+       public void actionPerformed(ActionEvent e) {
+           // Select drawing action
+           map.selectMapMode(drawAction);
+
+           // For space shortcut to edit the relation after enter got pushed {@link SpaceAction}{@link EnterAction}
+           InnerHelp = true;
+           OuterHelp = false;
+
+       }
    }
 
@@ -416 +407 @@
    }
 
-/*************************************************
-* LEVEL SELCTOR VIEW LISTENER
-*
-*/
    /**
     * Specific listener for the applyButton
@@ -429 +416 @@
        @Override
        public void actionPerformed(ActionEvent e) {
-           LevelHelp = true;
-
-           //Get insert level number out of SelectorView
-           if(!selectorView.getLevelNumber().equals("")) {
-                   levelNum = selectorView.getLevelNumber();
-
-                   //Unset visibility
-                   selectorView.dispose();
-                   //Select draw-action
-                   map.selectMapMode(drawAction);
-
-           }else {
-                   JOptionPane.showMessageDialog(null, tr("Please insert a value."), tr("Error"), JOptionPane.ERROR_MESSAGE);
-           }
-
-           selectorView = null;
+           LevelHelp = true;
+
+           // Get insert level number out of SelectorView
+           if (!selectorView.getLevelNumber().equals("")) {
+               levelNum = selectorView.getLevelNumber();
+
+               //Unset visibility
+               selectorView.dispose();
+               //Select draw-action
+               map.selectMapMode(drawAction);
+
+           } else {
+               JOptionPane.showMessageDialog(null, tr("Please insert a value."), tr("Error"), JOptionPane.ERROR_MESSAGE);
+           }
+
+           selectorView = null;
        }
    }
@@ -467 +454 @@
     *
     */
-   class ToolSelectorWindowSListener implements WindowListener{
-
-        @Override
-        public void windowClosed(WindowEvent e) {
-                selectorView = null;
-        }
-
-        @Override
-        public void windowClosing(WindowEvent e) {
-                selectorView = null;
-        }
-
-        @Override
-        public void windowActivated(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void windowDeactivated(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void windowDeiconified(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void windowIconified(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void windowOpened(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-
-        }
-   }
-
-
-/*************************************************
-* SHORTCUT METHODS
-*
-*/
+   class ToolSelectorWindowSListener implements WindowListener {
+
+    @Override
+    public void windowClosed(WindowEvent e) {
+        selectorView = null;
+    }
+
+    @Override
+    public void windowClosing(WindowEvent e) {
+        selectorView = null;
+    }
+
+    @Override
+    public void windowActivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void windowDeactivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void windowDeiconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void windowIconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void windowOpened(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+   }
+
    /**
     * Shortcut for Spacebar
@@ -521 +503 @@
    private class SpaceAction extends AbstractAction {
 
-        private static final long serialVersionUID = 1L;
-
-        @Override
-       public void actionPerformed(ActionEvent e) {
-           if(OuterHelp) {
-
-                   //Create new relation and add the currently drawn object to it
-                   model.addRelation("outer");
-                   map.selectMapMode(selectAction);
-                   OuterHelp = false;
-
-                   //Clear currently selection
-                   MainApplication.getLayerManager().getEditDataSet().clearSelection();
-           }
-           else if(InnerHelp) {
-
-                   //Save new drawn relation for adding
-                   innerRelation = MainApplication.getLayerManager().getEditDataSet().getAllSelected();
-                           map.selectMapMode(selectAction);
-
-                   //Clear currently selection
-                   MainApplication.getLayerManager().getEditDataSet().clearSelection();
-           }
-           else if(LevelHelp) {
+    private static final long serialVersionUID = 1L;
+
+    @Override
+       public void actionPerformed(ActionEvent e) {
+           if (OuterHelp) {
+
+               //Create new relation and add the currently drawn object to it
+               model.addRelation("outer");
+               map.selectMapMode(selectAction);
+               OuterHelp = false;
+
+               //Clear currently selection
+               MainApplication.getLayerManager().getEditDataSet().clearSelection();
+           } else if (InnerHelp) {
+
+               //Save new drawn relation for adding
+               innerRelation = MainApplication.getLayerManager().getEditDataSet().getAllSelected();
+                     map.selectMapMode(selectAction);
+
+               //Clear currently selection
+               MainApplication.getLayerManager().getEditDataSet().clearSelection();
+           } else if (LevelHelp) {
 
                List<Tag> tags = new ArrayList<>();
-                   tags.add(new Tag("level",levelNum));
-
-                   //Add level tag
-                   model.addTagsToOSM(tags);
-
-                   //Change action
-                   map.selectMapMode(selectAction);
-                   LevelHelp = false;
+               tags.add(new Tag("level", levelNum));
+
+               //Add level tag
+               model.addTagsToOSM(tags);
+
+               //Change action
+               map.selectMapMode(selectAction);
+               LevelHelp = false;
            }
        }
@@ -565 +545 @@
    private class EnterAction extends AbstractAction {
 
-        private static final long serialVersionUID = 1L;
-
-        @Override
-       public void actionPerformed(ActionEvent e) {
-
-           if(InnerHelp && !OuterHelp) {
-
-                   // Edit the new drawn relation member to selected relation
-                   model.editRelation("inner", innerRelation);
-                   InnerHelp = false;
-
-           }else if((InnerHelp && OuterHelp) || (OuterHelp && !InnerHelp)){
-                   JOptionPane.showMessageDialog(null, tr("Please press spacebar first to add \"outer\" object to relation."), tr("Relation-Error"), JOptionPane.ERROR_MESSAGE);
-                   resetHelper();
-           }
-       }
-   }
-
-/*************************************************
-* FILTER METHODS
-*
-*/
+    private static final long serialVersionUID = 1L;
+
+       @Override
+       public void actionPerformed(ActionEvent e) {
+           if (InnerHelp && !OuterHelp) {
+               // Edit the new drawn relation member to selected relation
+               model.editRelation("inner", innerRelation);
+               InnerHelp = false;
+           } else if ((InnerHelp && OuterHelp) || (OuterHelp && !InnerHelp)) {
+               JOptionPane.showMessageDialog(null,
+                       tr("Please press spacebar first to add \"outer\" object to relation."), tr("Relation-Error"), JOptionPane.ERROR_MESSAGE);
+               resetHelper();
+           }
+       }
+   }
+
    /**
     * Function which unset the disabled state of currently hidden and/or disabled objects which have a
@@ -592 +566 @@
     * current working level.
     * Specific example: key: repeat_on ; value: 1-4;
-    *                                   If current selected workinglevel is "3" all objects with the leveltag "level=3" are hidden but the
-    *                                   objects with the key "repeat_on" and the value which includes "3" or is (minValue+1) - maxValue (4-...),
-    *                                   because repeat_on tag starts on the current workinglevel+1.
+    *                     If current selected workinglevel is "3" all objects with the leveltag "level=3" are hidden but the
+    *                     objects with the key "repeat_on" and the value which includes "3" or is (minValue+1) - maxValue (4-...),
+    *                     because repeat_on tag starts on the current workinglevel+1.
+    * @author rebsc
     * @param key sepcific key to unset hidden objects which contains it
-    * @author rebsc
     */
    public void unsetSpecificKeyFilter(String key) {
 
-         Collection<OsmPrimitive> p = Main.main.getEditDataSet().allPrimitives();
-         Map<String, String> tags = new HashMap<>();
-         Integer level = Integer.parseInt(levelValue);
-         Integer firstVal, secVal;
-
-         //Find all primitives with the specific tag and check if value is part of the current
-         //workinglevel. After that unset the disabled status.
-         for(OsmPrimitive osm: p) {
-                 if((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) {
-
-                         tags = osm.getInterestingTags();
-
-                         for(Map.Entry<String, String> e: tags.entrySet()) {
-                                if(e.getKey().equals(key)) {
-                                        String val = e.getValue();
-
-                                        //Extract values
-                                        if(val.indexOf("-") == 0) {
-                                                firstVal = (Integer.parseInt(val.split("-",2)[1].split("-",2)[0]))*-1;
-                                                secVal = Integer.parseInt(val.split("-",2)[1].split("-",2)[1]);
-                                        }else {
-                                                firstVal = Integer.parseInt(val.split("-")[0]);
-                                                secVal = Integer.parseInt(val.split("-")[1]);
-                                        }
-
-                                        //Compare values to current working level
-                                        if(level >= ((firstVal)-1) && level <= secVal) {
-                                                osm.unsetDisabledState();
-                                        }else {
-                                                osm.setDisabledState(true);
-                                        }
-                                }
-
-                         }
-
-                 }
-         }
-
-   }
-
-  /**
-   * Function which updates the current working level tag
-   *
-   * @param indoorLevel: current working level
-   */
-   public void setIndoorLevel(String indoorLevel) {
-           this.toolboxView.setLevelLabel(indoorLevel);
-   }
-
-   /**
-    * Function which gets the current working level tag
-    *
-    * @param indoorLevel: current working level
-    */
+     Collection<OsmPrimitive> p = Main.main.getEditDataSet().allPrimitives();
+     Map<String, String> tags = new HashMap<>();
+     Integer level = Integer.parseInt(levelValue);
+     Integer firstVal, secVal;
+
+     //Find all primitives with the specific tag and check if value is part of the current
+     //workinglevel. After that unset the disabled status.
+     for (OsmPrimitive osm: p) {
+         if ((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) {
+
+             tags = osm.getInterestingTags();
+
+             for (Map.Entry<String, String> e: tags.entrySet()) {
+                if (e.getKey().equals(key)) {
+                    String val = e.getValue();
+
+                    //Extract values
+                    if (val.indexOf("-") == 0) {
+                        firstVal = (Integer.parseInt(val.split("-", 2)[1].split("-", 2)[0]))*-1;
+                        secVal = Integer.parseInt(val.split("-", 2)[1].split("-", 2)[1]);
+                    } else {
+                        firstVal = Integer.parseInt(val.split("-")[0]);
+                        secVal = Integer.parseInt(val.split("-")[1]);
+                    }
+
+                    //Compare values to current working level
+                    if (level >= ((firstVal)-1) && level <= secVal) {
+                        osm.unsetDisabledState();
+                    } else {
+                        osm.setDisabledState(true);
+                    }
+                }
+             }
+         }
+     }
+   }
+
+    /**
+     * Function which updates the current working level tag
+     *
+     * @param indoorLevel current working level
+     */
+    public void setIndoorLevel(String indoorLevel) {
+       this.toolboxView.setLevelLabel(indoorLevel);
+    }
+
+    /**
+     * Function which gets the current working level tag
+     *
+     * @param indoorLevel current working level
+     */
     public void getIndoorLevel(String indoorLevel) {
-        levelValue = indoorLevel;
-
-    }
-
-
-/*************************************************
-* HELPER METHODS
-*
-*/
-
-   /**
-    * Function which resets the helper for relation adding
-    */
-   private void resetHelper() {
-           InnerHelp = false;
-           OuterHelp = false;
-   }
+        levelValue = indoorLevel;
+    }
+
+    /**
+     * Function which resets the helper for relation adding
+     */
+    private void resetHelper() {
+        InnerHelp = false;
+        OuterHelp = false;
+    }
 
     /**
@@ -686 +650 @@
     }
 
-   /**
-    * Enables or disables the preferences for the mapcss-style and the validator.
-    *
-    * @param enabled Activates or disables the settings.
-    */
-        @SuppressWarnings("deprecation")
-        private void setPluginPreferences(boolean enabled) {
+    /**
+     * Enables or disables the preferences for the mapcss-style and the validator.
+     *
+     * @param enabled Activates or disables the settings.
+     */
+    private void setPluginPreferences(boolean enabled) {
        Map<String, Setting<?>> settings = Main.pref.getAllSettings();
 
@@ -727 +690 @@
            indoorValidator.put("title", "Indoor");
            indoorValidator.put("active", "true");
-           indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" +
+           indoorValidator.put("url", Main.pref.getDirs().getUserDataDirectory(true)+ sep +"validator" +
                    sep + "indoorhelper.validator.mapcss");
 
@@ -750 +713 @@
            indoorMapPaint.put("title", tr("Indoor"));
            indoorMapPaint.put("active", "true");
-           indoorMapPaint.put("url", Main.pref.getUserDataDirectory() + sep + "styles"
+           indoorMapPaint.put("url", Main.pref.getDirs().getUserDataDirectory(true) + sep + "styles"
                    + sep + "sit.mapcss");
            styleMapsNew.add(indoorMapPaint);
@@ -774 +737 @@
            indoorValidator.put("title", tr("Indoor"));
            indoorValidator.put("active", "false");
-           indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" +
+           indoorValidator.put("url", Main.pref.getDirs().getUserDataDirectory(true)+ sep +"validator" +
                    sep + "indoorhelper.validator.mapcss");
 
@@ -798 +761 @@
            indoorMapPaint.put("title", tr("Indoor"));
            indoorMapPaint.put("active", "false");
-           indoorMapPaint.put("url", Main.pref.getUserDataDirectory() + sep + "styles"
+           indoorMapPaint.put("url", Main.pref.getDirs().getUserDataDirectory(true) + sep + "styles"
                    + sep + "sit.mapcss");
            styleMapsNew.add(indoorMapPaint);
@@ -806 +769 @@
        }
    }
-
-
-
-
-
-/**
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 }