Changeset 27863 in osm for applications/editors/josm/plugins/colorscheme

Timestamp:

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

Author:

bastik

Message:

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

Location:

applications/editors/josm/plugins/colorscheme

Files:

• build.xml (modified) (4 diffs)
• src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java (modified) (4 diffs)

applications/editors/josm/plugins/colorscheme/build.xml

@@ -18 +18 @@
 **
 ** To build against the core in ../../core, create a correct manifest and deploy to
-** SVN, 
+** SVN,
 **    set the properties commit.message and plugin.main.version
 ** and run
@@ -27 +27 @@
 <project name="colorscheme" default="dist" basedir=".">
     <property name="commit.message" value="Uses new constructor for Plugin"/>
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="4968"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
@@ -87 +87 @@
     </target>
     <!--
-     ************************** Publishing the plugin *********************************** 
+     ************************** Publishing the plugin ***********************************
     -->
     <!--
-    ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+    ** extracts the JOSM release for the JOSM version in ../core and saves it in the
     ** property ${coreversion.info.entry.revision}
     **
@@ -136 +136 @@
     </target>
     <!--
-    ** commits the plugin.jar 
+    ** commits the plugin.jar
     -->
     <target name="commit-dist">
         <echo>
 ***** Properties of published ${plugin.jar} *****
-Commit message    : '${commit.message}'                 
+Commit message    : '${commit.message}'
 Plugin-Mainversion: ${plugin.main.version}
 JOSM build version: ${coreversion.info.entry.revision}
 Plugin-Version    : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****                 
-                    
+***** / Properties of published ${plugin.jar} *****
+
 Now commiting ${plugin.jar} ...
 </echo>

applications/editors/josm/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.ColorPreference;
+import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.tools.GBC;
 
-public class ColorSchemePreference implements PreferenceSetting {
+public class ColorSchemePreference implements SubPreferenceSetting {
     private static final String PREF_KEY_SCHEMES_PREFIX = "colorschemes.";
     private static final String PREF_KEY_SCHEMES_NAMES = PREF_KEY_SCHEMES_PREFIX + "names";
@@ -53 +55 @@
      * @see org.openstreetmap.josm.gui.preferences.PreferenceSetting#addGui(org.openstreetmap.josm.gui.preferences.PreferenceDialog)
      */
+    @Override
     public void addGui(final PreferenceTabbedPane gui) {
         JPanel panel = new JPanel(new GridBagLayout());
@@ -125 +128 @@
         JScrollPane scrollpane = new JScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-        gui.displaycontent.addTab(tr("Color Schemes"), scrollpane);
+        gui.getDisplayPreference().displaycontent.addTab(tr("Color Schemes"), scrollpane);
+    }
+
+    @Override
+    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
+        return gui.getDisplayPreference();
     }
 
@@ -141 +149 @@
     }
 
+    @Override
     public boolean ok() {
         return false;// nothing to do
+    }
+
+    @Override
+    public boolean isExpert() {
+        return false;
     }