Changeset 6070 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2013-07-17T00:01:49+02:00 (11 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (11 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -67 +67 @@
     /**
      * Replies the color used to paint conflicts.
-     * 
+     *
      * @return the color used to paint conflicts
      * @since 1221
@@ -83 +83 @@
     /** the list widget for the list of conflicts */
     private JList lstConflicts;
-    
+
     private final JPopupMenu popupMenu = new JPopupMenu();
     private final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
@@ -115 +115 @@
             btnResolve, btnSelect
         }));
-        
+
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
     }
@@ -143 +143 @@
         DataSet.removeSelectionListener(this);
     }
-    
+
     /**
      * Add a list selection listener to the conflicts list.
@@ -152 +152 @@
         lstConflicts.getSelectionModel().addListSelectionListener(listener);
     }
-    
+
     /**
      * Remove the given list selection listener from the conflicts list.
@@ -161 +161 @@
         lstConflicts.getSelectionModel().removeListSelectionListener(listener);
     }
-    
+
     /**
      * Replies the popup menu handler.
@@ -218 +218 @@
     /**
      * Paints all conflicts that can be expressed on the main window.
-     * 
+     *
      * @param g The {@code Graphics} used to paint
      * @param nc The {@code NavigatableComponent} used to get screen coordinates of nodes
@@ -294 +294 @@
     /**
      * returns the first selected item of the conflicts list
-     * 
+     *
      * @return Conflict
      */
@@ -331 +331 @@
         return ht("/Dialog/ConflictList");
     }
-    
+
     class MouseEventHandler extends PopupMenuLauncher {
         public MouseEventHandler() {
@@ -438 +438 @@
             }
             DataSet ds = Main.main.getCurrentDataSet();
-            if (ds != null) { // Can't see how it is possible but it happened in #7942 
+            if (ds != null) { // Can't see how it is possible but it happened in #7942
                 ds.setSelected(sel);
             }
@@ -450 +450 @@
         }
     }
-    
+
     /**
      * Warns the user about the number of detected conflicts