Changeset 5925 in josm for trunk/src/org

Timestamp:

2013-05-05T19:03:05+02:00 (12 years ago)

Author:

bastiK

Message:

replace tabs by spaces

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HistoryInfoAction.java (modified) (1 diff)
• actions/InfoAction.java (modified) (1 diff)
• actions/WireframeToggleAction.java (modified) (1 diff)
• data/osm/DataSetMerger.java (modified) (1 diff)
• data/validation/TestError.java (modified) (1 diff)
• gui/bbox/SlippyMapControler.java (modified) (3 diffs)
• gui/dialogs/LatLonDialog.java (modified) (2 diffs)
• gui/dialogs/relation/ChildRelationBrowser.java (modified) (1 diff)

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

@@ -17 +17 @@
 public class HistoryInfoAction extends JosmAction {
 
-        public HistoryInfoAction() {
-                super(tr("History"), "about",
-                                tr("Display history information about OSM ways, nodes, or relations."),
-                                Shortcut.registerShortcut("core:historyinfo",
-                                tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
-                putValue("help", ht("/Action/ObjectHistory"));
-                putValue("toolbar", "action/historyinfo");
-                Main.toolbar.register(this);
-        }
+    public HistoryInfoAction() {
+        super(tr("History"), "about",
+                tr("Display history information about OSM ways, nodes, or relations."),
+                Shortcut.registerShortcut("core:historyinfo",
+                tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
+        putValue("help", ht("/Action/ObjectHistory"));
+        putValue("toolbar", "action/historyinfo");
+        Main.toolbar.register(this);
+    }
 
-        @Override
-        public void actionPerformed(ActionEvent ae) {
-                DataSet set = getCurrentDataSet();
-                if (set != null) {
-                        HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
-                }
-        }
+    @Override
+    public void actionPerformed(ActionEvent ae) {
+        DataSet set = getCurrentDataSet();
+        if (set != null) {
+            HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
+        }
+    }
 
-        @Override
-        public void updateEnabledState() {
-                if (getCurrentDataSet() == null) {
-                        setEnabled(false);
-                } else {
-                        updateEnabledState(getCurrentDataSet().getAllSelected());
-                }
-        }
+    @Override
+    public void updateEnabledState() {
+        if (getCurrentDataSet() == null) {
+            setEnabled(false);
+        } else {
+            updateEnabledState(getCurrentDataSet().getAllSelected());
+        }
+    }
 
-        @Override
-        protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-                setEnabled(!selection.isEmpty());
-        }
+    @Override
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+        setEnabled(!selection.isEmpty());
+    }
 }

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

@@ -29 +29 @@
     public void actionPerformed(ActionEvent ae) {
         DataSet set = getCurrentDataSet();
-                if (set != null) {
-                        new InspectPrimitiveDialog(set.getAllSelected(), Main.map.mapView.getEditLayer()).showDialog();
-                }
+        if (set != null) {
+            new InspectPrimitiveDialog(set.getAllSelected(), Main.map.mapView.getEditLayer()).showDialog();
+        }
     }
 

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

@@ -62 +62 @@
          if (selected){ 
          MapRendererFactory.getInstance().activate(WireframeMapRenderer.class); 
-                } else { 
-                    MapRendererFactory.getInstance().activate(StyledMapRenderer.class); 
-                } 
+            } else { 
+                MapRendererFactory.getInstance().activate(StyledMapRenderer.class); 
+            } 
         
         notifySelectedState();

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -407 +407 @@
         targetDataSet.beginUpdate();
         try {
-                ArrayList<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes());
+            ArrayList<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes());
             for (Node node: sourceDataSet.getNodes()) {
                 mergePrimitive(node, candidates);

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -132 +132 @@
      */
     public Collection<? extends OsmPrimitive> getSelectablePrimitives() {
-        List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size());
-        for (OsmPrimitive o : primitives) {
-            if (o.isSelectable()) {
-                selectablePrimitives.add(o);
-            }
-        }
+    List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size());
+    for (OsmPrimitive o : primitives) {
+        if (o.isSelectable()) {
+        selectablePrimitives.add(o);
+        }
+    }
         return selectablePrimitives;
     }

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

@@ -151 +151 @@
         if (e.getButton() == MouseEvent.BUTTON1) {
 
-                if (isSelecting && e.getClickCount() == 1) {
+            if (isSelecting && e.getClickCount() == 1) {
                 iSlippyMapChooser.setSelection(iStartSelectionPoint, e.getPoint());
 
@@ -159 +159 @@
                 isSelecting = false;
                 
-                } else {
+            } else {
                 int sourceButton = iSourceButton.hit(e.getPoint());
 
@@ -173 +173 @@
                     iSlippyMapChooser.toggleMapSource(iSourceButton.hitToTileSource(sourceButton));
                 }
-                }
+            }
         }
     }

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

@@ -79 +79 @@
         pnl.add(new HtmlPanel(
                 tr("Enter the coordinates for the new node.<br/>You can separate longitude and latitude with space, comma or semicolon.<br/>" +
-                                "Use positive numbers or N, E characters to indicate North or East cardinal direction.<br/>" +
-                                "For South and West cardinal directions you can use either negative numbers or S, W characters.<br/>" +
-                                "Coordinate value can be in one of three formats:<ul>" +
+                        "Use positive numbers or N, E characters to indicate North or East cardinal direction.<br/>" +
+                        "For South and West cardinal directions you can use either negative numbers or S, W characters.<br/>" +
+                        "Coordinate value can be in one of three formats:<ul>" +
                         "<li><i>degrees</i><tt>&deg;</tt></li>" +
                         "<li><i>degrees</i><tt>&deg;</tt> <i>minutes</i><tt>&#39;</tt></li>" +
                         "<li><i>degrees</i><tt>&deg;</tt> <i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li>" +
-                                "</ul>" +
-                                "Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> are optional.<br/><br/>" +
-                                "Some examples:<ul>" +
+                        "</ul>" +
+                        "Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> are optional.<br/><br/>" +
+                        "Some examples:<ul>" +
                         "<li>49.29918&deg; 19.24788&deg;</li>" +
                         "<li>N 49.29918 E 19.24788</li>" +
@@ -104 +104 @@
                         "<li>-49 29.4 N -19 24.5 W</li></ul>" +
                         "<li>48 deg 42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
-                                )),
+                        )),
                 GBC.eol().fill().weight(1.0, 1.0));
 

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

@@ -416 +416 @@
                 }
                 SwingUtilities.invokeLater(new Runnable() { 
-                        public void run() { 
-                                Main.map.repaint(); 
-                        } 
-                    }); 
+                    public void run() { 
+                        Main.map.repaint(); 
+                    } 
+                }); 
             } catch (Exception e) {
                 if (canceled) {