Changeset 27863 in osm for applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap

Timestamp:

2012-02-18T18:03:10+01:00 (13 years ago)

Author:

bastik

Message:

update because of core api change: 2nd part (preferences - rev. 4968)

Location:

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds

Files:

• XmlBoundsPreferenceSetting.java (modified) (1 diff)
• actions/EditEntriesAction.java (modified) (4 diffs)

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsPreferenceSetting.java

@@ -18 +18 @@
 import javax.swing.JButton;
 
-import org.openstreetmap.josm.gui.preferences.ImageryPreference;
-import org.openstreetmap.josm.gui.preferences.ImageryPreference.ImageryProvidersPanel;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.EditEntriesAction;
 
 /**
- * 
+ *
  * @author Don-vip
  *
  */
-public class XmlBoundsPreferenceSetting implements PreferenceSetting {
+public class XmlBoundsPreferenceSetting implements SubPreferenceSetting {
 
-        @Override
-        public void addGui(PreferenceTabbedPane gui) {
-                for (PreferenceSetting ps : gui.getSettings()) {
-                        if (ps instanceof ImageryPreference) {
-                                ImageryProvidersPanel ipp = ((ImageryPreference) ps).getProvidersPanel();
-                                EditEntriesAction action = new EditEntriesAction(ipp.defaultTable, ipp.defaultModel);
-                                ipp.middleToolbar.add(new JButton(action));
-                                // TODO
-                                break;
-                        }
-                }
-        }
+    @Override
+    public void addGui(PreferenceTabbedPane gui) {
+        ImageryProvidersPanel ipp = gui.getImageryPreference().getProvidersPanel();
+        EditEntriesAction action = new EditEntriesAction(ipp.defaultTable, ipp.defaultModel);
+        ipp.middleToolbar.add(new JButton(action));
+    }
 
-        @Override
-        public boolean ok() {
-                return false;
-        }
+    @Override
+    public boolean ok() {
+        return false;
+    }
+
+    @Override
+    public boolean isExpert() {
+        return false;
+    }
+
+    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
+        return gui.getImageryPreference();
+    }
+
 }

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/EditEntriesAction.java

@@ -30 +30 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.gui.preferences.ImageryPreference.ImageryProvidersPanel.ImageryDefaultLayerTableModel;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel.ImageryDefaultLayerTableModel;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsConstants;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
@@ -39 +39 @@
 
         protected static final String ACTION_NAME = tr("Edit");
-        
+
         private final JTable defaultTable;
         private final ImageryDefaultLayerTableModel defaultModel;
-        
+
         private final List<ImageryInfo> entries;
-        
+
         public EditEntriesAction(JTable defaultTable, ImageryDefaultLayerTableModel defaultModel) {
         putValue(SHORT_DESCRIPTION, tr("edit bounds for selected defaults"));
@@ -59 +59 @@
         setEnabled(false);
         }
-        
+
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -83 +83 @@
                         entries.clear();
                         for (int row : defaultTable.getSelectedRows()) {
-                                ImageryInfo info = defaultModel.getRow(row); 
+                                ImageryInfo info = defaultModel.getRow(row);
                                 if (info != null && info.getBounds() != null) {
                                         entries.add(info);