Changeset 33724 in osm for applications/editors/josm/plugins/seachart

Timestamp:

2017-10-19T17:19:20+02:00 (7 years ago)

Author:

malcolmh

Message:

Replace deprecations

Location:

applications/editors/josm/plugins/seachart/src

Files:

• render/Signals.java (modified) (2 diffs)
• s57/S57att.java (modified) (4 diffs)
• s57/S57osm.java (modified) (1 diff)
• s57/S57val.java (modified) (1 diff)
• seachart/ChartImage.java (modified) (4 diffs)
• seachart/Seachart.java (modified) (2 diffs)
• seachart/SeachartAction.java (modified) (4 diffs)

applications/editors/josm/plugins/seachart/src/render/Signals.java

@@ -417 +417 @@
                         continue;
                     }
-                    if (atts.containsKey(Att.LITRAD)) {
-                        radius = (Double) atts.get(Att.LITRAD).val;
-                    }
                     if (atts.containsKey(Att.CATLIT)) {
                         ArrayList<CatLIT> cats = (ArrayList<CatLIT>) atts.get(Att.CATLIT).val;
@@ -434 +431 @@
                                     if (satts == atts)
                                         continue;
-                                    if (satts.containsKey(Att.LITRAD)) {
-                                        srad = (Double) satts.get(Att.LITRAD).val;
-                                    }
                                     if (srad == radius) {
                                         ArrayList<CatLIT> scats = (ArrayList<CatLIT>) ((satts.containsKey(Att.CATLIT)) ?

applications/editors/josm/plugins/seachart/src/s57/S57att.java

@@ -29 +29 @@
         MEAWAT, MEANAM, OTHWAT, OTHNAM, REFLEV, SDRLEV, VCRLEV, SCHREF, USESHP, CURVHW, CURVLW, CURVMW, CURVOW, APTREF, SHPTYP, UPDMSG, ADDMRK, CATNMK, CATBRT, CATBUN,
         CATCCL, CATCOM, CATHBR, CATRFD, CATTML, CATGAG, CATVTR, CATTAB, CATEXS, LG_SPD, LG_SPR, LG_BME, LG_LGS, LG_DRT, LG_WDP, LG_WDU, LG_REL, LG_FNC, LG_DES, LG_PBR,
-        LC_CSI, LC_CSE, LC_ASI, LC_ASE, LC_CCI, LC_CCE, LC_BM1, LC_BM2, LC_LG1, LC_LG2, LC_DR1, LC_DR2, LC_SP1, LC_SP2, LC_WD1, LC_WD2, LITRAD, CATCVR, HUNITS
+        LC_CSI, LC_CSE, LC_ASI, LC_ASE, LC_CCI, LC_CCE, LC_BM1, LC_BM2, LC_LG1, LC_LG2, LC_DR1, LC_DR2, LC_SP1, LC_SP2, LC_WD1, LC_WD2, CATCVR, HUNITS
     }
 
@@ -145 +145 @@
         AttStr.put(Att.CURVLW, "low_velocity"); AttStr.put(Att.CURVMW, "mean_velocity"); AttStr.put(Att.CURVOW, "other_velocity"); AttStr.put(Att.APTREF, "passing_time");
         AttStr.put(Att.CATCOM, "category"); AttStr.put(Att.CATCVR, "category"); AttStr.put(Att.CATEXS, "category"); AttStr.put(Att.SHPTYP, "ship");
-        AttStr.put(Att.UPDMSG, "message"); AttStr.put(Att.LITRAD, "radius");
+        AttStr.put(Att.UPDMSG, "message");
     }
 
@@ -448 +448 @@
         Quality.put(Obj.UNKOBJ, Att.QUASOU); }
 
-    private static final EnumMap<Obj, Att> Radius = new EnumMap<>(Obj.class); static {
-        Radius.put(Obj.UNKOBJ, Att.RADIUS); Radius.put(Obj.LIGHTS, Att.LITRAD); }
-
-    private static final EnumMap<Obj, Att> Range = new EnumMap<>(Obj.class); static {
+   private static final EnumMap<Obj, Att> Range = new EnumMap<>(Obj.class); static {
         Range.put(Obj.UNKOBJ, Att.VALNMR); }
 
@@ -595 +592 @@
         StrAtt.put("operation", Operation); StrAtt.put("orientation", Orientation); StrAtt.put("passing_time", Passing_time); StrAtt.put("period", Period); StrAtt.put("period_end", Period_end);
         StrAtt.put("period_start", Period_start); StrAtt.put("pilot_district", Pilot_district); StrAtt.put("position_quality", Position_quality); StrAtt.put("positional_accuracy", Positional_accuracy);
-        StrAtt.put("producing_country", Producing_country); StrAtt.put("product", Product); StrAtt.put("quality", Quality); StrAtt.put("radius", Radius); StrAtt.put("range", Range);
+        StrAtt.put("producing_country", Producing_country); StrAtt.put("product", Product); StrAtt.put("quality", Quality); StrAtt.put("range", Range);
         StrAtt.put("reference", Reference); StrAtt.put("reflectivity", Reflectivity); StrAtt.put("restriction", Restriction); StrAtt.put("schedule", Schedule); StrAtt.put("shape", Shape);
         StrAtt.put("sector_end", Sector_end); StrAtt.put("sector_start", Sector_start); StrAtt.put("sequence", Sequence); StrAtt.put("shift", Shift); StrAtt.put("ship", Ship);

applications/editors/josm/plugins/seachart/src/s57/S57osm.java

@@ -52 +52 @@
         OSMtags.put("landuse=industrial", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null)); OSMtags.put("landuse=commercial", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null));
         OSMtags.put("landuse=retail", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null)); OSMtags.put("landuse=residential", new KeyVal<>(Obj.BUAARE, Att.UNKATT, null, null));
-        OSMtags.put("place=city", new KeyVal<>(Obj.BUAARE, Att.CATBUA, Conv.E, CatBUA.BUA_CITY)); OSMtags.put("place=town", new KeyVal<>(Obj.BUAARE, Att.CATBUA, Conv.E, CatBUA.BUA_TOWN));
-        OSMtags.put("place=village", new KeyVal<>(Obj.BUAARE, Att.CATBUA, Conv.E, CatBUA.BUA_VLLG));
     }
 

applications/editors/josm/plugins/seachart/src/s57/S57val.java

@@ -1505 +1505 @@
         keys.put(Att.LC_DR1, new S57key(Conv.F, null)); keys.put(Att.LC_DR2, new S57key(Conv.F, null)); keys.put(Att.LC_SP1, new S57key(Conv.F, null));
         keys.put(Att.LC_SP2, new S57key(Conv.F, null)); keys.put(Att.LC_WD1, new S57key(Conv.F, null)); keys.put(Att.LC_WD2, new S57key(Conv.F, null));
-        keys.put(Att.LITRAD, new S57key(Conv.F, null)); keys.put(Att.CATCVR, new S57key(Conv.E, Catcvr));
+        keys.put(Att.CATCVR, new S57key(Conv.E, Catcvr));
     }
 

applications/editors/josm/plugins/seachart/src/seachart/ChartImage.java

@@ -11 +11 @@
 import javax.swing.Action;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -70 +70 @@
     @Override
     public void paint(Graphics2D g2, MapView mv, Bounds bb) {
-        Rectangle rect = Main.map.mapView.getBounds();
+        Rectangle rect = MainApplication.getMap().mapView.getBounds();
         Renderer.reRender(g2, rect, zoom, Math.pow(2, (zoom-12)), SeachartAction.map, this);
         g2.setPaint(Color.black);
@@ -84 +84 @@
     @Override
     public void zoomChanged() {
-        if ((Main.map != null) && (Main.map.mapView != null)) {
-            Bounds bounds = Main.map.mapView.getRealBounds();
+        if ((MainApplication.getMap() != null) && (MainApplication.getMap().mapView != null)) {
+            Bounds bounds = MainApplication.getMap().mapView.getRealBounds();
             top = bounds.getMax().lat();
             bottom = bounds.getMin().lat();
             left = bounds.getMin().lon();
             right = bounds.getMax().lon();
-            width = Main.map.mapView.getBounds().getWidth();
-            height = Main.map.mapView.getBounds().getHeight();
+            width = MainApplication.getMap().mapView.getBounds().getWidth();
+            height = MainApplication.getMap().mapView.getBounds().getHeight();
             zoom = ((int) Math.min(18, Math.max(9, Math.round(Math.floor(Math.log(1024 / bounds.asRect().height) / Math.log(2))))));
         }
@@ -98 +98 @@
     @Override
     public Point2D.Double getPoint(Snode coord) {
-        return (Double) Main.map.mapView.getPoint2D(new LatLon(Math.toDegrees(coord.lat), Math.toDegrees(coord.lon)));
+        return (Double) MainApplication.getMap().mapView.getPoint2D(new LatLon(Math.toDegrees(coord.lat), Math.toDegrees(coord.lon)));
     }
 
     @Override
     public double mile(Feature feature) {
-        return 185000 / Main.map.mapView.getDist100Pixel();
+        return 185000 / MainApplication.getMap().mapView.getDist100Pixel();
     }
 

applications/editors/josm/plugins/seachart/src/seachart/Seachart.java

@@ -2 +2 @@
 package seachart;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -14 +14 @@
     public Seachart(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.imageryMenu, new SeachartAction());
+        MainMenu.add(MainApplication.getMenu().imageryMenu, new SeachartAction());
     }
 }

applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java

@@ -7 +7 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -124 +124 @@
         rendering = new ChartImage(new ImageryInfo("SeaChart"));
         rendering.setBackgroundLayer(true);
-        Main.getLayerManager().addLayer(rendering);
-        Main.getLayerManager().addAndFireActiveLayerChangeListener(this);
-        Main.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayer(rendering);
+        MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
     }
 
@@ -132 +132 @@
         if (isOpen) {
                 try {
-            Main.getLayerManager().removeActiveLayerChangeListener(this);
-            Main.getLayerManager().removeLayerChangeListener(this);
-            Main.getLayerManager().removeLayer(rendering);
+            MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
+            MainApplication.getLayerManager().removeLayerChangeListener(this);
+            MainApplication.getLayerManager().removeLayer(rendering);
                 } catch (Exception e) {
                         // Assume that this can't be serious?
@@ -149 +149 @@
             oldLayer.data.removeDataSetListener(dataSetListener);
         }
-        OsmDataLayer newLayer = Main.getLayerManager().getEditLayer();
+        OsmDataLayer newLayer = MainApplication.getLayerManager().getEditLayer();
         if (newLayer != null) {
             newLayer.data.addDataSetListener(dataSetListener);