Changeset 30532 in osm for applications/editors/josm/plugins/tracer2

Timestamp:

2014-07-14T04:18:06+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

Location:

applications/editors/josm/plugins/tracer2

Files:

• .classpath (modified) (1 diff)
• .project (added)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamSelectDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/tracer2/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="src" path="test/src"/>
-        <!-- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-        <classpathentry kind="lib" path="/JOSM/dist/josm-custom.jar" sourcepath="/JOSM/src"/>
-        <classpathentry kind="lib" path="/JOSM/test/build" sourcepath="/JOSM/test/functional"/>
-        <classpathentry kind="lib" path="test/config"/>
-        <classpathentry kind="output" path="build"/> -->
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+        <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java

@@ -56 +56 @@
     private JTextField m_oDescription = new JTextField();
     private JTextArea m_oUrl = new JTextArea(5,5);
-    private JComboBox m_oTileSize;
-    private JComboBox m_oResolution;
+    private JComboBox<String> m_oTileSize;
+    private JComboBox<String> m_oResolution;
     //private JTextField m_oSkipBottom = new JTextField();
-    private JComboBox m_oMode;
+    private JComboBox<String> m_oMode;
     private JTextField m_oThreshold = new JTextField();
-    private JComboBox m_oPointsPerCircle;
+    private JComboBox<String> m_oPointsPerCircle;
     private JTextField m_oTag = new JTextField();
     private JTextField m_oPreferredValues = new JTextField();
@@ -112 +112 @@
     }
     
-    private void loadComboBox( JComboBox c, String strValue, String[] astrValues ) {
+    private void loadComboBox( JComboBox<?> c, String strValue, String[] astrValues ) {
         int pos = 0;
         for ( String str: astrValues ) {
@@ -123 +123 @@
     }
     
-    private String saveComboBox( JComboBox c, String[] astrValues ) {
+    private String saveComboBox( JComboBox<?> c, String[] astrValues ) {
         return astrValues[c.getSelectedIndex()];
     }
@@ -140 +140 @@
         setButtonIcons(new String[] { "ok.png", "cancel.png" });
         
-        m_oTileSize = new JComboBox(m_astrTileSize);
-        m_oResolution = new JComboBox(m_astrResolution);
-        m_oMode = new JComboBox(m_astrMode);
-        m_oPointsPerCircle = new JComboBox(m_astrPointsPerCircle);
+        m_oTileSize = new JComboBox<>(m_astrTileSize);
+        m_oResolution = new JComboBox<>(m_astrResolution);
+        m_oMode = new JComboBox<>(m_astrMode);
+        m_oPointsPerCircle = new JComboBox<>(m_astrPointsPerCircle);
         
         load();

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamSelectDialog.java

@@ -34 +34 @@
 public class ServerParamSelectDialog extends JPanel {
         
-    /**
-         * 
-         */
-        private static final long serialVersionUID = 5655941545321036641L;
-        
-        private JComboBox m_oComboBox;
+        private JComboBox<String> m_oComboBox;
     List<ServerParam> m_listServerParam;
     private boolean m_bShow = true;
@@ -74 +69 @@
                 i++;
         }
-        m_oComboBox = new JComboBox(astr);
+        m_oComboBox = new JComboBox<>(astr);
         m_oComboBox.setSelectedIndex(pos);