Changeset 8633 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-08-01T19:58:37+02:00 (9 years ago)

Author:

Don-vip

Message:

fix some compile errors that arise with openjdk-9-b74

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/TestError.java (modified) (1 diff)
• gui/dialogs/CommandStackDialog.java (modified) (1 diff)
• gui/dialogs/ValidatorDialog.java (modified) (7 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (5 diffs)
• gui/history/HistoryBrowserDialogManager.java (modified) (1 diff)
• gui/layer/ValidatorLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -194 +194 @@
      * @param primitives the list of primitives affected by this error
      */
-    public void setPrimitives(List<OsmPrimitive> primitives) {
+    public void setPrimitives(List<? extends OsmPrimitive> primitives) {
         this.primitives = primitives;
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -338 +338 @@
      * @return collection of affected primitives, onluy usable ones
      */
-    protected static FilteredCollection<OsmPrimitive> getAffectedPrimitives(TreePath path) {
+    protected static FilteredCollection<? extends OsmPrimitive> getAffectedPrimitives(TreePath path) {
         PseudoCommand c = ((CommandListMutableTreeNode) path.getLastPathComponent()).getCommand();
         final OsmDataLayer currentLayer = Main.main.getEditLayer();

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -25 +25 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
@@ -197 +198 @@
             }
 
-            Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
+            Enumeration<TreeNode> children = node.breadthFirstEnumeration();
             while (children.hasMoreElements()) {
-                DefaultMutableTreeNode childNode = children.nextElement();
+                DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
                 if (processedNodes.contains(childNode)) {
                     continue;
@@ -247 +248 @@
                 }
                 if (asked == JOptionPane.YES_NO_OPTION) {
-                    Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
+                    Enumeration<TreeNode> children = node.breadthFirstEnumeration();
                     while (children.hasMoreElements()) {
-                        DefaultMutableTreeNode childNode = children.nextElement();
+                        DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
                         if (processedNodes.contains(childNode)) {
                             continue;
@@ -272 +273 @@
             }
 
-            Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
+            Enumeration<TreeNode> children = node.breadthFirstEnumeration();
             while (children.hasMoreElements()) {
-                DefaultMutableTreeNode childNode = children.nextElement();
+                DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
                 if (processedNodes.contains(childNode)) {
                     continue;
@@ -315 +316 @@
         for (TreePath path : selectedPaths) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
-            Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
+            Enumeration<TreeNode> children = node.breadthFirstEnumeration();
             while (children.hasMoreElements()) {
-                DefaultMutableTreeNode childNode = children.nextElement();
+                DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
                 Object nodeInfo = childNode.getUserObject();
                 if (nodeInfo instanceof TestError) {
@@ -347 +348 @@
         DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
         if (lastSelectedNode != null && !lastSelectedNode.equals(node)) {
-            Enumeration<DefaultMutableTreeNode> children = lastSelectedNode.breadthFirstEnumeration();
+            Enumeration<TreeNode> children = lastSelectedNode.breadthFirstEnumeration();
             while (children.hasMoreElements()) {
-                DefaultMutableTreeNode childNode = children.nextElement();
+                DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
                 Object nodeInfo = childNode.getUserObject();
                 if (nodeInfo instanceof TestError) {
@@ -362 +363 @@
             return hasFixes;
 
-        Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
+        Enumeration<TreeNode> children = node.breadthFirstEnumeration();
         while (children.hasMoreElements()) {
-            DefaultMutableTreeNode childNode = children.nextElement();
+            DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
             Object nodeInfo = childNode.getUserObject();
             if (nodeInfo instanceof TestError) {

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -21 +21 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
@@ -68 +69 @@
      * that refer to one of the primitives in the filter.
      */
-    private transient Set<OsmPrimitive> filter = null;
+    private transient Set<? extends OsmPrimitive> filter = null;
 
     /** a counter to check if tree has been rebuild */
@@ -345 +346 @@
      * @return the list of primitives used for filtering
      */
-    public Set<OsmPrimitive> getFilter() {
+    public Set<? extends OsmPrimitive> getFilter() {
         return filter;
     }
@@ -353 +354 @@
      * @param filter the list of primitives used for filtering
      */
-    public void setFilter(Set<OsmPrimitive> filter) {
+    public void setFilter(Set<? extends OsmPrimitive> filter) {
         if (filter != null && filter.isEmpty()) {
             this.filter = null;
@@ -380 +381 @@
 
         int row = 0;
-        Enumeration<DefaultMutableTreeNode> children = root.breadthFirstEnumeration();
+        Enumeration<TreeNode> children = root.breadthFirstEnumeration();
         while (children.hasMoreElements()) {
             children.nextElement();

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -181 +181 @@
         }
 
-        Collection<PrimitiveId> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
+        Collection<? extends PrimitiveId> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
         if (!toLoad.isEmpty()) {
             HistoryLoadTask task = new HistoryLoadTask();

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -11 +11 @@
 import javax.swing.Icon;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 import org.openstreetmap.josm.Main;
@@ -69 +70 @@
         DefaultMutableTreeNode severity = (DefaultMutableTreeNode) root.getLastChild();
         while (severity != null) {
-            Enumeration<DefaultMutableTreeNode> errorMessages = severity.breadthFirstEnumeration();
+            Enumeration<TreeNode> errorMessages = severity.breadthFirstEnumeration();
             while (errorMessages.hasMoreElements()) {
-                Object tn = errorMessages.nextElement().getUserObject();
+                Object tn = ((DefaultMutableTreeNode) errorMessages.nextElement()).getUserObject();
                 if (tn instanceof TestError) {
                     paintVisitor.visit((TestError) tn);