Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (16 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -501 +501 @@
         }
         panel.setVisible(true);
-        redoUndoListener.commandChanged(0,0);
+        redoUndoListener.commandChanged(0, 0);
 
         Main.map = map;
@@ -532 +532 @@
 
         Object updateStatus(String event);
+
         void finish(Object status);
     }
@@ -768 +769 @@
         setMapFrame(mapFrame);
         if (firstLayer != null) {
-            mapFrame.selectMapMode((MapMode)mapFrame.getDefaultButtonAction(), firstLayer);
+            mapFrame.selectMapMode((MapMode) mapFrame.getDefaultButtonAction(), firstLayer);
         }
         mapFrame.initializeDialogsPane();
@@ -904 +905 @@
     protected static int windowState = JFrame.NORMAL;
 
-    private final CommandQueueListener redoUndoListener = new CommandQueueListener(){
+    private final CommandQueueListener redoUndoListener = new CommandQueueListener() {
         @Override
         public void commandChanged(final int queueSize, final int redoSize) {
@@ -998 +999 @@
                                 );
                     }
-                    if (f!=null) {
+                    if (f != null) {
                         fileList.add(f);
                     }
@@ -1008 +1009 @@
                 }
             }
-            if(!fileList.isEmpty()) {
+            if (!fileList.isEmpty()) {
                 OpenFileAction.openFiles(fileList, true);
             }
@@ -1067 +1068 @@
                 continue;
             }
-            AbstractModifiableLayer odl = (AbstractModifiableLayer)l;
+            AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
             if ((odl.requiresSaveToFile() || (odl.requiresUploadToServer() && !odl.isUploadDiscouraged())) && odl.isModified()) {
                 layersWithUnmodifiedChanges.add(odl);
@@ -1138 +1139 @@
      */
     private static DownloadParamType paramType(String s) {
-        if(s.startsWith("http:") || s.startsWith("https:")) return DownloadParamType.httpUrl;
-        if(s.startsWith("file:")) return DownloadParamType.fileUrl;
+        if (s.startsWith("http:") || s.startsWith("https:")) return DownloadParamType.httpUrl;
+        if (s.startsWith("file:")) return DownloadParamType.fileUrl;
         String coorPattern = "\\s*[+-]?[0-9]+(\\.[0-9]+)?\\s*";
-        if(s.matches(coorPattern+"(,"+coorPattern+"){3}")) return DownloadParamType.bounds;
+        if (s.matches(coorPattern+"(,"+coorPattern+") {3}")) return DownloadParamType.bounds;
         // everything else must be a file name
         return DownloadParamType.fileName;
@@ -1174 +1175 @@
         if (st.countTokens() == 4) {
             Bounds b = new Bounds(
-                    new LatLon(Double.parseDouble(st.nextToken()),Double.parseDouble(st.nextToken())),
-                    new LatLon(Double.parseDouble(st.nextToken()),Double.parseDouble(st.nextToken()))
+                    new LatLon(Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken())),
+                    new LatLon(Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()))
                     );
             downloadFromParamBounds(rawGps, b);
@@ -1247 +1248 @@
             Component c = e.getComponent();
             if (c instanceof JFrame && c.isVisible()) {
-                if(Main.windowState == JFrame.NORMAL) {
+                if (Main.windowState == JFrame.NORMAL) {
                     Main.geometry = new WindowGeometry((JFrame) c);
                 } else {
@@ -1258 +1259 @@
     protected static void addListener() {
         parent.addComponentListener(new WindowPositionSizeListener());
-        ((JFrame)parent).addWindowStateListener(new WindowPositionSizeListener());
+        ((JFrame) parent).addWindowStateListener(new WindowPositionSizeListener());
     }
 
@@ -1356 +1357 @@
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
 
-            synchronized(Main.class) {
+            synchronized (Main.class) {
                 Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
-                while (it.hasNext()){
+                while (it.hasNext()) {
                     WeakReference<ProjectionChangeListener> wr = it.next();
                     ProjectionChangeListener listener = wr.get();
@@ -1398 +1399 @@
     public static void removeProjectionChangeListener(ProjectionChangeListener listener) {
         if (listener == null) return;
-        synchronized(Main.class){
+        synchronized (Main.class) {
             Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
-            while (it.hasNext()){
+            while (it.hasNext()) {
                 WeakReference<ProjectionChangeListener> wr = it.next();
                 // remove the listener - and any other listener which got garbage
@@ -1462 +1463 @@
     public static void removeWindowSwitchListener(WindowSwitchListener listener) {
         if (listener == null) return;
-        synchronized (Main.class){
+        synchronized (Main.class) {
             Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
-            while (it.hasNext()){
+            while (it.hasNext()) {
                 WeakReference<WindowSwitchListener> wr = it.next();
                 // remove the listener - and any other listener which got garbage
@@ -1536 +1537 @@
                 synchronized (Main.class) {
                     Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
-                    while (it.hasNext()){
+                    while (it.hasNext()) {
                         WeakReference<WindowSwitchListener> wr = it.next();
                         WindowSwitchListener listener = wr.get();
@@ -1565 +1566 @@
                 synchronized (Main.class) {
                     Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
-                    while (it.hasNext()){
+                    while (it.hasNext()) {
                         WeakReference<WindowSwitchListener> wr = it.next();
                         WindowSwitchListener listener = wr.get();