Index: applications/editors/josm/plugins/smed/src/smed/Smed.java =================================================================== --- applications/editors/josm/plugins/smed/src/smed/Smed.java (revision 23259) +++ applications/editors/josm/plugins/smed/src/smed/Smed.java (revision 23261) @@ -42,9 +42,9 @@ String pluginDirName = pluginDir.getAbsolutePath(); 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; @@ -59,30 +59,30 @@ JarOutputStream jos = new JarOutputStream(fos); BufferedOutputStream oos = new BufferedOutputStream( jos); - + // extract *.jar to splug Enumeration ent = file.entries(); while(ent.hasMoreElements()) { - e = ent.nextElement(); - eName = e.getName(); - if(eName.endsWith(".jar")) { - 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); - } - - pos.flush(); - pos.close(); - inp.close(); - pfos.close(); - } - } + e = ent.nextElement(); + eName = e.getName(); + if(eName.endsWith(".jar")) { + 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); + } + + pos.flush(); + pos.close(); + inp.close(); + pfos.close(); + } + } } - - + + // write smed_ifc.jar to splug e = file.getJarEntry("smed/plug/ifc/SmedPluggable.class"); Index: applications/editors/josm/plugins/smed/src/smed/SmedFile.java =================================================================== --- applications/editors/josm/plugins/smed/src/smed/SmedFile.java (revision 23259) +++ applications/editors/josm/plugins/smed/src/smed/SmedFile.java (revision 23261) @@ -7,31 +7,31 @@ public class SmedFile extends File{ - /** - * - */ - private static final long serialVersionUID = 1L; + /** + * + */ + private static final long serialVersionUID = 1L; - public SmedFile(String pathname) { - super(pathname); - } + 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 + 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 - } - } - } + 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; - } + // nothing found -> extract + return true; + } } Index: applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java =================================================================== --- applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java (revision 23259) +++ applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java (revision 23261) @@ -9,37 +9,37 @@ public class SmedMenuBar extends JMenuBar { - /** - * - */ - private static final long serialVersionUID = 1L; - - JMenuBar menuBar; - JMenu menu, submenu; - JMenuItem menuItem; - - public SmedMenuBar() { - menuBar = new JMenuBar(); - + /** + * + */ + private static final long serialVersionUID = 1L; + + JMenuBar menuBar; + JMenu menu, submenu; + JMenuItem menuItem; + + public SmedMenuBar() { + menuBar = new JMenuBar(); + menu = new JMenu("File"); menu.setMnemonic(KeyEvent.VK_F); menu.getAccessibleContext().setAccessibleDescription( "The only menu in this program that has menu items"); - + menuItem = new JMenuItem("Hide", KeyEvent.VK_H); - + menuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - System.out.println("actionPerformed()"); // TODO Auto-generated Event stub actionPerformed() - } - }); + public void actionPerformed(java.awt.event.ActionEvent e) { + System.out.println("actionPerformed()"); // TODO Auto-generated Event stub actionPerformed() + } + }); - + menu.add(menuItem); menuBar.add(menu); - - add(menuBar); - } + + add(menuBar); + } } Index: applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java =================================================================== --- applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java (revision 23259) +++ applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java (revision 23261) @@ -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/src/smed/plug/util/SmedPluginLoader.java =================================================================== --- applications/editors/josm/plugins/smed/src/smed/plug/util/SmedPluginLoader.java (revision 23259) +++ applications/editors/josm/plugins/smed/src/smed/plug/util/SmedPluginLoader.java (revision 23261) @@ -21,17 +21,17 @@ - public static List loadPlugins(File plugDir) throws IOException { - File[] plugJars = plugDir.listFiles(new JARFileFilter()); - Arrays.sort(plugJars); - - URL[] urls = fileArrayToURLArray(plugJars); - if(urls == null) return null; - - ClassLoader cl = new URLClassLoader(urls); - List> plugClasses = extractClassesFromJARs(plugJars, cl); - - if(plugClasses == null) return null; - else return createPluggableObjects(plugClasses); - } + public static List loadPlugins(File plugDir) throws IOException { + File[] plugJars = plugDir.listFiles(new JARFileFilter()); + Arrays.sort(plugJars); + + URL[] urls = fileArrayToURLArray(plugJars); + if(urls == null) return null; + + ClassLoader cl = new URLClassLoader(urls); + List> plugClasses = extractClassesFromJARs(plugJars, cl); + + if(plugClasses == null) return null; + else return createPluggableObjects(plugClasses); + } private static List createPluggableObjects(List> pluggables) { Index: applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java =================================================================== --- applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java (revision 23259) +++ applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java (revision 23261) @@ -24,35 +24,35 @@ private static final long serialVersionUID = 1L; - public SmedTabbedPane() { - super(new GridLayout(1, 1)); - - List plugins = null; - String pluginDirName = Main.pref.getPluginsDirectory().getAbsolutePath(); - try { - plugins = SmedPluginLoader.loadPlugins(new File(pluginDirName + "/splug")); - } catch (IOException e) { - e.printStackTrace(); - } - - if(plugins != null) { - Icon icon = null; - JTabbedPane tabbedPane = new JTabbedPane(); + public SmedTabbedPane() { + super(new GridLayout(1, 1)); - JComponent panel; - int i = 0; - for(SmedPluggable p : plugins) { - panel = p.getComponent(); - tabbedPane.addTab(p.getName(),icon, panel, p.getInfo()); - tabbedPane.setMnemonicAt(i, KeyEvent.VK_1 + i); - - i++; - } + List plugins = null; + String pluginDirName = Main.pref.getPluginsDirectory().getAbsolutePath(); + try { + plugins = SmedPluginLoader.loadPlugins(new File(pluginDirName + "/splug")); + } catch (IOException e) { + e.printStackTrace(); + } - //Add the tabbed pane to this panel. - add(tabbedPane); + if(plugins != null) { + Icon icon = null; + JTabbedPane tabbedPane = new JTabbedPane(); - //The following line enables to use scrolling tabs. - tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); - } + JComponent panel; + int i = 0; + for(SmedPluggable p : plugins) { + panel = p.getComponent(); + tabbedPane.addTab(p.getName(),icon, panel, p.getInfo()); + tabbedPane.setMnemonicAt(i, KeyEvent.VK_1 + i); + + i++; + } + + //Add the tabbed pane to this panel. + add(tabbedPane); + + //The following line enables to use scrolling tabs. + tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); + } } }