Changeset 30049 in osm for applications/editors/josm/plugins/tracer2/src/org

Timestamp:

2013-11-13T21:54:50+01:00 (11 years ago)

Author:

belecker

Message:

Tracer2: Change from Java 1.7 to 1.6.

Location:

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences

Files:

• ServerParam.java (modified) (1 diff)
• ServerParamDialog.java (modified) (4 diffs)
• ServerParamSelectDialog.java (modified) (2 diffs)

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

@@ -31 +31 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.GBC;
 

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<String> m_oTileSize;
-    private JComboBox<String> m_oResolution;
+    private JComboBox m_oTileSize;
+    private JComboBox m_oResolution;
     //private JTextField m_oSkipBottom = new JTextField();
-    private JComboBox<String> m_oMode;
+    private JComboBox m_oMode;
     private JTextField m_oThreshold = new JTextField();
-    private JComboBox<String> m_oPointsPerCircle;
+    private JComboBox m_oPointsPerCircle;
     private JTextField m_oTag = new JTextField();
     private JTextField m_oPreferredValues = new JTextField();
@@ -112 +112 @@
     }
     
-    private void loadComboBox( JComboBox<String> 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<String> 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<String>(m_astrTileSize);
-        m_oResolution = new JComboBox<String>(m_astrResolution);
-        m_oMode = new JComboBox<String>(m_astrMode);
-        m_oPointsPerCircle = new JComboBox<String>(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

@@ -39 +39 @@
         private static final long serialVersionUID = 5655941545321036641L;
         
-        private JComboBox<String> m_oComboBox;
+        private JComboBox m_oComboBox;
     List<ServerParam> m_listServerParam;
     private boolean m_bShow = true;
@@ -74 +74 @@
                 i++;
         }
-        m_oComboBox = new JComboBox<String>(astr);
+        m_oComboBox = new JComboBox(astr);
         m_oComboBox.setSelectedIndex(pos);