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

Timestamp:

2008-12-25T19:01:06+01:00 (17 years ago)

Author:

stoecker

Message:

updated a lot

Location:

applications/editors/josm/plugins/colorscheme

Files:

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

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

@@ -10 +10 @@
   <property name="plugin.jar"           value="../../dist/${plugin.name}.jar"/>
   
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="0.5.2"/>
   <property name="plugin.description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-) (V${plugin.version})."/>
   <property name="plugin.class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
@@ -38 +36 @@
     </copy>
     
+    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+      <env key="LANG" value="C"/>
+      <arg value="info"/>
+      <arg value="--xml"/>
+      <arg value="."/>
+    </exec>
+    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+    <delete file="REVISION"/>
     <!-- create jar file -->
     <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
@@ -43 +49 @@
         <attribute name="Plugin-Class" value="${plugin.class}" />
         <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${plugin.version}" />
-        <!--attribute name="Plugin-Dependencies" value="org.eigenheimstrasse.josm" /-->
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Mainversion" value="1180"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
       </manifest>
     </jar>

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

@@ -71 +71 @@
                     JOptionPane.showMessageDialog(Main.parent, tr("Please select a scheme to use."));
                 else {
-                    String schemeName = (String) listModel.get(schemesList.getSelectedIndex());                    
+                    String schemeName = (String) listModel.get(schemesList.getSelectedIndex());
                     getColorPreference().setColorModel(getColorMap(schemeName));
                 }
-                gui.requiresRestart = gui.requiresRestart || false;
             }
         });
@@ -87 +86 @@
                                 listModel.addElement(schemeName);
                 saveSchemeNamesToPref();
-                gui.requiresRestart = gui.requiresRestart || false;
                         }
                 });
@@ -101 +99 @@
                                     listModel.remove(schemesList.getSelectedIndex());
                                     saveSchemeNamesToPref();
-                    gui.requiresRestart = gui.requiresRestart || false;
                                 }
                         }
@@ -135 +132 @@
         }
 
-        public void ok() {
-            // nothing to do
+        public boolean ok() {
+            return false;// nothing to do
         }
         
@@ -179 +176 @@
             return colorMap;
         }
-        
-        public ColorPreference getColorPreference() {
+
+    public ColorPreference getColorPreference() {
         if(colorPreference == null) {
             for(PreferenceSetting setting : PreferenceDialog.settings) {
@@ -190 +187 @@
         }
         return colorPreference;
-        }
+    }
 }