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

Timestamp:

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

Author:

donvip

Message:

code cleanup

Location:

applications/editors/josm/plugins/indoorhelper/src

Files:

• controller/IndoorHelperController.java (modified) (26 diffs)
• model/IndoorHelperModel.java (modified) (11 diffs)
• model/PresetCounter.java (modified) (1 diff)
• model/TagCatalog.java (modified) (5 diffs)
• org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (modified) (7 diffs)
• views/DialogPanel.java (modified) (2 diffs)
• views/FittingView.java (modified) (1 diff)
• views/LevelSelectorView.java (modified) (5 diffs)
• views/PresetButton.java (modified) (2 diffs)
• views/ToolBoxView.java (modified) (17 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 @@
        }
    }
-
-
-
-
-
-/**
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 }

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;
     }
-
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*/
 }

applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java

@@ -40 +40 @@
 import controller.IndoorHelperController;
 
-
 /**
  * This is the main class for the indoorhelper plug-in.
@@ -50 +49 @@
 public class IndoorHelperPlugin extends Plugin implements PaintableInvalidationListener, ActiveLayerChangeListener {
 
-
-        @SuppressWarnings("unused")
+    @SuppressWarnings("unused")
     private IndoorHelperController controller;
     String sep = System.getProperty("file.separator");
@@ -91 +89 @@
      * Exports the mapcss validator file to the preferences directory.
      */
-    @SuppressWarnings("deprecation")
-        private void exportValidator(String resourceName) throws Exception {
+    private void exportValidator(String resourceName) throws Exception {
         InputStream stream = null;
         OutputStream resStreamOut = null;
@@ -107 +104 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getUserDataDirectory() + sep + "validator";
+            String valDirPath = Main.pref.getDirs().getUserDataDirectory(true) + sep + "validator";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -129 +126 @@
      */
     private void exportStyleFile(String resourceName) throws Exception {
-        InputStream stream = null;
-        OutputStream resStreamOut = null;
-
-        try {
-            stream = IndoorHelperPlugin.class.getResourceAsStream("/data/" + resourceName);
+        try (InputStream stream = IndoorHelperPlugin.class.getResourceAsStream("/data/" + resourceName)) {
             if (stream == null) {
                 System.out.println("MapPaint: stream is null");
@@ -143 +136 @@
             byte[] buffer = new byte[4096];
 
-            @SuppressWarnings("deprecation")
-                        String valDirPath = Main.pref.getUserDataDirectory() + sep + "styles";
+            String valDirPath = Main.pref.getDirs().getUserDataDirectory(true) + sep + "styles";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
             outPath = valDir.getAbsolutePath() +sep+ resourceName;
-            System.out.println("MapPaint"+outPath);
-
-            resStreamOut = new FileOutputStream(outPath);
-            while ((readBytes = stream.read(buffer)) > 0) {
-                resStreamOut.write(buffer, 0, readBytes);
-            }
-            resStreamOut.close();
+
+            try (OutputStream resStreamOut = new FileOutputStream(outPath)) {
+                while ((readBytes = stream.read(buffer)) > 0) {
+                    resStreamOut.write(buffer, 0, readBytes);
+                }
+            }
         } catch (Exception ex) {
             throw ex;
-        } finally {
-            stream.close();
-        }
-    }
-
-        @Override
-        public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-                OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        }
+    }
+
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
         if (editLayer != null) {
             editLayer.addInvalidationListener(this);
         }
-        }
-
-        @Override
-        public void paintableInvalidated(PaintableInvalidationEvent event){
-                AutoFilter currentAutoFilter = AutoFilterManager.getInstance().getCurrentAutoFilter();
-                String currentFilterValue = new String();
-
-                if(currentAutoFilter != null) {
-                        currentFilterValue = currentAutoFilter.getFilter().text.split("=")[1];
-
-                        this.controller.setIndoorLevel(currentFilterValue);
-                        this.controller.getIndoorLevel(currentFilterValue);
-                        this.controller.unsetSpecificKeyFilter("repeat_on");
-
-                }else{
-                        currentFilterValue = "";
-                        this.controller.setIndoorLevel(currentFilterValue);
-                        this.controller.getIndoorLevel(currentFilterValue);
-                };
-
-        }
+    }
+
+    @Override
+    public void paintableInvalidated(PaintableInvalidationEvent event) {
+        AutoFilter currentAutoFilter = AutoFilterManager.getInstance().getCurrentAutoFilter();
+        String currentFilterValue = new String();
+
+        if (currentAutoFilter != null) {
+            currentFilterValue = currentAutoFilter.getFilter().text.split("=")[1];
+
+            this.controller.setIndoorLevel(currentFilterValue);
+            this.controller.getIndoorLevel(currentFilterValue);
+            this.controller.unsetSpecificKeyFilter("repeat_on");
+
+        } else {
+            currentFilterValue = "";
+            this.controller.setIndoorLevel(currentFilterValue);
+            this.controller.getIndoorLevel(currentFilterValue);
+        }
+    }
 
     /**
@@ -232 +220 @@
 //        }
 //    }
-
-/**
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 }

applications/editors/josm/plugins/indoorhelper/src/views/DialogPanel.java

@@ -68 +68 @@
         powerButton = new JToggleButton();
         levelLabel = new JLabel();
-        levelBox = new JosmComboBox<String>();
+        levelBox = new JosmComboBox<>();
         levelTagLabel = new JLabel();
         levelTagField = new DisableShortcutsOnFocusGainedTextField();
@@ -88 +88 @@
 
         //======== dialogPane ========
-        {
-            this.setBorder(new EmptyBorder(12, 12, 12, 12));
-            this.setLayout(new BorderLayout());
-
-            //======== contentPanel ========
-            {
-                contentPanel.setLayout(new GridBagLayout());
-                ((GridBagLayout) contentPanel.getLayout()).columnWidths = new int[] {
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-                ((GridBagLayout) contentPanel.getLayout()).rowHeights = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
-                ((GridBagLayout) contentPanel.getLayout()).columnWeights = new double[] {
-                        0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
-                ((GridBagLayout) contentPanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
-
-                //---- powerButton ----
-                powerButton.setText(tr("POWER"));
-                powerButton.setToolTipText(tr("Activates the plug-in"));
-                contentPanel.add(powerButton, new GridBagConstraints(8, 0, 4, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-                contentPanel.add(separator1, new GridBagConstraints(1, 1, 12, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- levelLabel ----
-                levelLabel.setText(tr("Working Level"));
-                contentPanel.add(levelLabel, new GridBagConstraints(1, 2, 2, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- levelBox ----
-                levelBox.setEnabled(false);
-                levelBox.setEditable(false);
-                levelBox.setToolTipText(tr("Selects the working level."));
-                contentPanel.add(levelBox, new GridBagConstraints(3, 2, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- levelTagLabel ----
-                levelTagLabel.setText(tr("Level Name"));
-                contentPanel.add(levelTagLabel, new GridBagConstraints(7, 2, 1, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- levelTagField ----
-                levelTagField.setEnabled(false);
-                levelTagField.setColumns(6);
-                levelTagField.setToolTipText(tr("Optional name-tag for a level."));
-                contentPanel.add(levelTagField, new GridBagConstraints(8, 2, 5, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-                contentPanel.add(separator2, new GridBagConstraints(1, 3, 12, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- objectLabel ----
-                objectLabel.setText(tr("Object"));
-                contentPanel.add(objectLabel, new GridBagConstraints(0, 4, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- objectBox ----
-                objectBox.setEnabled(false);
-                objectBox.setPrototypeDisplayValue(IndoorObject.CONCRETE_WALL);
-                objectBox.setToolTipText(tr("The object preset you want to tag."));
-                contentPanel.add(objectBox, new GridBagConstraints(3, 4, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- nameLabel ----
-                nameLabel.setText(tr("Name"));
-                contentPanel.add(nameLabel, new GridBagConstraints(0, 5, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- nameField ----
-                nameField.setEnabled(false);
-                nameField.addFocusListener(new FocusListener() {
-
-                    @Override
-                    public void focusLost(FocusEvent e) {}
-
-                    @Override
-                    public void focusGained(FocusEvent e) {
-                        nameField.selectAll();
-                    }
-                });
-                nameField.setToolTipText(tr("Sets the name tag when the room-object is selected."));
-                contentPanel.add(nameField, new GridBagConstraints(3, 5, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 5, 5), 0, 0));
-
-                //---- refLabel ----
-                refLabel.setText(tr("Reference"));
-                contentPanel.add(refLabel, new GridBagConstraints(0, 6, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 0, 5), 0, 0));
-
-                //---- refField ----
-                refField.setEnabled(false);
-                refField.addFocusListener(new FocusListener() {
-
-                    @Override
-                    public void focusLost(FocusEvent e) {}
-
-                    @Override
-                    public void focusGained(FocusEvent e) {
-                        refField.selectAll();
-                    }
-                });
-                refField.setToolTipText(tr("Sets the ref tag when the room-object is selected."));
-                contentPanel.add(refField, new GridBagConstraints(3, 6, 3, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 0, 5), 0, 0));
+
+        this.setBorder(new EmptyBorder(12, 12, 12, 12));
+        this.setLayout(new BorderLayout());
+
+        //======== contentPanel ========
+
+        contentPanel.setLayout(new GridBagLayout());
+        ((GridBagLayout) contentPanel.getLayout()).columnWidths = new int[] {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+        ((GridBagLayout) contentPanel.getLayout()).rowHeights = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
+        ((GridBagLayout) contentPanel.getLayout()).columnWeights = new double[] {
+                0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+                0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
+        ((GridBagLayout) contentPanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
+
+        //---- powerButton ----
+        powerButton.setText(tr("POWER"));
+        powerButton.setToolTipText(tr("Activates the plug-in"));
+        contentPanel.add(powerButton, new GridBagConstraints(8, 0, 4, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+        contentPanel.add(separator1, new GridBagConstraints(1, 1, 12, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- levelLabel ----
+        levelLabel.setText(tr("Working Level"));
+        contentPanel.add(levelLabel, new GridBagConstraints(1, 2, 2, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- levelBox ----
+        levelBox.setEnabled(false);
+        levelBox.setEditable(false);
+        levelBox.setToolTipText(tr("Selects the working level."));
+        contentPanel.add(levelBox, new GridBagConstraints(3, 2, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- levelTagLabel ----
+        levelTagLabel.setText(tr("Level Name"));
+        contentPanel.add(levelTagLabel, new GridBagConstraints(7, 2, 1, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- levelTagField ----
+        levelTagField.setEnabled(false);
+        levelTagField.setColumns(6);
+        levelTagField.setToolTipText(tr("Optional name-tag for a level."));
+        contentPanel.add(levelTagField, new GridBagConstraints(8, 2, 5, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+        contentPanel.add(separator2, new GridBagConstraints(1, 3, 12, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- objectLabel ----
+        objectLabel.setText(tr("Object"));
+        contentPanel.add(objectLabel, new GridBagConstraints(0, 4, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- objectBox ----
+        objectBox.setEnabled(false);
+        objectBox.setPrototypeDisplayValue(IndoorObject.CONCRETE_WALL);
+        objectBox.setToolTipText(tr("The object preset you want to tag."));
+        contentPanel.add(objectBox, new GridBagConstraints(3, 4, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- nameLabel ----
+        nameLabel.setText(tr("Name"));
+        contentPanel.add(nameLabel, new GridBagConstraints(0, 5, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- nameField ----
+        nameField.setEnabled(false);
+        nameField.addFocusListener(new FocusListener() {
+
+            @Override
+            public void focusLost(FocusEvent e) {}
+
+            @Override
+            public void focusGained(FocusEvent e) {
+                nameField.selectAll();
             }
-            this.add(contentPanel, BorderLayout.CENTER);
-
-            //======== buttonBar ========
-            {
-                buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
-                buttonBar.setLayout(new GridBagLayout());
-                ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80};
-                ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0};
-
-                //---- applyButton ----
-                applyButton.setText(tr("Apply Tags"));
-                applyButton.setEnabled(false);
-                buttonBar.add(applyButton, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 0, 0), 0, 0));
+        });
+        nameField.setToolTipText(tr("Sets the name tag when the room-object is selected."));
+        contentPanel.add(nameField, new GridBagConstraints(3, 5, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 5, 5), 0, 0));
+
+        //---- refLabel ----
+        refLabel.setText(tr("Reference"));
+        contentPanel.add(refLabel, new GridBagConstraints(0, 6, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 0, 5), 0, 0));
+
+        //---- refField ----
+        refField.setEnabled(false);
+        refField.addFocusListener(new FocusListener() {
+
+            @Override
+            public void focusLost(FocusEvent e) {}
+
+            @Override
+            public void focusGained(FocusEvent e) {
+                refField.selectAll();
             }
-            this.add(buttonBar, BorderLayout.SOUTH);
-        }
+        });
+        refField.setToolTipText(tr("Sets the ref tag when the room-object is selected."));
+        contentPanel.add(refField, new GridBagConstraints(3, 6, 3, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 0, 5), 0, 0));
+
+        this.add(contentPanel, BorderLayout.CENTER);
+
+        //======== buttonBar ========
+
+        buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
+        buttonBar.setLayout(new GridBagLayout());
+        ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80};
+        ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0};
+
+        //---- applyButton ----
+        applyButton.setText(tr("Apply Tags"));
+        applyButton.setEnabled(false);
+        buttonBar.add(applyButton, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 0, 0), 0, 0));
+
+        this.add(buttonBar, BorderLayout.SOUTH);
     }
-
 }

applications/editors/josm/plugins/indoorhelper/src/views/FittingView.java

@@ -68 +68 @@
 
         //======== dialogPane ========
-        {
-            dialogPane.setBorder(new EmptyBorder(12, 12, 12, 12));
-            dialogPane.setLayout(new BorderLayout());
 
-            //======== contentPanel ========
-            {
-                contentPanel.setLayout(new FlowLayout());
+        dialogPane.setBorder(new EmptyBorder(12, 12, 12, 12));
+        dialogPane.setLayout(new BorderLayout());
 
-                //---- label1 ----
-                label1.setText(tr("<html>Please mind to start fitting your building-plans now.<br>" +
-                        "To do so, use the PicLayer plug-in, which you can install<br>" +
-                        "using the JOSM plug-in management.</html>"));
-                contentPanel.add(label1);
-            }
-            dialogPane.add(contentPanel, BorderLayout.CENTER);
+        //======== contentPanel ========
 
-            //======== buttonBar ========
-            {
-                buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
-                buttonBar.setLayout(new GridBagLayout());
-                ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80};
-                ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0};
+        contentPanel.setLayout(new FlowLayout());
 
-                //---- okButton ----
-                okButton.setText(tr("OK"));
-                buttonBar.add(okButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
-                    GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                    new Insets(0, 0, 0, 0), 0, 0));
-            }
-            dialogPane.add(buttonBar, BorderLayout.SOUTH);
-        }
+        //---- label1 ----
+        label1.setText(tr("<html>Please mind to start fitting your building-plans now.<br>" +
+                "To do so, use the PicLayer plug-in, which you can install<br>" +
+                "using the JOSM plug-in management.</html>"));
+        contentPanel.add(label1);
+
+        dialogPane.add(contentPanel, BorderLayout.CENTER);
+
+        //======== buttonBar ========
+
+        buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
+        buttonBar.setLayout(new GridBagLayout());
+        ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80};
+        ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0};
+
+        //---- okButton ----
+        okButton.setText(tr("OK"));
+        buttonBar.add(okButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+            new Insets(0, 0, 0, 0), 0, 0));
+
+        dialogPane.add(buttonBar, BorderLayout.SOUTH);
+
         contentPane.add(dialogPane, BorderLayout.CENTER);
         pack();

applications/editors/josm/plugins/indoorhelper/src/views/LevelSelectorView.java

@@ -46 +46 @@
 public class LevelSelectorView extends JFrame {
 
-        private static final long serialVersionUID = 1L;
-        private JPanel dialogPane;
+    private static final long serialVersionUID = 1L;
+    private JPanel dialogPane;
     private JPanel contentPanel;
     private JPanel infoBar;
@@ -78 +78 @@
 
         //======== dialogPane ========
-        {
-            dialogPane.setBorder(new EmptyBorder(12, 12, 12, 12));
-            dialogPane.setLayout(new BorderLayout());
 
+        dialogPane.setBorder(new EmptyBorder(12, 12, 12, 12));
+        dialogPane.setLayout(new BorderLayout());
 
-                //======== infoBar ========
-                {
+        //======== infoBar ========
 
-                        //---- Label1 ----
-                        label1.setText(tr("<html> Please insert the new level number you want to add.<br> "
-                                        + " <i>Info</i>: <br> If the OK button got pressed you will switch to the drawing action.<br>"
-                                        + "To finish the new object please press the spacebar. The new level<br>will be tagged automatically. </html>"));
-                        infoBar.add(label1);
-                }
-                dialogPane.add(infoBar,BorderLayout.NORTH);
+        //---- Label1 ----
+        label1.setText(tr("<html> Please insert the new level number you want to add.<br> "
+                + " <i>Info</i>: <br> If the OK button got pressed you will switch to the drawing action.<br>"
+                + "To finish the new object please press the spacebar. The new level<br>will be tagged automatically. </html>"));
+        infoBar.add(label1);
+        dialogPane.add(infoBar, BorderLayout.NORTH);
 
+        //======== contentPanel ========
 
-            //======== contentPanel ========
-            {
-                contentPanel.setLayout(new GridBagLayout());
-                ((GridBagLayout) contentPanel.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0};
-                ((GridBagLayout) contentPanel.getLayout()).rowHeights = new int[] {0, 0, 0, 0, 0, 0};
-                ((GridBagLayout) contentPanel.getLayout()).columnWeights = new double[] {0.0, 0.0, 0.0, 0.0, 1.0E-4};
-                ((GridBagLayout) contentPanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
+        contentPanel.setLayout(new GridBagLayout());
+        ((GridBagLayout) contentPanel.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0};
+        ((GridBagLayout) contentPanel.getLayout()).rowHeights = new int[] {0, 0, 0, 0, 0, 0};
+        ((GridBagLayout) contentPanel.getLayout()).columnWeights = new double[] {0.0, 0.0, 0.0, 0.0, 1.0E-4};
+        ((GridBagLayout) contentPanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
 
+        //---- Label2 ----
+        label2.setText(tr("level number:"));
+        contentPanel.add(label2, new GridBagConstraints(0, 0, 3, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(5, 5, 5, 30), 0, 0));
 
-                //---- Label2 ----
-                label2.setText(tr("level number:"));
-                contentPanel.add(label2,new GridBagConstraints(0, 0, 3, 1, 0.0, 0.0,
-                        GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                        new Insets(5, 5, 5, 30), 0, 0));
+        //---- Field ----
+        field.setToolTipText(tr("Example: '2' or '3'"));
+        field.addFocusListener(new FocusListener() {
 
-                //---- Field ----
-                field.setToolTipText(tr("Example: '2' or '3'"));
-                field.addFocusListener(new FocusListener() {
+            @Override
+            public void focusLost(FocusEvent e) {}
 
-                    @Override
-                    public void focusLost(FocusEvent e) {}
+            @Override
+            public void focusGained(FocusEvent e) {
+                field.selectAll();
+            }
+        });
+        contentPanel.add(field, new GridBagConstraints(3, 0, 2, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(5, 0, 5, 200), 0, 0));
 
-                    @Override
-                    public void focusGained(FocusEvent e) {
-                        field.selectAll();
-                    }
-                });
-                contentPanel.add(field, new GridBagConstraints(3, 0, 2, 1, 0.0, 0.0,
-                        GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                        new Insets(5, 0, 5, 200), 0, 0));
+        dialogPane.add(contentPanel, BorderLayout.CENTER);
 
-            }
-            dialogPane.add(contentPanel, BorderLayout.CENTER);
+        //======== buttonBar ========
 
-            //======== buttonBar ========
-            {
-                buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
-                buttonBar.setLayout(new GridBagLayout());
-                ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 85, 80};
-                ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0, 0.0};
+        buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
+        buttonBar.setLayout(new GridBagLayout());
+        ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 85, 80};
+        ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0, 0.0};
 
-                //---- okButton ----
-                okButton.setText(tr("OK"));
-                buttonBar.add(okButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
-                        GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                        new Insets(0, 0, 0, 5), 0, 0));
+        //---- okButton ----
+        okButton.setText(tr("OK"));
+        buttonBar.add(okButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(0, 0, 0, 5), 0, 0));
 
-                //---- Button ----
-               cancelButton.setText(tr("Cancel"));
-                buttonBar.add(cancelButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
-                        GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                        new Insets(0, 0, 0, 0), 0, 0));
-            }
-            dialogPane.add(buttonBar, BorderLayout.SOUTH);
-        }
+        //---- Button ----
+        cancelButton.setText(tr("Cancel"));
+        buttonBar.add(cancelButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(0, 0, 0, 0), 0, 0));
+
+        dialogPane.add(buttonBar, BorderLayout.SOUTH);
+
         contentPane.add(dialogPane, BorderLayout.CENTER);
         pack();
         setLocationRelativeTo(getOwner());
-
     }
 
-/*************************************************
-* GETTER
-*
-*/
     /**
      * Getter for the level number field.
@@ -169 +158 @@
     }
 
-/*************************************************
-* SELECTOR VIEW LISTENER
-*
-*/
-
-        /**
+    /**
      * Set the listener for the OK button.
      *
@@ -183 +167 @@
     }
 
-        /**
+    /**
      * Set the listener for the Cancel button.
      *
@@ -198 +182 @@
      */
     public void setSelectorWindowListener(WindowListener l) {
-        this.addWindowListener(l);
+        this.addWindowListener(l);
     }
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*/
 }

applications/editors/josm/plugins/indoorhelper/src/views/PresetButton.java

@@ -29 +29 @@
  *
  */
-
 @SuppressWarnings("serial")
 class PresetButton extends JButton {
@@ -48 +47 @@
         this.setToolTipText("Fast Tag: "+indoorObject.toString());
     }
-
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*/
 }

applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java

@@ -57 +57 @@
 @SuppressWarnings("serial")
 public class ToolBoxView extends ToggleDialog {
-        private JPanel dialogPanel;
-        private JPanel contentPanel;
-        private JLabel levelLabel;
-        private JCheckBox levelCheckBox;
-        private JLabel levelNameLabel;
-        private DisableShortcutsOnFocusGainedTextField levelNameField;
-        private JLabel repeatOnLabel;
-        private DisableShortcutsOnFocusGainedTextField repeatOnField;
-        private JLabel objectLabel;
-        private JosmComboBox<TagCatalog.IndoorObject> objectBox;
-        private JLabel nameLabel;
-        private DisableShortcutsOnFocusGainedTextField nameField;
-        private JLabel refLabel;
-        private DisableShortcutsOnFocusGainedTextField refField;
-        private JLabel multiLabel;
-        private JButton multiOuterButton;
-        private JButton multiInnerButton;
-        private JCheckBox multiCheckBox;
-        private JPanel buttonBar;
-        private JButton applyButton;
-        private JSeparator separator1;
-        private JSeparator separator2;
-        private PresetButton preset1;
-        private PresetButton preset2;
-        private PresetButton preset3;
-        private PresetButton preset4;
-        private JButton addLevelButton;
-        private JButton helpButton;
-
+    private JPanel dialogPanel;
+    private JPanel contentPanel;
+    private JLabel levelLabel;
+    private JCheckBox levelCheckBox;
+    private JLabel levelNameLabel;
+    private DisableShortcutsOnFocusGainedTextField levelNameField;
+    private JLabel repeatOnLabel;
+    private DisableShortcutsOnFocusGainedTextField repeatOnField;
+    private JLabel objectLabel;
+    private JosmComboBox<TagCatalog.IndoorObject> objectBox;
+    private JLabel nameLabel;
+    private DisableShortcutsOnFocusGainedTextField nameField;
+    private JLabel refLabel;
+    private DisableShortcutsOnFocusGainedTextField refField;
+    private JLabel multiLabel;
+    private JButton multiOuterButton;
+    private JButton multiInnerButton;
+    private JCheckBox multiCheckBox;
+    private JPanel buttonBar;
+    private JButton applyButton;
+    private JSeparator separator1;
+    private JSeparator separator2;
+    private PresetButton preset1;
+    private PresetButton preset2;
+    private PresetButton preset3;
+    private PresetButton preset4;
+    private JButton addLevelButton;
+    private JButton helpButton;
 
    public ToolBoxView() {
@@ -94 +93 @@
    }
 
-/*************************************************
-* CREATES THE LAYOUT OF THE PLUG-IN.
-*
-*/
    private void initComponents() {
        dialogPanel = new JPanel();
@@ -133 +128 @@
 
        //======== dialogPane ========
-       {
-           dialogPanel.setBorder(new EmptyBorder(12, 12, 12, 12));
-           dialogPanel.setLayout(new BorderLayout());
-
-           //======== contentPanel ========
-           {
-               contentPanel.setLayout(new GridBagLayout());
-               ((GridBagLayout) contentPanel.getLayout()).columnWidths = new int[] {
-                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-               ((GridBagLayout) contentPanel.getLayout()).rowHeights = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
-               ((GridBagLayout) contentPanel.getLayout()).columnWeights = new double[] {
-                       0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
-               ((GridBagLayout) contentPanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
-
-
-               //---- addLevelButton ----
-               addLevelButton.setText(tr("Insert level"));
-               addLevelButton.setToolTipText(tr("Add a new level to layer."));
-               addLevelButton.setEnabled(false);
-               contentPanel.add(addLevelButton, new GridBagConstraints(12, 1, 3, 1, 0.0, 1.0,
-                       GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                       new Insets(0, 0, 5, 30), 0, 0));
-
-               //---- helpButton ----
-               helpButton.setText(tr("<html><b>?</strong></b>"));
-               helpButton.setToolTipText(tr("Show Help-Browser."));
-               helpButton.setBackground(Color.LIGHT_GRAY);
-               helpButton.setEnabled(false);
-               contentPanel.add(helpButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 0), 0, 0));
-
-               //---- levelNameLabel ----
-               levelNameLabel.setText(tr("Level name"));
-               contentPanel.add(levelNameLabel, new GridBagConstraints(0, 1, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- levelNameField ----
-               levelNameField.setEnabled(false);
-               levelNameField.setToolTipText(tr("Sets optional name tag for a level."));
-               contentPanel.add(levelNameField, new GridBagConstraints(3, 1, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 30), 0, 0));
-
-               //---- levelLabel ----
-              levelLabel.setText(tr("Working level: NONE"));
-              levelLabel.setToolTipText(tr("Shows the current working level."));
-               contentPanel.add(levelLabel, new GridBagConstraints(6, 1, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- levelCheckBox ----
-               levelCheckBox.setToolTipText(tr("Deactivate automatic level tagging."));
-               contentPanel.add(levelCheckBox, new GridBagConstraints(9, 1, 1, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-               contentPanel.add(separator1, new GridBagConstraints(0, 2, 0, 1, 0.0, 0.0,
-                       GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                       new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- objectLabel ----
-               objectLabel.setText(tr("Object"));
-               contentPanel.add(objectLabel, new GridBagConstraints(0, 3, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- objectBox ----
-               objectBox.setEnabled(false);
-               objectBox.setPrototypeDisplayValue(IndoorObject.CONCRETE_WALL);
-               objectBox.setToolTipText(tr("The object preset you want to tag."));
-               contentPanel.add(objectBox, new GridBagConstraints(3, 3, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 30), 0, 0));
-
-               //---- nameLabel ----
-               nameLabel.setText(tr("Name"));
-               contentPanel.add(nameLabel, new GridBagConstraints(0, 4, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- nameField ----
-               nameField.setEnabled(false);
-               nameField.addFocusListener(new FocusListener() {
-
-                   @Override
-                   public void focusLost(FocusEvent e) {}
-
-                   @Override
-                   public void focusGained(FocusEvent e) {
-                       nameField.selectAll();
-                   }
-               });
-               nameField.setToolTipText(tr("Sets the name tag."));
-               contentPanel.add(nameField, new GridBagConstraints(3, 4, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 30), 0, 0));
-
-               //---- refLabel ----
-               refLabel.setText(tr("Reference"));
-               contentPanel.add(refLabel, new GridBagConstraints(0, 5, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- refField ----
-               refField.setEnabled(false);
-               refField.addFocusListener(new FocusListener() {
-
-                   @Override
-                   public void focusLost(FocusEvent e) {}
-
-                   @Override
-                   public void focusGained(FocusEvent e) {
-                       refField.selectAll();
-                   }
-               });
-               refField.setToolTipText(tr("Sets the referance tag."));
-               contentPanel.add(refField, new GridBagConstraints(3, 5, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 30), 0, 0));
-
-               //---- repeatOnLabel ----
-               repeatOnLabel.setText(tr("Repeat on"));
-               contentPanel.add(repeatOnLabel, new GridBagConstraints(0, 6, 3, 1, 0.0, 1.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- repeatOnField ----
-               repeatOnField.setEnabled(false);
-               repeatOnField.addFocusListener(new FocusListener() {
-
-                @Override
-                public void focusLost(FocusEvent e) {}
-
-                @Override
-                public void focusGained(FocusEvent e) {
-                        repeatOnField.selectAll();
-                }
-               });
-               repeatOnField.setToolTipText(tr("Sets the repeat on tag when highway objects are selected. Please tag like this: -3-4 or -2--3 or 5-6 ."));
-               contentPanel.add(repeatOnField, new GridBagConstraints(3, 6, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 30), 0, 0));
-               contentPanel.add(separator2, new GridBagConstraints(0, 7, 0, 1, 0.0, 1.0,
-                       GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                       new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- preset1 ----
-               preset1.setEnabled(false);
-               contentPanel.add(preset1, new GridBagConstraints(6, 3, 1, 1, 0.0, 0.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-               //---- preset2 ----
-               preset2.setEnabled(false);
-               contentPanel.add(preset2, new GridBagConstraints(6, 4, 1, 1, 0.0, 0.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- preset3 ----
-               preset3.setEnabled(false);
-               contentPanel.add(preset3, new GridBagConstraints(6, 5, 1, 1, 0.0, 0.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- preset4 ----
-               preset4.setEnabled(false);
-               contentPanel.add(preset4, new GridBagConstraints(6, 6, 1, 1, 0.0, 0.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- multiLabel ----
-               multiLabel.setText(tr("Multipolygon"));
-               contentPanel.add(multiLabel, new GridBagConstraints(0, 8, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-               //---- multiOuterButton ----
-               multiOuterButton.setText(tr("OUTER"));
-               multiOuterButton.setToolTipText(tr("Creation-Tool for multipolygon with role: outer. To finish press the spacebar."));
-               multiOuterButton.setEnabled(false);
-               contentPanel.add(multiOuterButton, new GridBagConstraints(3, 8, 3, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 30), 0, 0));
-
-               //---- multiInnerButton ----
-               multiInnerButton.setText(tr("INNER"));
-               multiInnerButton.setToolTipText(tr("Creation-Tool for multipolygons with role: inner. To finish press spacebar. To add to relation select \"outer\" and press enter."));
-               multiInnerButton.setEnabled(false);
-               contentPanel.add(multiInnerButton, new GridBagConstraints(6, 8, 1, 1, 0.0, 0.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
-
-             //---- multiCheckBox ----
-               multiCheckBox.setToolTipText(tr("Deactivate multipolygon function."));
-               contentPanel.add(multiCheckBox, new GridBagConstraints(9, 8, 1, 1, 0.0, 1.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 5, 5), 0, 0));
+
+       dialogPanel.setBorder(new EmptyBorder(12, 12, 12, 12));
+       dialogPanel.setLayout(new BorderLayout());
+
+       //======== contentPanel ========
+
+       contentPanel.setLayout(new GridBagLayout());
+       ((GridBagLayout) contentPanel.getLayout()).columnWidths = new int[] {
+               0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+       ((GridBagLayout) contentPanel.getLayout()).rowHeights = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
+       ((GridBagLayout) contentPanel.getLayout()).columnWeights = new double[] {
+               0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+               0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
+       ((GridBagLayout) contentPanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0E-4};
+
+       //---- addLevelButton ----
+       addLevelButton.setText(tr("Insert level"));
+       addLevelButton.setToolTipText(tr("Add a new level to layer."));
+       addLevelButton.setEnabled(false);
+       contentPanel.add(addLevelButton, new GridBagConstraints(12, 1, 3, 1, 0.0, 1.0,
+               GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+               new Insets(0, 0, 5, 30), 0, 0));
+
+       //---- helpButton ----
+       helpButton.setText(tr("<html><b>?</strong></b>"));
+       helpButton.setToolTipText(tr("Show Help-Browser."));
+       helpButton.setBackground(Color.LIGHT_GRAY);
+       helpButton.setEnabled(false);
+       contentPanel.add(helpButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 0), 0, 0));
+
+       //---- levelNameLabel ----
+       levelNameLabel.setText(tr("Level name"));
+       contentPanel.add(levelNameLabel, new GridBagConstraints(0, 1, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- levelNameField ----
+       levelNameField.setEnabled(false);
+       levelNameField.setToolTipText(tr("Sets optional name tag for a level."));
+       contentPanel.add(levelNameField, new GridBagConstraints(3, 1, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 30), 0, 0));
+
+       //---- levelLabel ----
+       levelLabel.setText(tr("Working level: NONE"));
+       levelLabel.setToolTipText(tr("Shows the current working level."));
+       contentPanel.add(levelLabel, new GridBagConstraints(6, 1, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- levelCheckBox ----
+       levelCheckBox.setToolTipText(tr("Deactivate automatic level tagging."));
+       contentPanel.add(levelCheckBox, new GridBagConstraints(9, 1, 1, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+       contentPanel.add(separator1, new GridBagConstraints(0, 2, 0, 1, 0.0, 0.0,
+               GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+               new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- objectLabel ----
+       objectLabel.setText(tr("Object"));
+       contentPanel.add(objectLabel, new GridBagConstraints(0, 3, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- objectBox ----
+       objectBox.setEnabled(false);
+       objectBox.setPrototypeDisplayValue(IndoorObject.CONCRETE_WALL);
+       objectBox.setToolTipText(tr("The object preset you want to tag."));
+       contentPanel.add(objectBox, new GridBagConstraints(3, 3, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 30), 0, 0));
+
+       //---- nameLabel ----
+       nameLabel.setText(tr("Name"));
+       contentPanel.add(nameLabel, new GridBagConstraints(0, 4, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- nameField ----
+       nameField.setEnabled(false);
+       nameField.addFocusListener(new FocusListener() {
+
+           @Override
+           public void focusLost(FocusEvent e) {}
+
+           @Override
+           public void focusGained(FocusEvent e) {
+               nameField.selectAll();
            }
-           dialogPanel.add(contentPanel, BorderLayout.CENTER);
-
-           //======== buttonBar ========
-           {
-               buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
-               buttonBar.setLayout(new GridBagLayout());
-               ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80};
-               ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0};
-
-               //---- applyButton ----
-               applyButton.setText(tr("Apply"));
-               applyButton.setToolTipText(tr("Add selected tags and/or relations to obeject."));
-               applyButton.setEnabled(false);
-               buttonBar.add(applyButton, new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0,
-                   GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                   new Insets(0, 0, 0, 0), 0, 0));
+       });
+       nameField.setToolTipText(tr("Sets the name tag."));
+       contentPanel.add(nameField, new GridBagConstraints(3, 4, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 30), 0, 0));
+
+       //---- refLabel ----
+       refLabel.setText(tr("Reference"));
+       contentPanel.add(refLabel, new GridBagConstraints(0, 5, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- refField ----
+       refField.setEnabled(false);
+       refField.addFocusListener(new FocusListener() {
+
+           @Override
+           public void focusLost(FocusEvent e) {}
+
+           @Override
+           public void focusGained(FocusEvent e) {
+               refField.selectAll();
            }
-           dialogPanel.add(buttonBar, BorderLayout.SOUTH);
-       }
+       });
+       refField.setToolTipText(tr("Sets the referance tag."));
+       contentPanel.add(refField, new GridBagConstraints(3, 5, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 30), 0, 0));
+
+       //---- repeatOnLabel ----
+       repeatOnLabel.setText(tr("Repeat on"));
+       contentPanel.add(repeatOnLabel, new GridBagConstraints(0, 6, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- repeatOnField ----
+       repeatOnField.setEnabled(false);
+       repeatOnField.addFocusListener(new FocusListener() {
+
+           @Override
+           public void focusLost(FocusEvent e) {}
+
+           @Override
+           public void focusGained(FocusEvent e) {
+               repeatOnField.selectAll();
+           }
+       });
+       repeatOnField.setToolTipText(
+               tr("Sets the repeat on tag when highway objects are selected. Please tag like this: -3-4 or -2--3 or 5-6 ."));
+       contentPanel.add(repeatOnField, new GridBagConstraints(3, 6, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 30), 0, 0));
+       contentPanel.add(separator2, new GridBagConstraints(0, 7, 0, 1, 0.0, 1.0,
+               GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+               new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- preset1 ----
+       preset1.setEnabled(false);
+       contentPanel.add(preset1, new GridBagConstraints(6, 3, 1, 1, 0.0, 0.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+       //---- preset2 ----
+       preset2.setEnabled(false);
+       contentPanel.add(preset2, new GridBagConstraints(6, 4, 1, 1, 0.0, 0.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- preset3 ----
+       preset3.setEnabled(false);
+       contentPanel.add(preset3, new GridBagConstraints(6, 5, 1, 1, 0.0, 0.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- preset4 ----
+       preset4.setEnabled(false);
+       contentPanel.add(preset4, new GridBagConstraints(6, 6, 1, 1, 0.0, 0.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- multiLabel ----
+       multiLabel.setText(tr("Multipolygon"));
+       contentPanel.add(multiLabel, new GridBagConstraints(0, 8, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- multiOuterButton ----
+       multiOuterButton.setText(tr("OUTER"));
+       multiOuterButton.setToolTipText(tr("Creation-Tool for multipolygon with role: outer. To finish press the spacebar."));
+       multiOuterButton.setEnabled(false);
+       contentPanel.add(multiOuterButton, new GridBagConstraints(3, 8, 3, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 30), 0, 0));
+
+       //---- multiInnerButton ----
+       multiInnerButton.setText(tr("INNER"));
+       multiInnerButton.setToolTipText(
+               tr("Creation-Tool for multipolygons with role: inner. To finish press spacebar. To add to relation select \"outer\" and press enter."));
+       multiInnerButton.setEnabled(false);
+       contentPanel.add(multiInnerButton, new GridBagConstraints(6, 8, 1, 1, 0.0, 0.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       //---- multiCheckBox ----
+       multiCheckBox.setToolTipText(tr("Deactivate multipolygon function."));
+       contentPanel.add(multiCheckBox, new GridBagConstraints(9, 8, 1, 1, 0.0, 1.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 5, 5), 0, 0));
+
+       dialogPanel.add(contentPanel, BorderLayout.CENTER);
+
+       //======== buttonBar ========
+       buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0));
+       buttonBar.setLayout(new GridBagLayout());
+       ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80};
+       ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0};
+
+       //---- applyButton ----
+       applyButton.setText(tr("Apply"));
+       applyButton.setToolTipText(tr("Add selected tags and/or relations to obeject."));
+       applyButton.setEnabled(false);
+       buttonBar.add(applyButton, new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0,
+           GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+           new Insets(0, 0, 0, 0), 0, 0));
+
+       dialogPanel.add(buttonBar, BorderLayout.SOUTH);
+
        this.createLayout(dialogPanel, true, null);
-
-   }
-
-/*************************************************
-* ENABLES OR DISABLES UI ELEMENTS
-*
-*/
+   }
+
    /**
     * Enables or disables the interactive UI elements of the toolbox.
@@ -364 +355 @@
     */
    public void setAllUiElementsEnabled(boolean enabled) {
-           this.applyButton.setEnabled(enabled);
-           this.levelCheckBox.setEnabled(enabled);
-           this.helpButton.setEnabled(enabled);
+       this.applyButton.setEnabled(enabled);
+       this.levelCheckBox.setEnabled(enabled);
+       this.helpButton.setEnabled(enabled);
        this.objectBox.setEnabled(enabled);
        this.levelNameField.setEnabled(enabled);
@@ -402 +393 @@
     * Enables or disables the interactive text box element {@link #repeatOn}.
     * @param enabled set this true for enabled elements
-        */
-   public void setROUiElementsEnabled(boolean enabled){
-                this.repeatOnField.setEnabled(enabled);
-
+    */
+   public void setROUiElementsEnabled(boolean enabled) {
+       this.repeatOnField.setEnabled(enabled);
    }
 
@@ -411 +401 @@
     * Enables or disables the interactive text box element {@link #levelName}.
     * @param enabled set this true for enabled elements
-        */
+    */
    public void setLVLUiElementsEnabled(boolean enabled) {
-           this.levelNameField.setEnabled(enabled);
-           this.addLevelButton.setEnabled(enabled);
+       this.levelNameField.setEnabled(enabled);
+       this.addLevelButton.setEnabled(enabled);
 
    }
@@ -421 +411 @@
     * Enables or disables the interactive ComboBoxes {@link #multiRoleBox} and {@link #multiEditBox }.
     * @param enabled set this true for enabled elements
-        */
+    */
    public void setMultiUiElementsEnabled(boolean enabled) {
-           this.multiOuterButton.setEnabled(enabled);
-           this.multiInnerButton.setEnabled(enabled);
-
-           if (enabled == false) resetUiElements();
+       this.multiOuterButton.setEnabled(enabled);
+       this.multiInnerButton.setEnabled(enabled);
+
+       if (enabled == false) resetUiElements();
    }
 
@@ -436 +426 @@
    }
 
-
-/*************************************************
-* GETTER and SETTER FOR THE INTERACTIVE UI BOXES
-*
-*/
    /**
     * Getter for the selected {@link IndoorObject} in the objectBox.
@@ -480 +465 @@
     * Setter for the current level value tag
     *
+    * @author rebsc
     * @param current level value as String
-    * @author rebsc
     */
    public void setLevelLabel(String levelTag) {
-           if (getLevelCheckBoxStatus() == false) {
-                  if(!levelTag.equals("")) {
-                          this.levelLabel.setText((tr("Working level: {0}",levelTag)));
-                  }
-                  else {
-                          this.levelLabel.setText((tr("Working level: NONE")));
-                  }
-           }
-           else {
-                   this.levelLabel.setText((tr("Working level: NONE")));
-           }
+       if (getLevelCheckBoxStatus() == false) {
+          if (!levelTag.equals("")) {
+              this.levelLabel.setText((tr("Working level: {0}", levelTag)));
+          } else {
+              this.levelLabel.setText((tr("Working level: NONE")));
+          }
+       } else {
+           this.levelLabel.setText((tr("Working level: NONE")));
+       }
    }
 
@@ -503 +486 @@
     */
    public boolean getLevelCheckBoxStatus() {
-           return this.levelCheckBox.isSelected();
+       return this.levelCheckBox.isSelected();
    }
 
@@ -522 +505 @@
        return this.repeatOnField.getText();
    }
-
-
-/*************************************************
-* RESETER FOR THE INTERACTIVE UI BOXES
-*
-*/
 
    /**
@@ -540 +517 @@
    }
 
-
-/*************************************************
-* SETTERS FOR THE BUTTON LISTENER
-*
-*/
-
    /**
     * Set the listener for the apply button.
@@ -560 +531 @@
     */
    public void setLevelCheckBoxListener(ItemListener l) {
-           this.levelCheckBox.addItemListener(l);
+       this.levelCheckBox.addItemListener(l);
    }
 
@@ -568 +539 @@
     */
    public void setHelpButtonListener(ActionListener l) {
-           this.helpButton.addActionListener(l);
+       this.helpButton.addActionListener(l);
    }
 
@@ -576 +547 @@
     */
    public void setAddLevelButtonListener(ActionListener l) {
-           this.addLevelButton.addActionListener(l);
+       this.addLevelButton.addActionListener(l);
    }
 
@@ -616 +587 @@
    }
 
-/*************************************************
-* PRESET BUTTON FUNCTION
-*
-*/
    public void setPresetButtons(List<IndoorObject> objects) {
        this.preset1.setIndoorObject(objects.get(0));
@@ -658 +625 @@
        return preset4.getIndoorObject();
    }
-
-
-/**
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*/
 }