Changeset 29854 in osm for applications/editors/josm/plugins/OpeningHoursEditor

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/OpeningHoursEditor

Files:

• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ohe/gui/OheEditor.java (modified) (1 diff)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for a JOSM  plugin.
-**
-** Maintaining versions
-** ====================
-** see README.template
-**
-** Usage
-** =====
-** To build it run
-**
-**    > ant  dist
-**
-** To install the generated plugin locally (in you default plugin directory) run
-**
-**    > ant  install
-**
-** The generated plugin jar is not automatically available in JOSMs plugin configuration
-** dialog. You have to check it in first.
-**
-** Use the ant target 'publish' to check in the plugin and make it available to other
-** JOSM users:
-**    set the properties commit.message and plugin.main.version
-** and run
-**    > ant  publish
-**
-**
--->
 <project name="OpeningHoursEditor" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="fixed main version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6082"/>
+    <property name="plugin.main.version" value="6162"/>
     <!--
       ************************************************
@@ -42 +14 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.5"/>
+    <property name="ant.build.javac.target" value="1.6"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <!--

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java

@@ -108 +108 @@
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public void actionPerformed(ActionEvent evt) {

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java

@@ -62 +62 @@
             value = (String) valuesToEdit;
         else if (valuesToEdit instanceof Map<?, ?>) {
+            @SuppressWarnings("unchecked")
             Map<String, Integer> valuesMap = (Map<String, Integer>) valuesToEdit;
             if (valuesMap.size() == 1)

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheEditor.java

@@ -15 +15 @@
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.ohe.ClockSystem;
 import org.openstreetmap.josm.plugins.ohe.OpeningTimeUtils;