Changeset 23244 in osm for applications/editors/josm/plugins/smed

Timestamp:

2010-09-17T23:14:51+02:00 (15 years ago)

Author:

postfix

Message:

first really good working framework smed

Location:

applications/editors/josm/plugins/smed

Files:

• build.xml (modified) (2 diffs)
• src/smed/Smed.java (modified) (6 diffs)
• src/smed/SmedFile.java (added)
• src/smed/plug/ifc/SmedPluggable.java (modified) (1 diff)

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

@@ -41 +41 @@
      -->
         <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
-        <property name="plugin.build.dir"       value="build"/>
+        <property name="smed_ex"                                value="../dist/"/>
+        <property name="plugin.build.dir"       value="build/"/>
         <property name="plugin.src.dir"         value="src"/>
         <!-- this is the directory where the plugin jar is copied to -->
         <property name="plugin.dist.dir"        value="../../dist"/>
         <property name="ant.build.javac.target" value="1.5"/>
-        <property name="plugin.dist.dir"        value="../../dist"/>
         <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
 
@@ -91 +91 @@
                 </copy>
                 
+                <delete>
+                        <fileset dir="${plugin.build.dir}">
+                        <include name="*smed_ex.jar"/>
+                                <include name="*smed_about.jar"/>
+                        </fileset>
+                </delete>
+
+                
                 <copy todir="${plugin.build.dir}">
-                                        <fileset dir="plugins"/>
+                                        <fileset dir="../smed_about/smed_dist"/>
+                </copy>
+
+                <copy todir="${plugin.build.dir}">
+                                        <fileset dir="../smed_ex/smed_dist"/>
                 </copy>
                 
                 <copy todir="${plugin.build.dir}">
                         <fileset dir=".">
-                <include name="copyright.txt" />
-                <include name="LICENSE.txt" />
+                <include name="*.txt" />
                         </fileset>
                 </copy>

applications/editors/josm/plugins/smed/src/smed/Smed.java

@@ -8 +8 @@
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
@@ -23 +24 @@
 import smed.plug.SmedPluginApp;
 import smed.plug.ifc.SmedPluggable;
+import smed.plug.util.JARFileFilter;
 import smed.plug.util.SmedPluginLoader;
 import smed.tabs.SmedTabAction;
@@ -39 +41 @@
         File pluginDir = Main.pref.getPluginsDirectory();
         String pluginDirName = pluginDir.getAbsolutePath();
-        File splug = new File(pluginDirName + "/splug");
-        if(!splug.exists()) splug.mkdir();
+        SmedFile splugDir = new SmedFile(pluginDirName + "/splug");
+        
+        if(!splugDir.exists()) splugDir.mkdir();
 
+        File[] jars = splugDir.listFiles(new JARFileFilter());
+        
         // build smed_ifc.jar from smed.jar
         JarEntry e = null;
@@ -49 +54 @@
         int len;
 
-        System.out.println(new java.util.Date());
-        
         try {
             JarFile file = new JarFile(pluginDirName  + "/smed.jar");
@@ -57 +60 @@
             BufferedOutputStream oos = new BufferedOutputStream( jos);
             
-            /* nicht ohne Versionierung freigeben
             // extract *.jar to splug
             Enumeration<JarEntry> ent = file.entries();
@@ -64 +66 @@
                 eName = e.getName(); 
                 if(eName.endsWith(".jar")) {
-                        FileOutputStream pfos = new FileOutputStream(pluginDirName + "/splug/" + eName);
-                        BufferedOutputStream pos = new BufferedOutputStream(pfos);
-                        inp = new BufferedInputStream(file.getInputStream( e ));
+                        if(splugDir.needUpdate(jars,eName)) {
+                                FileOutputStream pfos = new FileOutputStream(pluginDirName + "/splug/" + eName);
+                                BufferedOutputStream pos = new BufferedOutputStream(pfos);
+                                inp = new BufferedInputStream(file.getInputStream( e ));
                         
-                    while ((len = inp.read(buffer)) > 0) {
-                        pos.write(buffer, 0, len);
-                    }
+                                while ((len = inp.read(buffer)) > 0) {
+                                        pos.write(buffer, 0, len);
+                                }
                         
-                        pos.flush();
-                        pos.close();
-                        inp.close();
-                        pfos.close();
+                                pos.flush();
+                                pos.close();
+                                inp.close();
+                                pfos.close();
+                        }
                 }
             }
-            */
+            
+
             
             // write smed_ifc.jar to splug

applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java

@@ -6 +6 @@
 public interface SmedPluggable {
 
-    boolean start();
-    boolean stop();
-    String getName();
-    String getInfo();
-    JComponent getComponent();
-    
-    void setPluginManager(SmedPluginManager manager);
+        boolean start();
+        boolean stop();
+        String getName();
+        String getInfo();
+        JComponent getComponent();
+        
+        void setPluginManager(SmedPluginManager manager);
 
 }