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

Timestamp:

2010-09-16T11:38:18+02:00 (15 years ago)

Author:

stoecker

Message:

fix last remaining tabs

Location:

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

Files:

• plug/ifc/SmedPluggable.java (modified) (1 diff)
• plug/util/SmedPluginLoader.java (modified) (1 diff)
• tabs/SmedTabbedPane.java (modified) (1 diff)

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);
 
 }

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

@@ -21 +21 @@
 
 
-        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);
-        }
+    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

@@ -24 +24 @@
     private static final long serialVersionUID = 1L;
 
-        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 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++;
-                }
+        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.