Changeset 25656 in osm for applications

Timestamp:

2011-03-21T11:25:29+01:00 (13 years ago)

Author:

beata.jancso

Message:

fix for: Ticket 6116 and 6115

Location:

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust

Files:

• MapdustLayer.java (modified) (3 diffs)
• MapdustPlugin.java (modified) (5 diffs)
• gui/MapdustGUI.java (modified) (7 diffs)
• gui/component/panel/MapdustBugListPanel.java (modified) (1 diff)
• gui/component/panel/MapdustButtonPanel.java (modified) (1 diff)
• gui/component/panel/MapdustPanel.java (deleted)

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java

@@ -44 +44 @@
 import javax.swing.ImageIcon;
 import javax.swing.JToolTip;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -170 +169 @@
     public void paint(Graphics2D g, MapView mv, Bounds bounds) {
         JToolTip tooltip = new JToolTip();
-        if (mapdustBugList != null) {
+        if (mapdustBugList != null && mapdustBugList.size()>0) {
             /* draw the current visible bugs */
             for (MapdustBug bug : mapdustBugList) {
@@ -200 +199 @@
             /* draw the selected bug description */
             /* selected by clicking */
-            MapdustBug bug1 = getBugSelected();
+            MapdustBug clickedBug = getBugSelected();
             /* selected from the list */
             MapdustBug bugSelected = getMapdustGUI().getSelectedBug();
             if (bugSelected == null) {
-                if (Main.map.mapView.getActiveLayer() == this) {
-                    bugSelected = bug1;
-                }
+                    bugSelected = clickedBug;
             }
             setBugSelected(bugSelected);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java

@@ -126 +126 @@
         String longTxt = tr("Toggle: {0}", tr("Open MapDust"));
         Shortcut shortcut = Shortcut.registerShortcut(shortTxt, longTxt,
-                KeyEvent.VK_0, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT);
+                KeyEvent.VK_0, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT);
         String name = "MapDust bug reports";
         String tooltip = "Activates the MapDust bug reporter plugin";
@@ -132 +132 @@
                 shortcut, 150, this);
         /* add default values for static variables */
-        Main.pref.put("mapdust.pluginState", MapdustPluginState.ONLINE.getValue());
+        Main.pref.put("mapdust.pluginState",
+                MapdustPluginState.ONLINE.getValue());
         Main.pref.put("mapdust.nickname", "");
         Main.pref.put("mapdust.showError", true);
@@ -294 +295 @@
             }
             if (filter.getDescr() != null && filter.getDescr()) {
-                if (!mapdustBug.getIsDefaultDescription()) {
+                /* show only bugs with isDefaultDescription = false */
+                if (mapdustBug.getIsDefaultDescription()) {
                     result = false;
+                } else {
+                    result = containsStatus && containsType;
                 }
             } else {
@@ -436 +440 @@
             Main.pref.put("mapdust.pluginState",
                     MapdustPluginState.ONLINE.getValue());
-            MapView.removeLayerChangeListener(this);
             NavigatableComponent.removeZoomChangeListener(this);
             Main.map.mapView.removeLayer(layer);
             Main.map.remove(mapdustGUI);
             if (mapdustGUI != null) {
-                mapdustGUI.update(new ArrayList<MapdustBug>(), this);
-                mapdustGUI.setVisible(false);
                 mapdustGUI.destroy();
             }
@@ -576 +577 @@
             Main.map.mapView.moveLayer(this.mapdustLayer, 0);
             Main.map.mapView.addMouseListener(this);
-            MapView.addLayerChangeListener(this);
             NavigatableComponent.addZoomChangeListener(this);
         } else {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java

@@ -96 +96 @@
     private boolean downloaded = false;
 
+    /** Specifies if the MapDust layer was or not before deleted */
+    boolean wasDeleted = false;
+
     /**
      * Builds a <code>MapdustGUi</code> based on the given parameters.
@@ -114 +117 @@
     /**
      * Displays the <code>MapdustGUI</code> dialog window in the JOSM editor. If
-     * the MapDust data was not downloaded yet, it will donwload the data and
-     * also update the MapDust plugin with the data. If the MapDust data was
-     * already downloaded, then the <code>MapdustGUI</code> will be displayed.
+     * the MapDust data was not downloaded yet or the MapDust layer was added
+     * after a previous deletion, then the bug reports data will be deleted.
      */
     @Override
@@ -124 +126 @@
             downloaded = true;
         }
+        if (wasDeleted) {
+            notifyObservers(null, true);
+            wasDeleted = false;
+        }
         super.showDialog();
+    }
+
+    /**
+     * Destroys the <code>MapdustGUI</code> dialog window.
+     */
+    @Override
+    public void destroy() {
+        setVisible(false);
+        /* remove panels */
+        if (tabbedPane != null) {
+            /* from offline to online */
+            remove(mainPanel);
+            tabbedPane = null;
+            actionPanel = null;
+            mainPanel = null;
+            panel = null;
+        } else {
+            /* from online to offline */
+            remove(mainPanel);
+            mainPanel = null;
+            panel = null;
+        }
+        wasDeleted = true;
+        super.destroy();
     }
 
@@ -138 +168 @@
         actionList.add(action);
         List<MapdustBug> mapdustBugs = panel.getMapdustBugsList();
-        boolean showBug = shouldDisplay(action.getMapdustBug(),
-                mapdustPlugin.getFilter());
+        boolean showBug =
+                shouldDisplay(action.getMapdustBug(), mapdustPlugin.getFilter());
         mapdustBugs = modifyBug(mapdustBugs, action.getMapdustBug(), showBug);
 
@@ -145 +175 @@
         updateMapdustPanel(mapdustBugs);
         updateMapdustActionPanel(actionList);
-        if (showBug &&
-                !action.getCommand().equals(MapdustServiceCommand.ADD_BUG)) {
+        if (showBug
+                && !action.getCommand().equals(MapdustServiceCommand.ADD_BUG)) {
             panel.resetSelectedBug(0);
         } else {
@@ -242 +272 @@
         }
         if (panel == null) {
-            panel = new MapdustBugListPanel(mapdustBugs, "Bug reports",
-                    mapdustPlugin);
+            panel =
+                    new MapdustBugListPanel(mapdustBugs, "Bug reports",
+                            mapdustPlugin);
             panel.addObserver(detailsPanel);
         } else {
@@ -258 +289 @@
     private void updateMapdustActionPanel(List<MapdustAction> actionList) {
         if (actionPanel == null) {
-            actionPanel = new MapdustActionPanel(actionList,
-                    "Offline Contribution", mapdustPlugin);
+            actionPanel =
+                    new MapdustActionPanel(actionList, "Offline Contribution",
+                            mapdustPlugin);
         } else {
             actionPanel.updateComponents(actionList);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java

@@ -250 +250 @@
                     getMenuFixed().setEnabled(false);
                 }
+
+                btnPanel.getBtnAddComment().setSelected(false);
+                btnPanel.getBtnReOpenBugReport().setSelected(false);
+                btnPanel.getBtnFixBugReport().setSelected(false);
+                btnPanel.getBtnInvalidateBugReport().setSelected(false);
                 notifyObservers(selectedBug);
             } else {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustButtonPanel.java

@@ -245 +245 @@
     public void enableBasicComponents(boolean onlyBasic) {
         btnWorkOffline.setEnabled(true);
+        btnWorkOffline.setSelected(false);
         btnFilter.setEnabled(true);
+        btnFilter.setSelected(false);
         btnRefresh.setEnabled(true);
+        btnRefresh.setSelected(false);
         if (onlyBasic) {
             btnAddComment.setEnabled(false);