Changeset 12187 in osm for applications

Timestamp:

2008-12-02T17:21:16+01:00 (16 years ago)

Author:

stoecker

Message:

fixed some warnings, added new shortcur handling

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• build.xml (modified) (2 diffs)
• src/wmsplugin/Help_WMSmenuAction.java (modified) (1 diff)
• src/wmsplugin/Map_Rectifier_WMSmenuAction.java (modified) (1 diff)
• src/wmsplugin/WMSDownloadAction.java (modified) (1 diff)
• src/wmsplugin/WMSPlugin.java (modified) (3 diffs)

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

@@ -28 +28 @@
     <echo message="creating ${plugin.jar}"/>
     <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+      <compilerarg value="-Xlint:deprecation"/>
+      <compilerarg value="-Xlint:unchecked"/>
       <include name="**/*.java" />
     </javac>
@@ -50 +52 @@
     <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
-        <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
-    <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-    <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-        <attribute name="Plugin-Description" value="Allows external WMS resources to be displayed." />
+        <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+        <attribute name="Plugin-Description" value="Allows external WMS resources to be displayed." />
+        <attribute name="Plugin-Mainversion" value="1065" />
       </manifest>
     </jar>

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

@@ -18 +18 @@
         public Help_WMSmenuAction() {
                 //super("Help / About");
-                super(tr("help"), "help", tr("Help / About"), 0, 0, false);
+                super(tr("help"), "help", tr("Help / About"), null, false);
                 
         }

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

@@ -18 +18 @@
 
         public Map_Rectifier_WMSmenuAction() {
-                super(tr("Rectified Image ..."), "OLmarker", tr("Download Rectified Image from Metacarta's Map Rectifer WMS"), 0, 0, false);
+                super(tr("Rectified Image ..."), "OLmarker", tr("Download Rectified Image from Metacarta's Map Rectifer WMS"), null, false);
         }
 

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

@@ -16 +16 @@
         
         public WMSDownloadAction(WMSInfo info) {
-                super(info.name, "wmsmenu", tr("Download WMS tile from {0}",info.name), 0, 0, false);
+                super(info.name, "wmsmenu", tr("Download WMS tile from {0}",info.name), null, false);
                 this.info = info;
         }

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

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.IconToggleButton;
@@ -109 +110 @@
 
                 Collections.sort(wmsList);
-                JMenuBar menu = Main.main.menu;
+                MainMenu menu = Main.main.menu;
 
                 if (wmsJMenu == null) {
                         wmsJMenu = new JMenu(tr("WMS"));
-                        wmsJMenu.setMnemonic(KeyEvent.VK_W);
+                        menu.add(wmsJMenu, KeyEvent.VK_W, "wms");
                         menu.add(wmsJMenu, 5);
                 } else {
@@ -128 +129 @@
                 wmsJMenu.addSeparator();
                 wmsJMenu.add(new JMenuItem(new 
-                                JosmAction(tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), 0, 0, false) {
+                                JosmAction(tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
                         public void actionPerformed(ActionEvent ev) {
                                 Main.main.addLayer(new WMSLayer());