Changeset 23199 in osm for applications/editors

Timestamp:

2010-09-15T20:11:07+02:00 (14 years ago)

Author:

postfix

Message:

last commit corrected

Location:

applications/editors/josm/plugins/smed/src/smed

Files:

• plug/ifc/SmedPluggable.java (modified) (1 diff)
• plug/util/SmedPluginLoader.java (copied) (copied from applications/editors/josm/plugins/smed/src/smed/plug/util/SmedPluginLoader.java ) (2 diffs)
• tabs/SmedTabbedPane.java (copied) (copied from applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java ) (4 diffs)

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

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

applications/editors/josm/plugins/smed/src/smed/plug/util/SmedPluginLoader.java

@@ -9 +9 @@
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -19 +20 @@
 public class SmedPluginLoader {
 
-    public static List<SmedPluggable> loadPlugins(File plugDir) throws IOException {
-        File[] plugJars = plugDir.listFiles(new JARFileFilter());
-        
-        URL[] urls = fileArrayToURLArray(plugJars);
-        if(urls == null) return null;
-        
-        ClassLoader cl = new URLClassLoader(urls);
-        List<Class<SmedPluggable>> plugClasses = extractClassesFromJARs(plugJars, cl);
-        
-        if(plugClasses == null) return null;
-        else return createPluggableObjects(plugClasses);
-    }
+
+        public static List<SmedPluggable> 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<Class<SmedPluggable>> plugClasses = extractClassesFromJARs(plugJars, cl);
+                
+                if(plugClasses == null) return null;
+                else return createPluggableObjects(plugClasses);
+        }
 
     private static List<SmedPluggable> createPluggableObjects(List<Class<SmedPluggable>> pluggables) {

applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java

@@ -1 +1 @@
 package smed.tabs;
 
-import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.KeyEvent;
@@ -10 +9 @@
 import javax.swing.Icon;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
@@ -26 +24 @@
     private static final long serialVersionUID = 1L;
 
-    @SuppressWarnings("null")
-    public SmedTabbedPane() {
-        super(new GridLayout(1, 1));
-
-        List<SmedPluggable> plugins = null;
-        String pluginDirName = Main.pref.getPluginsDirectory().getAbsolutePath();
-        try {
-            plugins = SmedPluginLoader.loadPlugins(new File(pluginDirName + "/splug"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        public SmedTabbedPane() {
+                super(new GridLayout(1, 1));
+                
+                List<SmedPluggable> plugins = null;
+                String pluginDirName = Main.pref.getPluginsDirectory().getAbsolutePath();
+                try {
+                        plugins = SmedPluginLoader.loadPlugins(new File(pluginDirName + "/splug"));
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                
 
         Icon icon = null;
         JTabbedPane tabbedPane = new JTabbedPane();
 
-        JComponent panel1;
-        if(plugins == null) {
-            panel1 = makeTextPanel("Panel #1");
-            tabbedPane.addTab("Tab 1", icon , panel1, "Does nothing");
-        } else {
-            panel1 = new JPanel();
-            plugins.get(0).start(panel1);
-            tabbedPane.addTab(plugins.get(0).getName(), icon , panel1, "say hello");
-        }
-
-        tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);
-
-
-        JComponent panel2 = makeTextPanel("Panel #2");
-        tabbedPane.addTab("Tab 2", icon, panel2, "Does twice as much nothing");
-        tabbedPane.setMnemonicAt(1, KeyEvent.VK_2);
-
-        JComponent panel3 = makeTextPanel("Panel #3");
-        tabbedPane.addTab("Tab 3", icon, panel3, "Still does nothing");
-        tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
-
-        JComponent panel4 = makeTextPanel( "Panel #4 (has a preferred size of 410 x 50).");
-        panel4.setPreferredSize(new Dimension(410, 50));
-        tabbedPane.addTab("Tab 4", icon, panel4, "Does nothing at all");
-        tabbedPane.setMnemonicAt(3, KeyEvent.VK_4);
+                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.
@@ -73 +55 @@
         tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
     }
-
-    private JComponent makeTextPanel(String text) {
-        JPanel panel = new JPanel(false);
-        JLabel filler = new JLabel(text);
-        filler.setHorizontalAlignment(JLabel.CENTER);
-        panel.setLayout(new GridLayout(1, 1));
-        panel.add(filler);
-
-        return panel;
-    }
 }