Changeset 18404 in osm for applications/editors/josm/plugins/wmsplugin

Timestamp:

2009-11-01T13:19:59+01:00 (15 years ago)

Author:

stoecker

Message:

updated some stuff to current JOSM

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• build.xml (modified) (8 diffs)
• src/wmsplugin/WMSPlugin.java (modified) (4 diffs)

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

@@ -18 +18 @@
 ** To build against the core in ../../core, create a correct manifest and deploy to
 ** SVN, run
-**    - set the property commit.message 
+**    - set the property commit.message
 **    - set the property josm.reference.release to lowest JOSM release number this
 **      plugin build is compatible with
@@ -32 +32 @@
     <property name="ant.build.javac.target" value="1.5"/>
         <property name="commit.message"         value="fixing JOSM issue #3186" />
-        <property name="josm.reference.release" value="2196" />
-        
+        <property name="josm.reference.release" value="2323" />
+
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
@@ -85 +85 @@
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
-        
+
         <target name="core-info">
                 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
@@ -98 +98 @@
                 </target>
 
-                
+
                 <target name="commit-current">
                         <echo>Commiting the plugin source ...</echo>
@@ -106 +106 @@
                                     <arg value="-m &quot;${commit.message}&quot;"/>
                                     <arg value="."/>
-                    </exec>         
+                    </exec>
                 </target>
 
-                
+
                 <target name="update-current">
                         <echo>Updating basedir ...</echo>
@@ -116 +116 @@
                                     <arg value="up"/>
                                     <arg value="."/>
-                    </exec>         
+                    </exec>
                         <echo>Updating ${plugin.jar} ...</echo>
                     <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
@@ -122 +122 @@
                                     <arg value="up"/>
                                     <arg value="${plugin.jar}"/>
-                    </exec>         
+                    </exec>
                 </target>
-                
+
                 <target name="commit-dist">
                                 <echo>Commiting ${plugin.jar} ...</echo>
@@ -132 +132 @@
                                                 <arg value="-m &quot;${commit.message}&quot;"/>
                                             <arg value="${plugin.jar}"/>
-                            </exec>         
+                            </exec>
                 </target>
-                
+
                 <target name="deploy" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
                 </target>

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java

@@ -1 +1 @@
 package wmsplugin;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -51 +51 @@
     static int overlapEast = 14;
     static int overlapNorth = 4;
-    
+
     // remember state of menu item to restore on changed preferences
     static private boolean menuEnabled = false;
-    
+
     protected void initExporterAndImporter() {
         ExtensionFileFilter.exporters.add(new WMSLayerExporter());
@@ -94 +94 @@
         TreeSet<String> keys = new TreeSet<String>(prefs.keySet());
 
-        // Here we load the settings for "overlap" checkbox and spinboxes. 
-         
-        try { 
-            doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap"));             
-        } catch (Exception e) {} // If sth fails, we drop to default settings. 
- 
-        try { 
-            overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast"));             
-        } catch (Exception e) {} // If sth fails, we drop to default settings. 
- 
-        try { 
-            overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth"));             
-        } catch (Exception e) {} // If sth fails, we drop to default settings. 
+        // Here we load the settings for "overlap" checkbox and spinboxes.
+
+        try {
+            doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        try {
+            overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        try {
+            overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
 
         // And then the names+urls of WMS servers
@@ -169 +169 @@
 
         if (wmsJMenu == null)
-            wmsJMenu = menu.addMenu(marktr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos);
+            wmsJMenu = menu.addMenu(tr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos, ht("/Plugin/WMS"));
         else
             wmsJMenu.removeAll();