diff -uprN core-main_work2.6fec3ee8ecd0/ant.freeform/nbproject/project.xml core-main_work2/ant.freeform/nbproject/project.xml
--- core-main_work2.6fec3ee8ecd0/ant.freeform/nbproject/project.xml	2008-10-30 14:45:43.000000000 +0100
+++ core-main_work2/ant.freeform/nbproject/project.xml	2008-10-30 14:45:43.000000000 +0100
@@ -134,7 +134,9 @@ made subject to such option by the copyr
                     <code-name-base>org.openide.loaders</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
-                    <run-dependency/>
+                    <run-dependency>
+                        <specification-version>7.4</specification-version>
+                    </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.nodes</code-name-base>
diff -uprN core-main_work2.6fec3ee8ecd0/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java core-main_work2/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java
--- core-main_work2.6fec3ee8ecd0/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java	2008-10-30 14:45:43.000000000 +0100
+++ core-main_work2/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java	2008-10-30 14:45:43.000000000 +0100
@@ -75,6 +75,7 @@ import org.openide.actions.OpenAction;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.ChangeableDataFilter;
+import org.openide.loaders.DataFilter;
 import org.openide.loaders.DataFolder;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
@@ -260,7 +261,7 @@ public class FolderNodeFactory implement
     }
     
     
-    static final class VisibilityQueryDataFilter implements ChangeListener, ChangeableDataFilter {
+    static final class VisibilityQueryDataFilter implements ChangeListener, ChangeableDataFilter, DataFilter.FileBased {
         
         private final ChangeSupport cs = new ChangeSupport(this);
         private final FileObject root;
@@ -296,6 +297,10 @@ public class FolderNodeFactory implement
         public void removeChangeListener( ChangeListener listener ) {
             cs.removeChangeListener(listener);
         }
+
+        public boolean acceptFileObject(FileObject fo) {
+            return VisibilityQuery.getDefault().isVisible(fo);
+        }
         
     }
     
diff -uprN core-main_work2.6fec3ee8ecd0/java.project/src/org/netbeans/spi/java/project/support/ui/TreeRootNode.java core-main_work2/java.project/src/org/netbeans/spi/java/project/support/ui/TreeRootNode.java
--- core-main_work2.6fec3ee8ecd0/java.project/src/org/netbeans/spi/java/project/support/ui/TreeRootNode.java	2008-10-30 14:45:43.000000000 +0100
+++ core-main_work2/java.project/src/org/netbeans/spi/java/project/support/ui/TreeRootNode.java	2008-10-30 14:45:43.000000000 +0100
@@ -60,6 +60,7 @@ import org.openide.NotifyDescriptor;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.ChangeableDataFilter;
+import org.openide.loaders.DataFilter;
 import org.openide.loaders.DataFolder;
 import org.openide.loaders.DataObject;
 import org.openide.nodes.FilterNode;
@@ -204,7 +205,8 @@ final class TreeRootNode extends FilterN
         }
     }
     
-    private static final class VisibilityQueryDataFilter implements ChangeListener, PropertyChangeListener, ChangeableDataFilter {
+    private static final class VisibilityQueryDataFilter implements ChangeListener, PropertyChangeListener, 
+            ChangeableDataFilter, DataFilter.FileBased {
         
         private static final long serialVersionUID = 1L; // in case a DataFolder.ClonedFilterHandle saves me
         
@@ -252,6 +254,10 @@ final class TreeRootNode extends FilterN
         public void removeChangeListener(ChangeListener listener) {
             ell.remove(ChangeListener.class, listener);
         }
+
+        public boolean acceptFileObject(FileObject fo) {
+            return VisibilityQuery.getDefault().isVisible(fo);
+        }
         
     }
     
diff -uprN core-main_work2.6fec3ee8ecd0/projectui/nbproject/project.xml core-main_work2/projectui/nbproject/project.xml
--- core-main_work2.6fec3ee8ecd0/projectui/nbproject/project.xml	2008-10-30 14:45:43.000000000 +0100
+++ core-main_work2/projectui/nbproject/project.xml	2008-10-30 14:45:43.000000000 +0100
@@ -162,7 +162,7 @@ made subject to such option by the copyr
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>5.1</specification-version>
+                        <specification-version>7.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -uprN core-main_work2.6fec3ee8ecd0/projectui/src/org/netbeans/modules/project/ui/PhysicalView.java core-main_work2/projectui/src/org/netbeans/modules/project/ui/PhysicalView.java
--- core-main_work2.6fec3ee8ecd0/projectui/src/org/netbeans/modules/project/ui/PhysicalView.java	2008-10-30 14:45:43.000000000 +0100
+++ core-main_work2/projectui/src/org/netbeans/modules/project/ui/PhysicalView.java	2008-10-30 14:45:43.000000000 +0100
@@ -142,7 +142,7 @@ public class PhysicalView {
         return nodes;
     }
    
-    static final class VisibilityQueryDataFilter implements ChangeListener, ChangeableDataFilter {
+    static final class VisibilityQueryDataFilter implements ChangeListener, ChangeableDataFilter, DataFilter.FileBased {
         
         private final ChangeSupport changeSupport = new ChangeSupport( this );
         
@@ -150,9 +150,8 @@ public class PhysicalView {
             VisibilityQuery.getDefault().addChangeListener( this );
         }
                 
-        public boolean acceptDataObject(DataObject obj) {                
-            FileObject fo = obj.getPrimaryFile();                
-            return VisibilityQuery.getDefault().isVisible( fo );
+        public boolean acceptDataObject(DataObject obj) {
+            return VisibilityQuery.getDefault().isVisible(obj.getPrimaryFile());
         }
         
         public void stateChanged( ChangeEvent e) {            
@@ -171,6 +170,10 @@ public class PhysicalView {
         public void removeChangeListener( ChangeListener listener ) {
             changeSupport.removeChangeListener( listener );
         }
+
+        public boolean acceptFileObject(FileObject fo) {
+            return VisibilityQuery.getDefault().isVisible(fo);
+        }
         
     }