diff --git a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/ConfigurationFilesNodeFactory.java b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/ConfigurationFilesNodeFactory.java
--- a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/ConfigurationFilesNodeFactory.java
+++ b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/ConfigurationFilesNodeFactory.java
@@ -28,6 +28,7 @@
 import org.openide.filesystems.FileStateInvalidException;
 import org.openide.filesystems.FileSystem;
 import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.StatusDecorator;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.AbstractNode;
@@ -359,16 +360,11 @@
         if (files != null && files.iterator().hasNext()) {
             try {
                 FileObject fo = (FileObject) files.iterator().next();
-                FileSystem.Status stat = fo.getFileSystem().getStatus();
-                if (stat instanceof FileSystem.HtmlStatus) {
-                    FileSystem.HtmlStatus hstat = (FileSystem.HtmlStatus) stat;
-
-                    String annotated = hstat.annotateNameHtml(htmlDisplayName, files);
-
-                    // Make sure the super string was really modified (XXX why?)
-                    if (!htmlDisplayName.equals(annotated)) {
-                        result = annotated;
-                    }
+                StatusDecorator stat = fo.getFileSystem().getDecorator();
+                String annotated = stat.annotateNameHtml(htmlDisplayName, files);
+                // Make sure the super string was really modified (XXX why?)
+                if (!htmlDisplayName.equals(annotated)) {
+                    result = annotated;
                 }
             } catch (FileStateInvalidException e) {
                 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
diff --git a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/DataFilesNodeFactory.java b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/DataFilesNodeFactory.java
--- a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/DataFilesNodeFactory.java
+++ b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/DataFilesNodeFactory.java
@@ -26,6 +26,7 @@
 import org.openide.filesystems.FileStateInvalidException;
 import org.openide.filesystems.FileSystem;
 import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.StatusDecorator;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.AbstractNode;
@@ -357,16 +358,11 @@
         if (files != null && files.iterator().hasNext()) {
             try {
                 FileObject fo = (FileObject) files.iterator().next();
-                FileSystem.Status stat = fo.getFileSystem().getStatus();
-                if (stat instanceof FileSystem.HtmlStatus) {
-                    FileSystem.HtmlStatus hstat = (FileSystem.HtmlStatus) stat;
-
-                    String annotated = hstat.annotateNameHtml(htmlDisplayName, files);
-
-                    // Make sure the super string was really modified (XXX why?)
-                    if (!htmlDisplayName.equals(annotated)) {
-                        result = annotated;
-                    }
+                StatusDecorator stat = fo.getFileSystem().getDecorator();
+                String annotated = stat.annotateNameHtml(htmlDisplayName, files);
+                // Make sure the super string was really modified (XXX why?)
+                if (!htmlDisplayName.equals(annotated)) {
+                    result = annotated;
                 }
             } catch (FileStateInvalidException e) {
                 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
diff --git a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/MetadataInputFilesNodeFactory.java b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/MetadataInputFilesNodeFactory.java
--- a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/MetadataInputFilesNodeFactory.java
+++ b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/MetadataInputFilesNodeFactory.java
@@ -29,6 +29,7 @@
 import org.openide.filesystems.FileStateInvalidException;
 import org.openide.filesystems.FileSystem;
 import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.StatusDecorator;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.AbstractNode;
@@ -362,16 +363,11 @@
         if (files != null && files.iterator().hasNext()) {
             try {
                 FileObject fo = (FileObject) files.iterator().next();
-                FileSystem.Status stat = fo.getFileSystem().getStatus();
-                if (stat instanceof FileSystem.HtmlStatus) {
-                    FileSystem.HtmlStatus hstat = (FileSystem.HtmlStatus) stat;
-
-                    String annotated = hstat.annotateNameHtml(htmlDisplayName, files);
-
-                    // Make sure the super string was really modified (XXX why?)
-                    if (!htmlDisplayName.equals(annotated)) {
-                        result = annotated;
-                    }
+                StatusDecorator stat = fo.getFileSystem().getDecorator();
+                String annotated = stat.annotateNameHtml(htmlDisplayName, files);
+                // Make sure the super string was really modified (XXX why?)
+                if (!htmlDisplayName.equals(annotated)) {
+                    result = annotated;
                 }
             } catch (FileStateInvalidException e) {
                 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
diff --git a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/server/TestsNodeFactory.java b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/server/TestsNodeFactory.java
--- a/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/server/TestsNodeFactory.java
+++ b/modules/tuxedo.project/src/com/sun/tools/tuxedo/project/server/TestsNodeFactory.java
@@ -43,6 +43,7 @@
 import org.openide.filesystems.FileStateInvalidException;
 import org.openide.filesystems.FileSystem;
 import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.StatusDecorator;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.AbstractNode;
@@ -526,16 +527,12 @@
         if (files != null && files.iterator().hasNext()) {
             try {
                 FileObject fo = (FileObject) files.iterator().next();
-                FileSystem.Status stat = fo.getFileSystem().getStatus();
-                if (stat instanceof FileSystem.HtmlStatus) {
-                    FileSystem.HtmlStatus hstat = (FileSystem.HtmlStatus) stat;
+                StatusDecorator stat = fo.getFileSystem().getDecorator();
+                String annotated = stat.annotateNameHtml(htmlDisplayName, files);
 
-                    String annotated = hstat.annotateNameHtml(htmlDisplayName, files);
-
-                    // Make sure the super string was really modified (XXX why?)
-                    if (!htmlDisplayName.equals(annotated)) {
-                        result = annotated;
-                    }
+                // Make sure the super string was really modified (XXX why?)
+                if (!htmlDisplayName.equals(annotated)) {
+                    result = annotated;
                 }
             } catch (FileStateInvalidException e) {
                 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);