Changeset 23393 in osm for applications/editors/josm/plugins/smed/src

Timestamp:

2010-09-29T00:12:24+02:00 (14 years ago)

Author:

postfix

Message:

some corrections in ant-files
Listener for osm changes now correctly dequeue if program exit
josm-menuItem handled now correctly

Location:

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

Files:

• Smed.java (modified) (3 diffs)
• tabs/SmedTabAction.java (modified) (5 diffs)

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

@@ -32 +32 @@
 
     private JMenuItem item;
-    private SmedTabAction SmedTab;
-        private List<SmedPluggable> plugins = null;
+    private SmedTabAction smedTab;
+        // private List<SmedPluggable> plugins = null;
 
     public Smed(PluginInformation info) {
@@ -135 +135 @@
         }
         
-        SmedTab = new SmedTabAction();
-        item = Main.main.menu.toolsMenu.add(SmedTab);
-
+        smedTab = new SmedTabAction();
+        item = Main.main.menu.toolsMenu.add(smedTab);
+        smedTab.setOsmItem(item);
+        
         item.setEnabled(false);
 
@@ -148 +149 @@
         } else {
             item.setEnabled(false);
-            // SmpDialog.CloseDialog();
+            smedTab.closeDialog();
         }
     }
 
+    /*
     public void setPlugins(List<SmedPluggable> plugins)  {
         this.plugins = plugins;
         
     }
+    */
 
 }

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

@@ -10 +10 @@
 
 import javax.swing.JFrame;
+import javax.swing.JMenuItem;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -28 +29 @@
         private SmedTabbedPane smedTabs = new SmedTabbedPane();
         private SmedMenuBar smedMenu = new SmedMenuBar();
-
+        private JFrame frame = null;
+        private boolean isOpen = false;
+        private JMenuItem osmItem;
+        
     public SmedTabAction() {
         super( "Seekarten Editor", "Smed","Seekarten Editor", Shortcut.registerShortcut(
@@ -44 +48 @@
             }
         });
+        
+        isOpen = true;
+                if (osmItem == null) return;
+
+                osmItem.setEnabled(false);
     }
 
@@ -49 +58 @@
     protected void createAndShowTabs() {
         //Create and set up the window.
-        JFrame frame = new JFrame("TabbedPaneDemo");
+        frame = new JFrame("TabbedPaneDemo");
         frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         frame.setResizable(false);
@@ -65 +74 @@
 
 
+        public void closeDialog() {
+                List<SmedPluggable> plugins = SmedTabbedPane.getPlugins();
+                
+                if(plugins != null) {
+                        for(SmedPluggable p : plugins) p.stop();
+                }
+                
+                if(isOpen) {
+                        frame.setVisible(false);
+                        frame.dispose();
+                }
+                
+                isOpen = false;
+        }
+
+
+        public void setOsmItem(JMenuItem item) {
+                osmItem = item;         
+        }
+
 }