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

Timestamp:

2010-09-19T11:55:14+02:00 (15 years ago)

Author:

stoecker

Message:

remove tabs - please follow josm formatting styles when developing for josm

Location:

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

Files:

• Smed.java (modified) (2 diffs)
• SmedFile.java (modified) (1 diff)
• menu/SmedMenuBar.java (modified) (1 diff)
• 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/Smed.java

@@ -42 +42 @@
         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 +59 @@
             JarOutputStream jos = new JarOutputStream(fos);
             BufferedOutputStream oos = new BufferedOutputStream( jos);
-            
+
             // extract *.jar to splug
             Enumeration<JarEntry> 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");

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

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

applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java

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

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();
-                }
-                
-                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<SmedPluggable> 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);
+        }
     }
 }