Changeset 25754 in osm for applications/editors/josm/plugins/mapdust

Timestamp:

2011-03-31T12:02:52+02:00 (13 years ago)

Author:

beata.jancso

Message:

Fix for: Ticket #6158 .

Location:

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

Files:

• MapdustLayer.java (modified) (3 diffs)
• MapdustPlugin.java (modified) (6 diffs)
• gui/MapdustGUI.java (modified) (11 diffs)
• gui/component/panel/MapdustButtonPanel.java (modified) (8 diffs)
• gui/component/panel/MapdustDescriptionPanel.java (modified) (1 diff)
• gui/observer/MapdustUpdateObserver.java (modified) (1 diff)

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

@@ -89 +89 @@
 
     /**
+     * Updates the <code>MapdustLayer</code> with the new
+     * <code>MapdustGUI</code> and <code>MapdustBug</code> list.
+     *
+     * @param mapdustGUI The <code>MapdustGUI</code>
+     * @param mapdustBugList The <code>MapdustBug</code> list
+     */
+    public void update(MapdustGUI mapdustGUI, List<MapdustBug> mapdustBugList) {
+        this.mapdustGUI = mapdustGUI;
+        this.mapdustBugList = mapdustBugList;
+        this.bugSelected = null;
+    }
+
+    /**
      * Returns the icon of the MapDust layer.
      *
@@ -169 +182 @@
     public void paint(Graphics2D g, MapView mv, Bounds bounds) {
         JToolTip tooltip = new JToolTip();
-        if (mapdustBugList != null && mapdustBugList.size()>0) {
+        if (mapdustBugList != null && mapdustBugList.size() > 0) {
             /* draw the current visible bugs */
             for (MapdustBug bug : mapdustBugList) {
@@ -203 +216 @@
             MapdustBug bugSelected = getMapdustGUI().getSelectedBug();
             if (bugSelected == null) {
-                    bugSelected = clickedBug;
+                bugSelected = clickedBug;
             }
             setBugSelected(bugSelected);

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

@@ -418 +418 @@
      */
     @Override
-    public void layerAdded(Layer layer) {
-        if (layer instanceof MapdustLayer) {
-            /* download the MapDust bugs and update the plugin */
-            if (mapdustBugList == null) {
-                updatePluginData();
-            }
-        }
-    }
+    public void layerAdded(Layer layer) {}
 
     /**
@@ -508 +501 @@
     private BoundingBox getBBox() {
         MapView mapView = Main.map.mapView;
-        Bounds bounds =
-                new Bounds(mapView.getLatLon(0, mapView.getHeight()),
-                        mapView.getLatLon(mapView.getWidth(), 0));
+        Bounds bounds = new Bounds(mapView.getLatLon(0, mapView.getHeight()),
+                mapView.getLatLon(mapView.getWidth(), 0));
         return new BoundingBox(bounds.getMin().lon(), bounds.getMin().lat(),
                 bounds.getMax().lon(), bounds.getMax().lat());
@@ -522 +514 @@
     private void updatePluginData() {
         Main.worker.execute(new Runnable() {
-
             @Override
             public void run() {
@@ -549 +540 @@
             /* update the view */
             SwingUtilities.invokeLater(new Runnable() {
-
                 @Override
                 public void run() {
@@ -562 +552 @@
     }
 
+
     /**
      * Updates the current view ( map and MapDust bug list), with the given list
@@ -567 +558 @@
      */
     protected void updateView() {
-        /* update the dialog with the new data */
-        mapdustGUI.update(mapdustBugList, this);
-        /* update the MapdustLayer */
-        if (mapdustLayer == null) {
-            /* create and add the layer */
-            mapdustLayer =
-                    new MapdustLayer("MapDust", mapdustGUI, mapdustBugList);
-            Main.main.addLayer(this.mapdustLayer);
-            Main.map.mapView.moveLayer(this.mapdustLayer, 0);
-            Main.map.mapView.addMouseListener(this);
-            NavigatableComponent.addZoomChangeListener(this);
-        } else {
-            /* re-set the properties */
-            mapdustLayer.destroy();
-            mapdustLayer.setMapdustGUI(mapdustGUI);
-            mapdustLayer.setMapdustBugList(mapdustBugList);
-            mapdustLayer.setBugSelected(null);
-        }
-        /* repaint */
-        mapdustGUI.revalidate();
-        Main.map.mapView.revalidate();
-        Main.map.repaint();
+        if (Main.map != null && Main.map.mapView != null) {
+            /* update the MapdustLayer */
+            boolean needRepaint = false;
+            if (!containsMapdustLayer()) {
+                /* first start or layer was deleted */
+                if (mapdustGUI.isDownloaded()) {
+                    mapdustGUI.update(mapdustBugList, this);
+                    /* create and add the layer */
+                    mapdustLayer = new MapdustLayer("MapDust", mapdustGUI,
+                            mapdustBugList);
+                    Main.main.addLayer(this.mapdustLayer);
+                    Main.map.mapView.moveLayer(this.mapdustLayer, 0);
+                    Main.map.mapView.addMouseListener(this);
+                    NavigatableComponent.addZoomChangeListener(this);
+                    needRepaint = true;
+                }
+            } else {
+                if (mapdustLayer != null) {
+                    /* MapDust data was changed */
+                    mapdustGUI.update(mapdustBugList, this);
+                    mapdustLayer.destroy();
+                    mapdustLayer.update(mapdustGUI, mapdustBugList);
+                    needRepaint = true;
+                }
+            }
+            if (needRepaint) {
+                /* force repaint */
+                mapdustGUI.revalidate();
+                Main.map.mapView.revalidate();
+                Main.map.repaint();
+            }
+        }
+    }
+
+    /**
+     * Verifies if the <code>MapView</code> contains or not the
+     * <code>MapdustLayer</code> layer.
+     *
+     * @return true if the <code>MapView</code> contains the
+     * <code>MapdustLayer</code> false otherwise
+     */
+    private boolean containsMapdustLayer() {
+        boolean contains = false;
+        List<Layer> all = Main.map.mapView.getAllLayersAsList();
+        if (mapdustLayer != null && all.contains(mapdustLayer)) {
+            contains = true;
+        }
+        return contains;
     }
 

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.
@@ -125 +122 @@
             notifyObservers(null, true);
             downloaded = true;
-        }
-        if (wasDeleted) {
-            notifyObservers(null, true);
-            wasDeleted = false;
         }
         super.showDialog();
@@ -147 +140 @@
             mainPanel = null;
             panel = null;
+            actionPanel = null;
         } else {
             /* from online to offline */
-            remove(mainPanel);
-            mainPanel = null;
-            panel = null;
-        }
-        wasDeleted = true;
+            if (mainPanel != null) {
+                remove(mainPanel);
+                mainPanel = null;
+                panel = null;
+                detailsPanel = null;
+            }
+        }
+        downloaded = false;
+        button.setSelected(false);
         super.destroy();
+    }
+
+    @Override
+    protected void toggleButtonHook() {
+        if (isVisible()) {
+            setVisible(false);
+            button.setSelected(false);
+        } else {
+            setVisible(true);
+        }
     }
 
@@ -168 +176 @@
         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);
-
         /* update panels */
         updateMapdustPanel(mapdustBugs);
         updateMapdustActionPanel(actionList);
-        if (showBug
-                && !action.getCommand().equals(MapdustServiceCommand.ADD_BUG)) {
+        if (showBug && !action.getCommand().equals(MapdustServiceCommand.ADD_BUG)) {
             panel.resetSelectedBug(0);
         } else {
@@ -246 +252 @@
 
             /* update panels */
-            List<MapdustBug> bugs =
-                    filterMapdustBugList(mapdustBugs, actionList,
-                            mapdustPlugin.getFilter());
+            List<MapdustBug> bugs = filterMapdustBugList(mapdustBugs,
+                    actionList,mapdustPlugin.getFilter());
             updateMapdustPanel(bugs);
             updateMapdustActionPanel(actionList);
@@ -256 +261 @@
         }
     }
-
 
     /**
@@ -272 +276 @@
         }
         if (panel == null) {
-            panel =
-                    new MapdustBugListPanel(mapdustBugs, "Bug reports",
-                            mapdustPlugin);
+            panel = new MapdustBugListPanel(mapdustBugs, "Bug reports",
+                    mapdustPlugin);
             panel.addObserver(detailsPanel);
         } else {
@@ -289 +292 @@
     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);
@@ -446 +448 @@
     }
 
+
     /**
      * Adds a new MapDust bug details observer to the list of observers.
@@ -516 +519 @@
                 this.initialUpdateObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).update(null, true);
+            (elements.next()).update(filter, first);
         }
     }
@@ -552 +555 @@
     }
 
+    /**
+     * Returns the downloaded flag
+     *
+     * @return the downloaded
+     */
+    public boolean isDownloaded() {
+        return downloaded;
+    }
+
 }

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

@@ -112 +112 @@
                 imagePath = "dialogs/online.png";
             }
-            AbstractAction action =
-                    new ExecuteWorkOffline(mapdustPlugin.getMapdustGUI());
+            AbstractAction action = new ExecuteWorkOffline(
+                    mapdustPlugin.getMapdustGUI());
             ((ExecuteWorkOffline) action).addObserver(mapdustPlugin);
-            btnWorkOffline =
-                    ComponentUtil.createJButton("Work offline", tooltipText,
-                            imagePath, action);
+            btnWorkOffline = ComponentUtil.createJButton("Work offline",
+                    tooltipText, imagePath, action);
             btnWorkOffline.setSelected(false);
             btnWorkOffline.setFocusTraversalKeysEnabled(false);
@@ -124 +123 @@
         if (btnFilter == null) {
             AbstractAction action = new ShowFilterBugAction(mapdustPlugin);
-            btnFilter =
-                    ComponentUtil.createJButton("Filter bug reports",
-                            "Filter bug reports",
-                            "dialogs/mapdust_bug_filter.png", action);
+            btnFilter = ComponentUtil.createJButton("Filter bug reports",
+                    "Filter bug reports", "dialogs/mapdust_bug_filter.png",
+                    action);
             btnFilter.setEnabled(true);
             btnFilter.setFocusTraversalKeysEnabled(false);
@@ -134 +132 @@
         if (btnAddComment == null) {
             AbstractAction action = new ShowCommentBugAction(mapdustPlugin);
-            btnAddComment =
-                    ComponentUtil
-                            .createJButton("Comment bug report",
-                                    "Comment bug report",
-                                    "dialogs/comment.png", action);
+            btnAddComment = ComponentUtil.createJButton("Comment bug report",
+                    "Comment bug report", "dialogs/comment.png", action);
             btnAddComment.setEnabled(false);
             btnAddComment.setFocusTraversalKeysEnabled(false);
@@ -145 +140 @@
         if (btnFixBugReport == null) {
             AbstractAction action = new ShowCloseBugAction(mapdustPlugin);
-            btnFixBugReport =
-                    ComponentUtil.createJButton("Close bug report",
-                            "Close bug report", "dialogs/fixed.png", action);
+            btnFixBugReport = ComponentUtil.createJButton("Close bug report",
+                    "Close bug report", "dialogs/fixed.png", action);
             btnFixBugReport.setEnabled(false);
             btnFixBugReport.setFocusTraversalKeysEnabled(false);
@@ -154 +148 @@
         if (btnInvalidateBugReport == null) {
             AbstractAction action = new ShowInvalidateBugAction(mapdustPlugin);
-            btnInvalidateBugReport =
-                    ComponentUtil.createJButton("Invalidate bug report",
-                            "Invalidate bug report", "dialogs/invalid.png",
-                            action);
+            btnInvalidateBugReport = ComponentUtil.createJButton(
+                    "Invalidate bug report", "Invalidate bug report",
+                    "dialogs/invalid.png", action);
             btnInvalidateBugReport.setEnabled(false);
             btnInvalidateBugReport.setFocusTraversalKeysEnabled(false);
@@ -164 +157 @@
         if (btnReOpenBugReport == null) {
             AbstractAction action = new ShowReOpenBugAction(mapdustPlugin);
-            btnReOpenBugReport =
-                    ComponentUtil.createJButton("Re-open bug report",
-                            "Re-open bug report", "dialogs/reopen.png", action);
+            btnReOpenBugReport = ComponentUtil.createJButton(
+                    "Re-open bug report", "Re-open bug report",
+                    "dialogs/reopen.png", action);
             btnReOpenBugReport.setEnabled(false);
             btnReOpenBugReport.setFocusTraversalKeysEnabled(false);
@@ -175 +168 @@
             AbstractAction action = new ExecuteRefresh();
             ((ExecuteRefresh) action).addObserver(mapdustPlugin);
-            btnRefresh =
-                    ComponentUtil.createJButton("Refresh", "Refresh",
-                            "dialogs/mapdust_refresh.png", action);
+            btnRefresh = ComponentUtil.createJButton("Refresh", "Refresh",
+                    "dialogs/mapdust_refresh.png", action);
             if (pluginState.equals(MapdustPluginState.OFFLINE.getValue())) {
                 btnRefresh.setEnabled(false);
@@ -241 +233 @@
      * other buttons will be disabled.
      *
-     * @param onlyBasic If true then the not basic buttons will be disabled
+     * @param onlyBasic If true then the not basic buttons will be enabled
      */
     public void enableBasicComponents(boolean onlyBasic) {

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

@@ -80 +80 @@
      */
     private void addComponents(String description) {
-        if (description != null && !description.isEmpty()) {
-            JTextArea txtDescription = new JTextArea(description);
-            txtDescription.setLineWrap(true);
-            txtDescription.setFont(new Font("Times New Roman", Font.BOLD, 12));
-            txtDescription.setEditable(false);
-            JScrollPane cmpDescription = ComponentUtil.createJScrollPane(
-                    txtDescription, null, Color.white, true, true);
-            cmpDescription.setPreferredSize(new Dimension(100, 100));
-            add(cmpDescription, BorderLayout.CENTER);
-        }
+        description = (description != null ? description : "");
+        JTextArea txtDescription = new JTextArea(description);
+        txtDescription.setLineWrap(true);
+        txtDescription.setFont(new Font("Times New Roman", Font.BOLD, 12));
+        txtDescription.setEditable(false);
+        JScrollPane cmpDescription = ComponentUtil.createJScrollPane(
+                txtDescription, null, Color.white, true, true);
+        cmpDescription.setPreferredSize(new Dimension(100, 100));
+        add(cmpDescription, BorderLayout.CENTER);
     }
 

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

@@ -47 +47 @@
      * Updates the MapDust bugs based on the given filters. If the initialUpdate
      * flag is true then the filters will not be applied to the MapDust bug
-     * data.
+     * data. The initialUpdate flag can be true in one the following cases:
+     * 1) After JOSM startup , 2) If the MapDust layer was re-added after a
+     * previous deletion.
      *
      * @param filter The <code>MapdustBugFilter</code> object