Changeset 30738 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java

Timestamp:

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

Author:

donvip

Message:

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

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java (modified) (4 diffs)

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");