Changeset 26373 in osm for applications/editors/josm/plugins

Timestamp:

2011-07-20T01:07:59+02:00 (13 years ago)

Author:

frederik

Message:

fix selection bug in license change plugin; change some names

Location:

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

Files:

• Check.java (modified) (1 diff)
• CheckAction.java (modified) (4 diffs)
• LicenseChangeDialog.java (modified) (6 diffs)
• LicenseChangePlugin.java (modified) (3 diffs)
• ProblemLayer.java (modified) (3 diffs)
• Severity.java (modified) (1 diff)

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Check.java

@@ -90 +90 @@
                 this.progressMonitor = progressMonitor;
         }
-        this.progressMonitor.beginTask(tr("Running test {0}", name));
         errors = new ArrayList<LicenseProblem>(30);
     }

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java

@@ -55 +55 @@
     public void doCheck(ActionEvent ev)
     {
-        if (plugin.validateAction == null || Main.map == null || !Main.map.isVisible())
+        if (plugin.checkAction == null || Main.map == null || !Main.map.isVisible())
             return;
 
@@ -99 +99 @@
         public CheckTask(Collection<OsmPrimitive> validatedPrimitives, Collection<OsmPrimitive> formerValidatedPrimitives) 
         {
-            super(tr("Loading from Quick History Service"), false /*don't ignore exceptions */);
+            super(tr("Loading"), false /*don't ignore exceptions */);
+
             this.validatedPrimitives  = validatedPrimitives;
             this.formerValidatedPrimitives = formerValidatedPrimitives;
@@ -120 +121 @@
             Runnable r = new Runnable()  {
                 public void run() {
-                    plugin.validationDialog.tree.setErrors(problems);
-                    plugin.validationDialog.setVisible(true);
+                    plugin.problemDialog.tree.setErrors(problems);
+                    plugin.problemDialog.setVisible(true);
                     Main.main.getCurrentDataSet().fireSelectionChanged();
                 }
@@ -139 +140 @@
                 OsmTransferException 
         {
+            getProgressMonitor().indeterminateSubTask(tr("Loading from Quick History Service..."));
             plugin.loadDataFromQuickHistoryService(validatedPrimitives);
             problems = new ArrayList<LicenseProblem>(200);
-            getProgressMonitor().setTicksCount(validatedPrimitives.size());
             int testCounter = 0;
-            getProgressMonitor().setCustomText(tr("Analyzing"));
-            licenseCheck.startCheck(getProgressMonitor().createSubTaskMonitor(validatedPrimitives.size(), false));
+            getProgressMonitor().indeterminateSubTask(tr("Analyzing..."));
+            //licenseCheck.startCheck(getProgressMonitor().createSubTaskMonitor(validatedPrimitives.size(), false));
+            licenseCheck.startCheck(getProgressMonitor());
             licenseCheck.visit(validatedPrimitives);
             licenseCheck.endCheck();

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java

@@ -36 +36 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -55 +54 @@
  * the list while single click will make the clicked entry the only selection.
  */
-public class LicenseChangeDialog extends ToggleDialog implements ActionListener, SelectionChangedListener {
+public class LicenseChangeDialog extends ToggleDialog implements ActionListener {
     private LicenseChangePlugin plugin;
 
@@ -77 +76 @@
         super(tr("Relicensing problems"), "licensechange", tr("Open the relicensing window."),
                 Shortcut.registerShortcut("subwindow:licensechange", tr("Toggle: {0}", tr("Relicensing problems")),
-                        KeyEvent.VK_V, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
+                        KeyEvent.VK_L, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
 
         this.plugin = plugin;
@@ -102 +101 @@
         selectButton.setEnabled(false);
         buttonPanel.add(selectButton);
-        buttonPanel.add(new SideButton(plugin.validateAction), "refresh");
+        buttonPanel.add(new SideButton(plugin.checkAction), "refresh");
         add(buttonPanel, BorderLayout.SOUTH);
 
@@ -110 +109 @@
     public void showNotify() 
     {
-        DataSet.addSelectionListener(this);
         DataSet ds = Main.main.getCurrentDataSet();
         if (ds != null) {
             updateSelection(ds.getSelected());
         }
-    }
-
-    @Override
-    public void hideNotify() 
-    {
-        DataSet.removeSelectionListener(this);
     }
 
@@ -321 +313 @@
     }
 
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) 
-    {
-        updateSelection(newSelection);
-    }
 }

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangePlugin.java

@@ -65 +65 @@
 
     /** The validate action */
-    CheckAction validateAction = new CheckAction(this);
+    CheckAction checkAction = new CheckAction(this);
 
     /** The validation dialog */
-    LicenseChangeDialog validationDialog;
+    LicenseChangeDialog problemDialog;
 
     /** The list of errors per layer*/
@@ -95 +95 @@
         if (newFrame != null) 
         {
-            validationDialog = new LicenseChangeDialog(this);
-            newFrame.addToggleDialog(validationDialog);
+            problemDialog = new LicenseChangeDialog(this);
+            newFrame.addToggleDialog(problemDialog);
             initializeProblemLayer();
             MapView.addLayerChangeListener(this);
@@ -123 +123 @@
         if (newLayer instanceof OsmDataLayer) {
             List<LicenseProblem> errors = layerProblems.get(newLayer);
-            validationDialog.tree.setErrorList(errors);
+            problemDialog.tree.setErrorList(errors);
             Main.map.repaint();
         }

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java

@@ -61 +61 @@
     public void paint(final Graphics2D g, final MapView mv, Bounds bounds) 
     {
-        updateCount = plugin.validationDialog.tree.getUpdateCount();
-        DefaultMutableTreeNode root = plugin.validationDialog.tree.getRoot();
+        updateCount = plugin.problemDialog.tree.getUpdateCount();
+        DefaultMutableTreeNode root = plugin.problemDialog.tree.getRoot();
         if (root == null || root.getChildCount() == 0)
             return;
@@ -86 +86 @@
     {
         Bag<Severity, LicenseProblem> problemTree = new Bag<Severity, LicenseProblem>();
-        List<LicenseProblem> problems = plugin.validationDialog.tree.getErrors();
+        List<LicenseProblem> problems = plugin.problemDialog.tree.getErrors();
         for (LicenseProblem e : problems) {
             problemTree.add(e.getSeverity(), e);
@@ -118 +118 @@
     public boolean isChanged() 
     {
-        return updateCount != plugin.validationDialog.tree.getUpdateCount();
+        return updateCount != plugin.problemDialog.tree.getUpdateCount();
     }
 

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java

@@ -14 +14 @@
     /** Error messages */
     DATA_LOSS(tr("Data loss"), "error.gif",                     
-        Main.pref.getColor(marktr("license validation error"), Color.RED)),
+        Main.pref.getColor(marktr("license check error"), Color.RED)),
 
     /** Warning messages */
     POSSIBLE_DATA_LOSS(tr("Possible data loss"), "warning.gif", 
-        Main.pref.getColor(marktr("license validation warning"), Color.ORANGE)),
+        Main.pref.getColor(marktr("license check warning"), Color.ORANGE)),
 
     /** Other messages */
     DATA_REDUCTION(tr("Data reduction"), "other.gif",           
-        Main.pref.getColor(marktr("license validation other"), Color.YELLOW));
+        Main.pref.getColor(marktr("license check notice"), Color.YELLOW));
 
     /** Description of the severity code */