Changeset 33828 in osm for applications/editors/josm

Timestamp:

2017-11-17T21:21:04+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12643

Location:

applications/editors/josm/plugins/indoor_sweepline

Files:

• build.xml (modified) (1 diff)
• src/indoor_sweepline/Beam.java (modified) (1 diff)
• src/indoor_sweepline/IndoorSweepline.java (modified) (2 diffs)
• src/indoor_sweepline/IndoorSweeplineController.java (modified) (2 diffs)
• src/indoor_sweepline/IndoorSweeplineModel.java (modified) (4 diffs)
• src/indoor_sweepline/IndoorSweeplineWizardAction.java (modified) (3 diffs)
• src/indoor_sweepline/IndoorSweeplineWizardDialog.java (modified) (7 diffs)

applications/editors/josm/plugins/indoor_sweepline/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/Beam.java

@@ -152 +152 @@
     }
 
-    private class StripPosition {
+    private static class StripPosition {
         StripPosition(int nodeIndex, double offset) {
             this.nodeIndex = nodeIndex;

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweepline.java

@@ -5 +5 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -21 +21 @@
 
     public static void refreshMenu() {
-        JMenu menu = Main.main.menu.moreToolsMenu;
+        JMenu menu = MainApplication.getMenu().moreToolsMenu;
         if (menu.isVisible())
             menu.addSeparator();

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineController.java

@@ -6 +6 @@
 import javax.swing.DefaultComboBoxModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -17 +17 @@
 
     public IndoorSweeplineController(OsmDataLayer activeLayer, LatLon center) {
-        Main.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
         layer = activeLayer;
         model = new IndoorSweeplineModel(activeLayer, center);

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineModel.java

@@ -3 +3 @@
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Vector;
 
 import javax.swing.DefaultComboBoxModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -197 +198 @@
     private void updateOsmModel() {
         distributeWays();
-        Main.map.mapView.repaint();
-    }
-
-    public class SweepPolygonCursor {
+        MainApplication.getMap().mapView.repaint();
+    }
+
+    public static class SweepPolygonCursor {
+        public int stripIndex;
+        public int partIndex;
+
         public SweepPolygonCursor(int stripIndex, int partIndex) {
             this.stripIndex = stripIndex;
@@ -206 +210 @@
         }
 
-        public boolean equals(SweepPolygonCursor rhs) {
-            return rhs != null
-                    && stripIndex == rhs.stripIndex && partIndex == rhs.partIndex;
-        }
-
-        public int stripIndex;
-        public int partIndex;
+        @Override
+        public int hashCode() {
+            return Objects.hash(stripIndex, partIndex);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null || getClass() != obj.getClass())
+                return false;
+            SweepPolygonCursor other = (SweepPolygonCursor) obj;
+            return Objects.equals(partIndex, other.partIndex)
+                    && Objects.equals(stripIndex, other.stripIndex);
+        }
     }
 
@@ -228 +240 @@
         }
 
-        Boolean truePtr = new Boolean(true);
+        Boolean truePtr = Boolean.TRUE;
         for (int i = 0; i < stripRefs.size(); ++i) {
             Vector<Boolean> refs = stripRefs.elementAt(i);

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineWizardAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
@@ -25 +25 @@
         super(tr("Concourse wizard ..."), null,
                 tr("Opens up a wizard to create a concourse"), null, false);
-        Main.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
     }
 
@@ -36 +36 @@
             JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
                     "The default layer is not an OSM layer.");
-        else if (Main.map == null)
+        else if (MainApplication.getMap() == null)
             JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
                     "No map found.");
-        else if (Main.map.mapView == null)
+        else if (MainApplication.getMap().mapView == null)
             JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
                     "No map view found.");
         else
             new IndoorSweeplineController((OsmDataLayer) layer,
-                    Projections.inverseProject(Main.map.mapView.getCenter()));
+                    Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter()));
     }
 
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        layer = Main.getLayerManager().getActiveLayer();
+        layer = MainApplication.getLayerManager().getActiveLayer();
     }
 

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineWizardDialog.java

@@ -33 +33 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 public class IndoorSweeplineWizardDialog extends JDialog {
@@ -90 +91 @@
             }
         } catch (IllegalStateException ex) {
-            Main.trace(ex);
+            Logging.trace(ex);
         }
 
@@ -96 +97 @@
             level.setText(controller.getLevel());
         } catch (IllegalStateException ex) {
-            Main.trace(ex);
+            Logging.trace(ex);
         }
 
@@ -369 +370 @@
                     controller.setStripWidth(beamIndex, Double.parseDouble(stripWidth.getText()));
             } catch (NumberFormatException ex) {
-                Main.trace(ex);
+                Logging.trace(ex);
             }
 
@@ -410 +411 @@
     }
 
-    private class StructureTableModel extends DefaultTableModel {
+    private static class StructureTableModel extends DefaultTableModel {
         @Override
         public boolean isCellEditable(int row, int column) {
@@ -473 +474 @@
                                 Double.parseDouble(((TableModel) e.getSource()).getValueAt(row, column).toString()));
                 } catch (NumberFormatException ex) {
-                    Main.trace(ex);
+                    Logging.trace(ex);
                 }
             } else if (column == 1 && beamIndex % 2 == 0) {
@@ -492 +493 @@
     }
 
-    private class GridbagPanel extends JPanel {
+    private static class GridbagPanel extends JPanel {
         GridbagPanel() {
             gridbag = new GridBagLayout();