Changeset 34734 in osm

Timestamp:

2018-11-22T00:21:27+01:00 (6 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/indoorhelper/src

Files:

• controller/IndoorHelperController.java (modified) (10 diffs)
• model/IndoorLevel.java (modified) (1 diff)
• views/ToolBoxView.java (modified) (3 diffs)

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

@@ -82 +82 @@
    private DrawAction drawAction;
    private SelectAction selectAction;
-   private SpaceAction SpaceAction;
-   private transient Shortcut SpaceShortcut;
-   private EnterAction EnterAction;
-   private transient Shortcut EnterShortcut;
-   private boolean OuterHelp, InnerHelp, LevelHelp;
+   private SpaceAction spaceAction;
+   private transient Shortcut spaceShortcut;
+   private EnterAction enterAction;
+   private transient Shortcut enterShortcut;
+   private boolean outerHelp, innerHelp, levelHelp;
    private Collection<OsmPrimitive> innerRelation;
    private LevelSelectorView selectorView;
@@ -115 +115 @@
 
        // Shortcuts
-       SpaceShortcut = Shortcut.registerShortcut("mapmode:space",
+       spaceShortcut = Shortcut.registerShortcut("mapmode:space",
                "ConfirmObjectDrawing", KeyEvent.VK_SPACE, Shortcut.DIRECT);
-       this.SpaceAction = new SpaceAction();
-       MainApplication.registerActionShortcut(SpaceAction, SpaceShortcut);
-
-       EnterShortcut = Shortcut.registerShortcut("mapmode:enter",
+       this.spaceAction = new SpaceAction();
+       MainApplication.registerActionShortcut(spaceAction, spaceShortcut);
+
+       enterShortcut = Shortcut.registerShortcut("mapmode:enter",
                "ConfirmMultipolygonSelection", KeyEvent.VK_ENTER, Shortcut.DIRECT);
-       this.EnterAction = new EnterAction();
-       MainApplication.registerActionShortcut(EnterAction, EnterShortcut);
+       this.enterAction = new EnterAction();
+       MainApplication.registerActionShortcut(enterAction, enterShortcut);
 
        // Helper
-       OuterHelp = false;
-       InnerHelp = false;
-       LevelHelp = false;
+       outerHelp = false;
+       innerHelp = false;
+       levelHelp = false;
        innerRelation = null;
        levelValue = new String();
@@ -328 +328 @@
 
            // For space shortcut to add the relation after spacebar got pushed {@link SpaceAction}
-           OuterHelp = true;
-           InnerHelp = false;
+           outerHelp = true;
+           innerHelp = false;
        }
    }
@@ -345 +345 @@
 
            // For space shortcut to edit the relation after enter got pushed {@link SpaceAction}{@link EnterAction}
-           InnerHelp = true;
-           OuterHelp = false;
+           innerHelp = true;
+           outerHelp = false;
 
        }
@@ -419 +419 @@
        @Override
        public void actionPerformed(ActionEvent e) {
-           LevelHelp = true;
+           levelHelp = true;
 
            // Get insert level number out of SelectorView
@@ -510 +510 @@
     @Override
        public void actionPerformed(ActionEvent e) {
-           if (OuterHelp) {
+           if (outerHelp) {
 
                //Create new relation and add the currently drawn object to it
                model.addRelation("outer");
                map.selectMapMode(selectAction);
-               OuterHelp = false;
+               outerHelp = false;
 
                //Clear currently selection
                MainApplication.getLayerManager().getEditDataSet().clearSelection();
-           } else if (InnerHelp) {
+           } else if (innerHelp) {
 
                //Save new drawn relation for adding
@@ -527 +527 @@
                //Clear currently selection
                MainApplication.getLayerManager().getEditDataSet().clearSelection();
-           } else if (LevelHelp) {
+           } else if (levelHelp) {
 
                List<Tag> tags = new ArrayList<>();
@@ -537 +537 @@
                //Change action
                map.selectMapMode(selectAction);
-               LevelHelp = false;
+               levelHelp = false;
            }
        }
@@ -552 +552 @@
        @Override
        public void actionPerformed(ActionEvent e) {
-           if (InnerHelp && !OuterHelp) {
+           if (innerHelp && !outerHelp) {
                // Edit the new drawn relation member to selected relation
                model.editRelation("inner", innerRelation);
-               InnerHelp = false;
-           } else if ((InnerHelp && OuterHelp) || (OuterHelp && !InnerHelp)) {
+               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);
@@ -617 +617 @@
      */
     private void resetHelper() {
-        InnerHelp = false;
-        OuterHelp = false;
+        innerHelp = false;
+        outerHelp = false;
     }
 

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

@@ -122 +122 @@
             //Extract values
             if (val.indexOf("-") == 0) {
-                firstVal = (Integer.parseInt(val.split("-", 2)[1].split("-", 2)[0]))*-1;
+                firstVal = Integer.parseInt(val.split("-", 2)[1].split("-", 2)[0])*-1;
                 secVal = Integer.parseInt(val.split("-", 2)[1].split("-", 2)[1]);
             } else if (val.contains("-")) {

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

@@ -26 +26 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.TextField;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
@@ -470 +469 @@
        if (getLevelCheckBoxStatus() == false) {
           if (!levelTag.equals("")) {
-              this.levelLabel.setText((tr("Working level: {0}", levelTag)));
+              this.levelLabel.setText(tr("Working level: {0}", levelTag));
           } else {
-              this.levelLabel.setText((tr("Working level: NONE")));
+              this.levelLabel.setText(tr("Working level: NONE"));
           }
        } else {
-           this.levelLabel.setText((tr("Working level: NONE")));
+           this.levelLabel.setText(tr("Working level: NONE"));
        }
    }
@@ -505 +504 @@
    }
 
-   
+
    /**
     * Clears the text boxes and sets an empty String.