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

Timestamp:

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

Author:

stoecker

Message:

updated a lot

Location:

applications/editors/josm/plugins/pluginmanager

Files:

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

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

@@ -17 +17 @@
   <property name="plugin.jar" value="${plugin.name}.jar"/>
   
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="0.3.0"/>
   <property name="plugin.description" value="Manage plugins and provide update mechanism (V${plugin.version})."/>
   <property name="plugin.class" value="at.dallermassl.josm.plugin.pluginmanager.PluginManagerPlugin"/>
@@ -45 +43 @@
     </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}">
@@ -50 +56 @@
         <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-Mainversion" value="1180" />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
       </manifest>
     </jar>

applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java

@@ -50 +50 @@
     private JList siteList;
     private DefaultListModel siteListModel;
-    
+    private boolean requiresRestart = false;
+
     protected DefaultListModel createListModel() {
         Map<String, String> sites = Main.pref.getAllPrefix(PREF_KEY_REMOTE_SITE_PREFIX);
@@ -103 +104 @@
                     return;
                 }
-                gui.requiresRestart = gui.requiresRestart || false;
             }
         });
@@ -117 +117 @@
                         siteListModel.removeElementAt(selected[i]);
                     }
-                    gui.requiresRestart = gui.requiresRestart || false;
                 }
             }
@@ -142 +141 @@
                     PluginUpdateFrame frame = new PluginUpdateFrame(tr("Plugins"), descriptions);
                     frame.setVisible(true);
-                    gui.requiresRestart = true;
+                    requiresRestart = true;
                 }
             }
@@ -167 +166 @@
      * @see org.openstreetmap.josm.gui.preferences.PreferenceSetting#ok()
      */
-    // only in 1.6 allowed @Override
-    public void ok() {
+    public boolean ok() {
         // first remove all old entries:
         Map<String, String> keys = Main.pref.getAllPrefix(PREF_KEY_REMOTE_SITE_PREFIX);
@@ -189 +187 @@
             }
         }
+        return requiresRestart;
     }
-
 }