Changeset 30738 in osm for applications/editors/josm/plugins/imagery_offset_db

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

Location:

applications/editors/josm/plugins/imagery_offset_db/src/iodb

Files:

• ImageryOffsetPlugin.java (modified) (4 diffs)
• OffsetDialog.java (modified) (14 diffs)
• StoreImageryOffsetAction.java (modified) (1 diff)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java

@@ -1 +1 @@
 package iodb;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
+
 import java.awt.event.KeyEvent;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedList;
+
 import javax.swing.JMenu;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 
 /**
  * A plugin to request and store imagery offsets in the centralized database.
- * 
+ *
  * @author Zverik
  * @license WTFPL
@@ -19 +24 @@
     private GetImageryOffsetAction getAction;
     private StoreImageryOffsetAction storeAction;
-    
+
     /**
      * Add both actions to their own menu. This creates
@@ -28 +33 @@
     public ImageryOffsetPlugin( PluginInformation info ) {
         super(info);
-        
+
         getAction = new GetImageryOffsetAction();
         storeAction = new StoreImageryOffsetAction();
-        
+
         // before 5803 imagery menu was constantly regenerated, erasing extra items
         // before 5729 it was regenerated only when the imagery list was modified (also bad)
@@ -43 +48 @@
         // an ugly hack to add this plugin to the toolbar
         if( Main.pref.getBoolean("iodb.modify.toolbar", true) ) {
-            Collection<String> toolbar = new LinkedList<>(Main.toolbar.getToolString());
+            Collection<String> toolbar = new LinkedList<>(ToolbarPreferences.getToolString());
             if( !toolbar.contains("getoffset") ) {
                 toolbar.add("getoffset");

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -1 +1 @@
 package iodb;
 
-import java.awt.*;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.Point;
+import java.awt.RenderingHints;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -8 +17 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import javax.swing.*;
+
+import javax.swing.AbstractAction;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.KeyStroke;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -19 +41 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
-import org.openstreetmap.josm.tools.*;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * The dialog which presents a choice between imagery align options.
- * 
+ *
  * @author Zverik
  * @license WTFPL
@@ -31 +55 @@
     protected static final String PREF_CALIBRATION = "iodb.show.calibration";
     protected static final String PREF_DEPRECATED = "iodb.show.deprecated";
-    private static final int MAX_OFFSETS = Main.main.pref.getInteger("iodb.max.offsets", 4);
+    private static final int MAX_OFFSETS = Main.pref.getInteger("iodb.max.offsets", 4);
 
     /**
@@ -45 +69 @@
 
     /**
-     * Initialize the dialog and install listeners. 
+     * Initialize the dialog and install listeners.
      * @param offsets The list of offset to choose from.
      */
@@ -60 +84 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW);
     }
-    
+
     /**
      * Creates the GUI.
@@ -69 +93 @@
         calibrationBox.setSelected(Main.pref.getBoolean(PREF_CALIBRATION, true));
         calibrationBox.addActionListener(new ActionListener() {
-            public void actionPerformed( ActionEvent e ) {
+            @Override
+                        public void actionPerformed( ActionEvent e ) {
                 Main.pref.put(PREF_CALIBRATION, calibrationBox.isSelected());
                 updateButtonPanel();
@@ -77 +102 @@
         deprecatedBox.setSelected(Main.pref.getBoolean(PREF_DEPRECATED, false));
         deprecatedBox.addActionListener(new ActionListener() {
-            public void actionPerformed( ActionEvent e ) {
+            @Override
+                        public void actionPerformed( ActionEvent e ) {
                 Main.pref.put(PREF_DEPRECATED, deprecatedBox.isSelected());
                 updateButtonPanel();
@@ -154 +180 @@
      * It does nothing, only passes the event to all displayed offset buttons.
      */
-    public void zoomChanged() {
+    @Override
+        public void zoomChanged() {
         for( Component c : buttonPanel.getComponents() ) {
             if( c instanceof OffsetDialogButton ) {
@@ -166 +193 @@
      * value, but looks nice.
      */
-    public void paint( Graphics2D g, MapView mv, Bounds bbox ) {
+    @Override
+        public void paint( Graphics2D g, MapView mv, Bounds bbox ) {
         if( offsets == null )
             return;
@@ -181 +209 @@
         }
     }
-    
+
     /**
      * Display the dialog and get the return value is case of a modal frame.
@@ -208 +236 @@
      * @see #applyOffset()
      */
-    public void actionPerformed( ActionEvent e ) {
+    @Override
+        public void actionPerformed( ActionEvent e ) {
         if( e.getSource() instanceof OffsetDialogButton ) {
             selectedOffset = ((OffsetDialogButton)e.getSource()).getOffset();
@@ -283 +312 @@
          * Remove the deprecated offset from the offsets list. Then rebuild the button panel.
          */
-        public void queryPassed() {
+        @Override
+                public void queryPassed() {
             offset.setDeprecated(new Date(), JosmUserIdentityManager.getInstance().getUserName(), "");
             updateButtonPanel();
@@ -299 +329 @@
         }
 
-        public void actionPerformed( ActionEvent e ) {
+        @Override
+                public void actionPerformed( ActionEvent e ) {
             String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
             String lang = LanguageInfo.getWikiLanguagePrefix();

applications/editors/josm/plugins/imagery_offset_db/src/iodb/StoreImageryOffsetAction.java

@@ -117 +117 @@
                 query.append(key).append('=').append(URLEncoder.encode(params.get(key), "UTF8"));
             }
-            Main.main.worker.submit(new SimpleOffsetQueryTask(query.toString(), tr("Uploading a new offset...")));
+            Main.worker.submit(new SimpleOffsetQueryTask(query.toString(), tr("Uploading a new offset...")));
         } catch( UnsupportedEncodingException ex ) {
             // WTF