Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified) (6 diffs)

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

@@ -67 +67 @@
     private Component copyMenuComponent(Component menuComponent) {
         if (menuComponent instanceof JMenu) {
-            JMenu menu = (JMenu)menuComponent;
+            JMenu menu = (JMenu) menuComponent;
             JMenu result = new JMenu(menu.getAction());
             for (Component item:menu.getMenuComponents()) {
@@ -75 +75 @@
             return result;
         } else if (menuComponent instanceof JMenuItem) {
-            JMenuItem menuItem = (JMenuItem)menuComponent;
+            JMenuItem menuItem = (JMenuItem) menuComponent;
             JMenuItem result = new JMenuItem(menuItem.getAction());
             result.setText(menuItem.getText());
             return result;
-        } else if(menuComponent instanceof JSeparator) {
+        } else if (menuComponent instanceof JSeparator) {
             return new JSeparator();
         } else {
@@ -102 +102 @@
      * Sorts the menu items using the translated item text
      */
-    public void sortMenu(){
+    public void sortMenu() {
         TaggingPresetMenu.sortMenu(this.menu);
     }
@@ -109 +109 @@
      * Sorts the menu items using the translated item text
      */
-    public static void sortMenu(JMenu menu){
+    public static void sortMenu(JMenu menu) {
         Component[] items = menu.getMenuComponents();
         PresetTextComparator comp = new PresetTextComparator();
@@ -116 +116 @@
         for (int i = 0; i < items.length; i++) {
             Object item = items[i];
-            if (item instanceof JMenu){
-                sortMenu((JMenu)item);
+            if (item instanceof JMenu) {
+                sortMenu((JMenu) item);
             }
-            if (item instanceof JMenuItem){
-                sortarray.add((JMenuItem)item);
-                if (i == items.length-1){
+            if (item instanceof JMenuItem) {
+                sortarray.add((JMenuItem) item);
+                if (i == items.length-1) {
                     Collections.sort(sortarray, comp);
                     int pos = 0;
                     for (JMenuItem menuItem : sortarray) {
                         int oldPos;
-                        if (lastSeparator == 0){
-                            oldPos=pos;
+                        if (lastSeparator == 0) {
+                            oldPos = pos;
                         } else {
                             oldPos = pos+lastSeparator+1;
@@ -137 +137 @@
                     lastSeparator = 0;
                 }
-            } else if (item instanceof JSeparator){
+            } else if (item instanceof JSeparator) {
                 Collections.sort(sortarray, comp);
                 int pos = 0;
                 for (JMenuItem menuItem : sortarray) {
                     int oldPos;
-                    if(lastSeparator == 0){
-                        oldPos=pos;
-                    }else {
+                    if (lastSeparator == 0) {
+                        oldPos = pos;
+                    } else {
                         oldPos = pos+lastSeparator+1;
                     }