Changeset 8633 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (modified) (7 diffs)

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) {