Changeset 3797 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

Timestamp:

2011-01-21T14:11:47+01:00 (13 years ago)

Author:

bastiK

Message:

rename some stuff: StyleSourceEditor is generic editor for both MapPaint styles andd Tagging Presets

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.preferences.StyleSourceEditor.StyleSourceInfo;
+import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
 import org.openstreetmap.josm.tools.GBC;
 
 public class MapPaintPreference implements PreferenceSetting {
-    private StyleSourceEditor sources;
+    private SourceEditor sources;
     private JCheckBox enableIconDefault;
     private JCheckBox enableDefault;
@@ -81 +81 @@
                     public void stateChanged(ChangeEvent e) {
                         if (gui.mapcontent.getSelectedComponent() == panel) {
-                            sources.initiallyLoadAvailableStyles();
+                            sources.initiallyLoadAvailableSources();
                         }
                     }
@@ -88 +88 @@
     }
 
-    class MapPaintSourceEditor extends StyleSourceEditor {
+    class MapPaintSourceEditor extends SourceEditor {
 
         final private String iconpref = "mappaint.icon.sources";
@@ -103 +103 @@
         @Override
         public boolean finish() {
-            List<SourceEntry> activeStyles = activeStylesModel.getStyles();
+            List<SourceEntry> activeStyles = activeSourcesModel.getSources();
 
             boolean changed = (new MapPaintPrefMigration()).put(activeStyles);
@@ -122 +122 @@
 
         @Override
-        public Collection<StyleSourceInfo> getDefault() {
+        public Collection<ExtendedSourceEntry> getDefault() {
             return (new MapPaintPrefMigration()).getDefault();
         }
@@ -138 +138 @@
                 case ACTIVE_SOURCES:
                     return tr("Active styles:");
+                case NEW_SOURCE_ENTRY_TOOLTIP:
+                     return tr("Add a new style by entering filename or URL");
                 case NEW_SOURCE_ENTRY:
                     return tr("New style entry:");
@@ -194 +196 @@
     }
 
-    public static class MapPaintPrefMigration extends StyleSourceEditor.SourcePrefMigration {
+    public static class MapPaintPrefMigration extends SourceEditor.SourcePrefMigration {
 
         public MapPaintPrefMigration() {
@@ -203 +205 @@
 
         @Override
-        public Collection<StyleSourceInfo> getDefault() {
-            StyleSourceInfo i = new StyleSourceInfo("elemstyles.xml", "resource://data/elemstyles.xml");
+        public Collection<ExtendedSourceEntry> getDefault() {
+            ExtendedSourceEntry i = new ExtendedSourceEntry("elemstyles.xml", "resource://data/elemstyles.xml");
             i.name = "standard";
             i.shortdescription = tr("Internal Style");