Changeset 28445 in osm for applications/editors/josm

Timestamp:

2012-06-18T22:36:22+02:00 (12 years ago)

Author:

jttt

Message:

adapted to latest josm, not tested (plugin is not in josm plugin list so I'm not sure i'ts actually used)

Location:

applications/editors/josm/plugins/epsg31287

Files:

• build.xml (modified) (3 diffs)
• josm-EPSG31287.launch (added)
• src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287Gui.java (added)
• src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java (modified) (4 diffs)

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

@@ -36 +36 @@
     <property name="commit.message" value="fixed proj4 Parameters (thanks to Hetzi + Mikael Rittri)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="5248"/>
     <!--
       ************************************************
@@ -154 +154 @@
     </target>
     <!--
-    ************************** Publishing the plugin *********************************** 
-    -->
-    <!--
-        ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+    ************************** Publishing the plugin ***********************************
+    -->
+    <!--
+        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
         ** property ${coreversion.info.entry.revision}
         **
@@ -207 +207 @@
     </target>
     <!--
-        ** commits the plugin.jar 
+        ** commits the plugin.jar
         -->
     <target name="commit-dist">
         <echo>
     ***** Properties of published ${plugin.jar} *****
-    Commit message    : '${commit.message}'                    
+    Commit message    : '${commit.message}'
     Plugin-Mainversion: ${plugin.main.version}
     JOSM build version: ${coreversion.info.entry.revision}
     Plugin-Version    : ${version.entry.commit.revision}
-    ***** / Properties of published ${plugin.jar} *****                    
-                        
+    ***** / Properties of published ${plugin.jar} *****
+
     Now commiting ${plugin.jar} ...
     </echo>

applications/editors/josm/plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/Epsg31287.java

@@ -3 +3 @@
 package org.openstreetmap.josm.plugins.epsg31287;
 
-import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -10 +10 @@
     public Epsg31287(PluginInformation info) {
         super(info);
-        Projections.addProjection(new ProjectionEPSG31287());
+        ProjectionPreference.registerProjectionChoice(new Epsg31287Gui());
     }
 }

applications/editors/josm/plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.GridBagLayout;
-import java.awt.event.ActionListener;
 import java.awt.geom.Point2D;
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.tools.GBC;
 
-public class ProjectionEPSG31287 implements org.openstreetmap.josm.data.projection.Projection, org.openstreetmap.josm.data.projection.ProjectionSubPrefs {
+public class ProjectionEPSG31287 implements org.openstreetmap.josm.data.projection.Projection {
 
-        private double dx = 0.0;
-        private double dy = 0.0;
+        private final double dx;
+        private final double dy;
         private final static String projCode = "EPSG:31287";
 
@@ -29 +20 @@
 
         public ProjectionEPSG31287() {
-                super();
+                this(0,0);
+        }
+
+        public ProjectionEPSG31287(double dx, double dy) {
+                this.dx = dx;
+                this.dy = dy;
                 // use use com.jhlabs.map.proj.ProjectionFactory for doing all the math
                 projection = com.jhlabs.map.proj.ProjectionFactory.fromPROJ4Specification(
@@ -45 +41 @@
                                 }
                 );
-        }
-
-        // PreferencePanel, not used in plugin mode, useful for JOSM custom-build
-        @Override
-        public void setupPreferencePanel(JPanel p, ActionListener actionListener) {
-                //p.add(new HtmlPanel("<i>EPSG:31287 - Bessel 1841 in Lambert_Conformal_Conic_2SP</i>"), GBC.eol().fill(GBC.HORIZONTAL));
-                //p.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-                p.setLayout(new GridBagLayout());
-
-                JTextField gdx = new JTextField(""+dx);
-                JTextField gdy = new JTextField(""+dy);
-
-                p.add(new JLabel(tr("dx")), GBC.std().insets(5,5,0,5));
-                p.add(GBC.glue(1, 0), GBC.std().fill(GBC.HORIZONTAL));
-                p.add(gdx, GBC.eop().fill(GBC.HORIZONTAL));
-
-                p.add(new JLabel(tr("dy")), GBC.std().insets(5,5,0,5));
-                p.add(GBC.glue(1, 0), GBC.std().fill(GBC.HORIZONTAL));
-                p.add(gdy, GBC.eop().fill(GBC.HORIZONTAL));
-                p.add(GBC.glue(1, 1), GBC.eol().fill(GBC.BOTH));
-
-        }
-
-        // for PreferencePanel, not used in plugin mode, useful for JOSM custom-build
-        @Override
-        public Collection<String> getPreferences(JPanel p) {
-                dx = new Double(((JTextField)p.getComponent(2)).getText());
-                dy = new Double(((JTextField)p.getComponent(5)).getText());
-                return Arrays.asList(""+dx,""+dy);
-        }
-
-        // for PreferencePanel, not used in plugin mode, useful for JOSM custom-build
-        @Override
-        public Collection<String> getPreferencesFromCode(String code) {
-                dx = 85.0;
-                dy = 45.0;
-                return null;
-        }
-
-        // for PreferencePanel, not used in plugin mode, useful for JOSM custom-build
-        @Override
-        public void setPreferences(Collection<String> args) {
-                if(args != null)
-                {
-                        String[] array = args.toArray(new String[0]);
-                        if (array.length > 0) {
-                                try {
-                                        dx = Double.parseDouble(array[0]);
-                                } catch(NumberFormatException e) {}
-                        }
-                        if (array.length > 1) {
-                                try {
-                                        dy = Double.parseDouble(array[1]);
-                                } catch(NumberFormatException e) {}
-                        }
-                }
         }
 
@@ -162 +102 @@
         }
 
-        @Override
-        public String[] allCodes() {
-                return new String[] {projCode};
-        }
 
 }