Changeset 23389 in osm for applications

Timestamp:

2010-09-28T20:39:51+02:00 (14 years ago)

Author:

postfix

Message:

fixed run time errors, if there is no plugin in splug and in smed

Location:

applications/editors/josm/plugins/smed

Files:

• plugs/oseam/build.xml (added)
• src/smed/menu/file/TabManager.java (modified) (3 diffs)
• src/smed/tabs/SmedTabAction.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java

@@ -67 +67 @@
                 splugDir = new SmedFile(pluginDirName + "/splug");
                 
-                for(SmedPluggable p : plugins){
-                        if(splugDir.isVisible(p.getFileName()) && !splugDir.isDeleted(p.getFileName())) model.addElement (p.getName());
-                        else if(splugDir.isDeleted(p.getFileName())) model.addElement("delete - " + p.getName());
-                        else model.addElement("invisible - " + p.getName());
-                }
+                if(plugins != null) {
+                        for(SmedPluggable p : plugins){
+                                if(splugDir.isVisible(p.getFileName()) && !splugDir.isDeleted(p.getFileName())) model.addElement (p.getName());
+                                else if(splugDir.isDeleted(p.getFileName())) model.addElement("delete - " + p.getName());
+                                else model.addElement("invisible - " + p.getName());
+                        }
+                } else model.addElement("no plugin loaded");
                 
                 modelSize = model.getSize();
@@ -334 +336 @@
                         Icon icon = null;
                         
-                        for(SmedPluggable p : plugins) {
-                                String str = model.get(i).toString();
-
-                                if(str.length() > 9 && str.substring(0,9).equals("invisible")) { 
-                                        splugDir.setVisible(p.getFileName(),false);
-                                } else splugDir.setVisible(p.getFileName(),true);
+                        if(plugins != null) {
+                                for(SmedPluggable p : plugins) {
+                                        String str = model.get(i).toString();
+
+                                        if(str.length() > 9 && str.substring(0,9).equals("invisible")) { 
+                                                splugDir.setVisible(p.getFileName(),false);
+                                        } else splugDir.setVisible(p.getFileName(),true);
                                 
-                                if(str.length() > 6 && str.substring(0,6).equals("delete")) {
-                                        splugDir.setDeleted(p.getFileName(),true);
-                                } else splugDir.setDeleted(p.getFileName(),false);
+                                        if(str.length() > 6 && str.substring(0,6).equals("delete")) {
+                                                splugDir.setDeleted(p.getFileName(),true);
+                                        } else splugDir.setDeleted(p.getFileName(),false);
                                 
-                                i++;
-                        }
+                                        i++;
+                                }
                         
-                        tabbedPane.removeAll();
+                                tabbedPane.removeAll();
  
-                        JComponent panel = null;
+                                JComponent panel = null;
                         
-                        for(SmedPluggable p : plugins) {
-                                if(splugDir.isVisible(p.getFileName()) && !splugDir.isDeleted(p.getFileName())) {
-                                panel = p.getComponent();
+                                for(SmedPluggable p : plugins) {
+                                        if(splugDir.isVisible(p.getFileName()) && !splugDir.isDeleted(p.getFileName())) {
+                                                panel = p.getComponent();
                                 
-                                tabbedPane.addTab(p.getName(),icon, panel, p.getInfo());
-                        }
+                                                tabbedPane.addTab(p.getName(),icon, panel, p.getInfo());
+                                        }
+                                }
                         }
 
@@ -390 +394 @@
                 int i = 0;
                 
-                for(SmedPluggable p : plugins) { 
-                        if(selModel.isSelectedIndex(i)) model.set(i,s + p.getName());
-                        i++;
+                if(plugins != null) {
+                        for(SmedPluggable p : plugins) { 
+                                if(selModel.isSelectedIndex(i)) model.set(i,s + p.getName());
+                                i++;
+                        }
                 }
         }

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

@@ -4 +4 @@
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -58 +59 @@
 
         //Display the window.
-        frame.pack();
+        frame.setSize(new Dimension(420, 460));
+        // frame.pack();
         frame.setVisible(true);
     }