Changeset 8633 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.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/validator/ValidatorTreePanel.java (modified) (5 diffs)

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();