Changeset 9073 in josm for trunk

Timestamp:

2015-11-30T23:14:56+01:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle - Comments Indentation

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• data/gpx/GpxData.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• data/projection/proj/TransverseMercator.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/NotificationManager.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)
• gui/mappaint/mapcss/Condition.java (modified) (1 diff)
• gui/preferences/ToolbarPreferences.java (modified) (1 diff)
• gui/preferences/server/FeaturesPanel.java (modified) (1 diff)
• gui/tagging/TagTable.java (modified) (1 diff)
• tools/PlatformHookWindows.java (modified) (1 diff)
• tools/TextTagParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -114 +114 @@
                     if (param[0].toLowerCase(Locale.ENGLISH).startsWith("-dproxy")) {
                         it.set(param[0]+"=xxx");
-                    // Shorten some parameters for readability concerns
                     } else {
+                        // Shorten some parameters for readability concerns
                         shortenParam(it, param, envJavaHome, envJavaHomeAlt);
                         shortenParam(it, param, propJavaHome, propJavaHomeAlt);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -384 +384 @@
     }
 
-     /**
+    /**
      * Look, whether any object is selected. If not, select the nearest node.
      * If there are no nodes in the dataset, do nothing.
@@ -1106 +1106 @@
                 return cycleList;
             }
-//          updateKeyModifiers(e); // already called before !
+            // updateKeyModifiers() already called before!
 
             DataSet ds = getCurrentDataSet();

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -230 +230 @@
     }
 
-     /**
+    /**
      * Makes a WayPoint at the projection of point P onto the track providing P is less than
      * tolerance away from the track

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -793 +793 @@
                                 (int) (repeat - pos), 0,
                                 (int) (repeat - pos + segmentLength), imgHeight, null);
-                    // rest of the image fits fully on the current segment
                     } else {
+                        // rest of the image fits fully on the current segment
                         g.drawImage(pattern.getImage(disabled), 0, dy1, (int) (pos - spacing), dy2,
                                 (int) (repeat - pos), 0, imgWidth, imgHeight, null);

trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

@@ -183 +183 @@
 
         return new double[] {
-                /* Calculate latitude */
+                        /* Calculate latitude */
                         phif + x2frac * x2poly * (x * x)
                         + x4frac * x4poly * pow(x, 4.0)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -991 +991 @@
     }
 
-     /**
+    /**
      * The *result* depends on the current map selection state IF use_selected is true.
      *

trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

@@ -57 +57 @@
     private Timer hideTimer; // started when message is shown, responsible for hiding the message
     private Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages
-    private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor
-                                      // is moved off the panel
+    private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel
     private boolean running;
 

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

@@ -545 +545 @@
     }
 
-     /**
+    /**
      * This simply fires up an {@link RelationEditor} for the relation shown; everything else
      * is the editor's business.

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -1121 +1121 @@
             putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse"));
             putValue(NAME, tr("Reverse"));
-        //  Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"),
-        //      KeyEvent.VK_END, Shortcut.ALT)
+        //  Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"), KeyEvent.VK_END, Shortcut.ALT)
             updateEnabledState();
         }
@@ -1570 +1569 @@
             putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
             putValue(NAME, tr("Download Members"));
-        //  Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
-        //      KeyEvent.VK_K, Shortcut.ALT)
+        //  Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"), KeyEvent.VK_K, Shortcut.ALT)
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -302 +302 @@
                     continue;
                 }
-                 // now we are sure some color will be assigned
+                // now we are sure some color will be assigned
                 Color color = null;
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -116 +116 @@
         /** The value needs to end with the reference string. */
         ENDS_WITH,
-         /** The value needs to contain the reference string. */
+        /** The value needs to contain the reference string. */
         CONTAINS;
 

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -411 +411 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                                Collection<String> t = new LinkedList<>(getToolString());
-                                ActionParser parser = new ActionParser(null);
-                                // get text definition of current action
+                Collection<String> t = new LinkedList<>(getToolString());
+                ActionParser parser = new ActionParser(null);
+                // get text definition of current action
                 String res = parser.saveAction(act);
-                                // remove the button from toolbar preferences
-                                t.remove(res);
-                                Main.pref.putCollection("toolbar", t);
-                                Main.toolbar.refreshToolbarControl();
-                            }
-                });
+                // remove the button from toolbar preferences
+                t.remove(res);
+                Main.pref.putCollection("toolbar", t);
+                Main.toolbar.refreshToolbarControl();
+            }
+        });
 
         private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {

trunk/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java

@@ -99 +99 @@
                 MessageNotifier.start();
             }
-        // Even if they have not changed,
         } else {
-            // notifier should be stopped if user is no more identified enough
+            // Even if they have not changed, notifier should be stopped if user is no more identified enough
             if (!MessageNotifier.isUserEnoughIdentified()) {
                 MessageNotifier.stop();
-            // or restarted if user is again identified and notifier was enabled in preferences
             } else if (enabled && !MessageNotifier.isRunning()) {
+                // or restarted if user is again identified and notifier was enabled in preferences
                 MessageNotifier.start();
             }

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -339 +339 @@
                 model.updateTags(tagPaster.execute());
             } else {
-                // Paste tags from arbitrary text
+                 // Paste tags from arbitrary text
                  Map<String, String> tags = TextTagParser.readTagsFromText(buf);
                  if (tags == null || tags.isEmpty()) {

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -347 +347 @@
     public Collection<FontEntry> getAdditionalFonts() {
         Collection<FontEntry> def = new ArrayList<>();
-        def.add(new FontEntry("devanagari", "", "")); // just include in fallback list
-                                                      // font already defined in template
+        def.add(new FontEntry("devanagari", "", "")); // just include in fallback list font already defined in template
 
         // Windows scripts: https://msdn.microsoft.com/en-us/goglobal/bb688099.aspx

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -215 +215 @@
         // tag1\tval1\ntag2\tval2\n
         tags = readTagsByRegexp(buf, "[\\r\\n]+", ".*?([a-zA-Z0-9:_]+).*\\t(.*?)", false);
-                // try "tag\tvalue\n" format
+        // try "tag\tvalue\n" format
         if (tags != null) return tags;
 
@@ -224 +224 @@
         // a = b=c  - this method of parsing fails intentionally
         tags = readTagsByRegexp(buf, "[\\n\\t\\r]+", "(.*?)=(.*?)", true);
-                // try format  t1=v1\n t2=v2\n ...
+        // try format  t1=v1\n t2=v2\n ...
         if (tags != null) return tags;