Index: applications/editors/josm/plugins/smed/build.xml
===================================================================
--- applications/editors/josm/plugins/smed/build.xml (revision 23240)
+++ applications/editors/josm/plugins/smed/build.xml (revision 23244)
@@ -41,10 +41,10 @@
-->
-
+
+
-
@@ -91,12 +91,23 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
Index: applications/editors/josm/plugins/smed/src/smed/Smed.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/Smed.java (revision 23240)
+++ applications/editors/josm/plugins/smed/src/smed/Smed.java (revision 23244)
@@ -8,4 +8,5 @@
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
@@ -23,4 +24,5 @@
import smed.plug.SmedPluginApp;
import smed.plug.ifc.SmedPluggable;
+import smed.plug.util.JARFileFilter;
import smed.plug.util.SmedPluginLoader;
import smed.tabs.SmedTabAction;
@@ -39,7 +41,10 @@
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,6 +54,4 @@
int len;
- System.out.println(new java.util.Date());
-
try {
JarFile file = new JarFile(pluginDirName + "/smed.jar");
@@ -57,5 +60,4 @@
BufferedOutputStream oos = new BufferedOutputStream( jos);
- /* nicht ohne Versionierung freigeben
// extract *.jar to splug
Enumeration ent = file.entries();
@@ -64,19 +66,22 @@
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
Index: applications/editors/josm/plugins/smed/src/smed/SmedFile.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/SmedFile.java (revision 23244)
+++ applications/editors/josm/plugins/smed/src/smed/SmedFile.java (revision 23244)
@@ -0,0 +1,37 @@
+package smed;
+
+import java.io.File;
+
+import smed.plug.util.JARFileFilter;
+
+public class SmedFile extends File{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public SmedFile(String pathname) {
+ super(pathname);
+ }
+
+ public boolean needUpdate(File[] jars, String name) {
+
+ for(File j : jars) {
+ String jName = j.getName();
+
+ if(jName.length() > 15) { // < 16 isn'nt a SmedFile
+
+ if (jName.substring(16).equals(name.substring(16))) {
+ if(jName.substring(0, 15).compareTo(name.substring(0, 15)) < 0) { // obsolet
+ j.delete();
+ return true;
+ } else return false; // no update needed
+ }
+ }
+ }
+
+ // nothing found -> extract
+ return true;
+ }
+}
Index: applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java (revision 23240)
+++ applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java (revision 23244)
@@ -6,11 +6,11 @@
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);
}
Index: applications/editors/josm/plugins/smed_about/build.xml
===================================================================
--- applications/editors/josm/plugins/smed_about/build.xml (revision 23240)
+++ applications/editors/josm/plugins/smed_about/build.xml (revision 23244)
@@ -28,5 +28,5 @@
**
-->
-
+
@@ -35,4 +35,6 @@
+
+
-
-
-
-
+
+
-
+
@@ -119,10 +120,9 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
@@ -215,9 +225,15 @@
-
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/smed_about/src/smed_about/SmedAbout.java
===================================================================
--- applications/editors/josm/plugins/smed_about/src/smed_about/SmedAbout.java (revision 23240)
+++ applications/editors/josm/plugins/smed_about/src/smed_about/SmedAbout.java (revision 23244)
@@ -12,69 +12,69 @@
public class SmedAbout implements SmedPluggable{
- private JPanel jPanel = null; // @jve:decl-index=0:visual-constraint="43,24"
- private JLabel jLabel = null;
- private JLabel jLabel1 = null;
- private JLabel jLabel2 = null;
- @Override
- public boolean start() {
- // TODO Auto-generated method stub
- return false;
- }
+ private JPanel jPanel = null; // @jve:decl-index=0:visual-constraint="43,24"
+ private JLabel jLabel = null;
+ private JLabel jLabel1 = null;
+ private JLabel jLabel2 = null;
+ @Override
+ public boolean start() {
+ // TODO Auto-generated method stub
+ return false;
+ }
- @Override
- public boolean stop() {
- // TODO Auto-generated method stub
- return false;
- }
+ @Override
+ public boolean stop() {
+ // TODO Auto-generated method stub
+ return false;
+ }
- @Override
- public String getName() {
- return "About";
- }
+ @Override
+ public String getName() {
+ return "About";
+ }
- @Override
- public void setPluginManager(SmedPluginManager manager) {
- // TODO Auto-generated method stub
+ @Override
+ public void setPluginManager(SmedPluginManager manager) {
+ // TODO Auto-generated method stub
+
+ }
- }
+ @Override
+ public String getInfo() {
- @Override
- public String getInfo() {
+ return "something about the programm";
+ }
- return "something about the programm";
- }
+ @Override
+ public JComponent getComponent() {
- @Override
- public JComponent getComponent() {
+ return getJPanel();
+ }
- return getJPanel();
- }
-
-
- /**
- * This method initializes jPanel
- *
- * @return javax.swing.JPanel
- */
- private JPanel getJPanel() {
- if (jPanel == null) {
- jLabel2 = new JLabel();
- jLabel2.setBounds(new Rectangle(30, 90, 340, 30));
- jLabel2.setText("Description:");
- jLabel1 = new JLabel();
- jLabel1.setBounds(new Rectangle(30, 55, 340, 30));
- jLabel1.setText("Version: Date:");
- jLabel = new JLabel();
- jLabel.setBounds(new Rectangle(30, 20, 340, 30));
- jLabel.setText("Authors: Werner König and Malclom Herring");
- jPanel = new JPanel();
- jPanel.setLayout(null);
- jPanel.setSize(new Dimension(400, 300));
- jPanel.add(jLabel, null);
- jPanel.add(jLabel1, null);
- jPanel.add(jLabel2, null);
- }
- return jPanel;
- }
+
+ /**
+ * This method initializes jPanel
+ *
+ * @return javax.swing.JPanel
+ */
+ private JPanel getJPanel() {
+ if (jPanel == null) {
+ jLabel2 = new JLabel();
+ jLabel2.setBounds(new Rectangle(30, 90, 340, 30));
+ jLabel2.setText("Description:");
+ jLabel1 = new JLabel();
+ jLabel1.setBounds(new Rectangle(30, 55, 340, 30));
+ jLabel1.setText("Version: Date:");
+ jLabel = new JLabel();
+ jLabel.setBounds(new Rectangle(30, 20, 340, 30));
+ jLabel.setText("Authors: Werner König and Malclom Herring");
+ jPanel = new JPanel();
+ jPanel.setLayout(null);
+ jPanel.setSize(new Dimension(400, 300));
+ jPanel.add(jLabel, null);
+ jPanel.add(jLabel1, null);
+ jPanel.add(jLabel2, null);
+ }
+ return jPanel;
+ }
}
Index: applications/editors/josm/plugins/smed_ex/build.xml
===================================================================
--- applications/editors/josm/plugins/smed_ex/build.xml (revision 23240)
+++ applications/editors/josm/plugins/smed_ex/build.xml (revision 23244)
@@ -28,5 +28,5 @@
**
-->
-
+
@@ -35,4 +35,6 @@
+
+
-
+
+
-
-
-
-
-
-
+
+
-
+
@@ -85,8 +84,8 @@
-
-
@@ -126,5 +125,5 @@
-
+
-
-
-
+
+
+
+
+
+
+
@@ -217,9 +225,16 @@
-
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/smed_ex/src/smed_ex/SmedEx.java
===================================================================
--- applications/editors/josm/plugins/smed_ex/src/smed_ex/SmedEx.java (revision 23240)
+++ applications/editors/josm/plugins/smed_ex/src/smed_ex/SmedEx.java (revision 23244)
@@ -16,80 +16,80 @@
public class SmedEx implements SmedPluggable {
- private JPanel jPanel = null; // @jve:decl-index=0:visual-constraint="78,30"
- private JButton jButton = null;
+ private JPanel jPanel = null; // @jve:decl-index=0:visual-constraint="78,30"
+ private JButton jButton = null;
- @Override
- public boolean stop() {
- // TODO Auto-generated method stub
- return false;
- }
+ @Override
+ public boolean stop() {
+ // TODO Auto-generated method stub
+ return false;
+ }
- @Override
- public String getName() {
+ @Override
+ public String getName() {
- return "hello";
- }
+ return "Hello";
+ }
- @Override
- public String getInfo() {
+ @Override
+ public String getInfo() {
- return "say hello";
- }
+ return "say hello";
+ }
- @Override
- public JComponent getComponent() {
+ @Override
+ public JComponent getComponent() {
+
+ return getJPanel();
+ }
- return getJPanel();
- }
+ @Override
+ public void setPluginManager(SmedPluginManager manager) {
+ // TODO Auto-generated method stub
- @Override
- public void setPluginManager(SmedPluginManager manager) {
- // TODO Auto-generated method stub
+ }
- }
+ /**
+ * This method initializes jPanel
+ *
+ * @return javax.swing.JPanel
+ */
+ private JPanel getJPanel() {
+ if (jPanel == null) {
+ jPanel = new JPanel();
+ jPanel.setLayout(null);
+ jPanel.setPreferredSize(new Dimension(200, 130));
+ jPanel.add(getJButton(), null);
+ }
+ return jPanel;
+ }
- /**
- * This method initializes jPanel
- *
- * @return javax.swing.JPanel
- */
- private JPanel getJPanel() {
- if (jPanel == null) {
- jPanel = new JPanel();
- jPanel.setLayout(null);
- jPanel.setPreferredSize(new Dimension(200, 130));
- jPanel.add(getJButton(), null);
- }
- return jPanel;
- }
+ /**
+ * This method initializes jButton
+ *
+ * @return javax.swing.JButton
+ */
+ private JButton getJButton() {
+ if (jButton == null) {
+ jButton = new JButton();
+ jButton.setBounds(new Rectangle(15, 40, 160, 40));
+ jButton.setText("Hello World!");
+
+ jButton.addActionListener(new ActionListener() {
- /**
- * This method initializes jButton
- *
- * @return javax.swing.JButton
- */
- private JButton getJButton() {
- if (jButton == null) {
- jButton = new JButton();
- jButton.setBounds(new Rectangle(15, 40, 160, 40));
- jButton.setText("Hello World!");
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JOptionPane.showMessageDialog( null, "it works" );
+ }
+
+ });
+ }
+ return jButton;
+ }
- jButton.addActionListener(new ActionListener() {
-
- @Override
- public void actionPerformed(ActionEvent e) {
- JOptionPane.showMessageDialog( null, "it works" );
- }
-
- });
- }
- return jButton;
- }
-
- @Override
- public boolean start() {
- // TODO Auto-generated method stub
- return false;
- }
+ @Override
+ public boolean start() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Index: applications/editors/josm/plugins/smed_ex/src/smed_ex/build.xml
===================================================================
--- applications/editors/josm/plugins/smed_ex/src/smed_ex/build.xml (revision 23240)
+++ (revision )
@@ -1,147 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-