Changeset 30004 in osm for applications/editors/josm/plugins/openstreetbugs

Timestamp:

2013-10-06T21:18:56+02:00 (11 years ago)

Author:

donvip

Message:

[josm_openstreetbugs] fix #josm8840 - Disable the possibility of adding new reports

Location:

applications/editors/josm/plugins/openstreetbugs

Files:

• images/icon_error_add16.png (deleted)
• images/icon_error_add22.png (deleted)
• src/org/openstreetmap/josm/plugins/osb/api/NewAction.java (deleted)
• src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/osb/gui/OsbQueueListCellRenderer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java (deleted)
• src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java (deleted)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java

@@ -83 +83 @@
 import org.openstreetmap.josm.plugins.osb.gui.action.OsbAction;
 import org.openstreetmap.josm.plugins.osb.gui.action.OsbActionObserver;
-import org.openstreetmap.josm.plugins.osb.gui.action.PointToNewIssueAction;
 import org.openstreetmap.josm.plugins.osb.gui.action.PopupFactory;
 import org.openstreetmap.josm.plugins.osb.gui.action.ToggleConnectionModeAction;
@@ -103 +102 @@
     private JButton closeIssue;
     private JButton processQueue = new JButton(tr("Process queue"));
-    private JToggleButton newIssue = new JToggleButton();
     private JToggleButton toggleConnectionMode;
     private JTabbedPane tabbedPane = new JTabbedPane();
@@ -174 +172 @@
         closeIssue.setToolTipText((String) closeIssue.getAction().getValue(Action.NAME));
         closeIssue.setIcon(OsbPlugin.loadIcon("icon_valid22.png"));
-        PointToNewIssueAction nia = new PointToNewIssueAction(newIssue, osbPlugin);
-        newIssue.setAction(nia);
-        newIssue.setToolTipText((String) newIssue.getAction().getValue(Action.NAME));
-        newIssue.setIcon(OsbPlugin.loadIcon("icon_error_add22.png"));
 
         buttonPanel.add(toggleConnectionMode);
         buttonPanel.add(refresh);
-        buttonPanel.add(newIssue);
         buttonPanel.add(addComment);
         buttonPanel.add(closeIssue);
@@ -215 +208 @@
             addComment.setHorizontalAlignment(SwingConstants.LEFT);
             closeIssue.setHorizontalAlignment(SwingConstants.LEFT);
-            newIssue.setHorizontalAlignment(SwingConstants.LEFT);
         } else {
             toggleConnectionMode.setText(null);
@@ -221 +213 @@
             addComment.setText(null);
             closeIssue.setText(null);
-            newIssue.setText(null);
         }
 
@@ -227 +218 @@
         closeIssueAction.addActionObserver(this);
         setConnectionMode(offline);
-
 
         MapView.addLayerChangeListener(this);

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbQueueListCellRenderer.java

@@ -41 +41 @@
 import org.openstreetmap.josm.plugins.osb.gui.action.AddCommentAction;
 import org.openstreetmap.josm.plugins.osb.gui.action.CloseIssueAction;
-import org.openstreetmap.josm.plugins.osb.gui.action.NewIssueAction;
 import org.openstreetmap.josm.plugins.osb.gui.action.OsbAction;
 
@@ -65 +64 @@
         OsbAction action = (OsbAction) value;
         Icon icon = null;
-        if(action instanceof NewIssueAction) {
-            icon = OsbPlugin.loadIcon("icon_error_add16.png");
-        } else if(action instanceof AddCommentAction) {
+        if(action instanceof AddCommentAction) {
             icon = OsbPlugin.loadIcon("add_comment16.png");
         } else if(action instanceof CloseIssueAction) {
@@ -85 +82 @@
         return label;
     }
-
 }