This is an automated email from the ASF dual-hosted git repository.

bwalker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new b53effe  Remove old & deprecated openide.util.enumerations module 
(#3679)
b53effe is described below

commit b53effe3681904de30ce079b79fc556c7160e345
Author: Brad Walker <bwal...@musings.com>
AuthorDate: Sat Mar 12 15:27:04 2022 -0700

    Remove old & deprecated openide.util.enumerations module (#3679)
    
    The Enumerations module is really old, no longer used as it was replaced by 
an Enum keyword in JDK 1.5, and is not
    used anywhere in the code.
    
    Time to clean up the code base by removing this old module. That's what 
this code change does.
---
 .travis.yml                                        |    1 -
 .../project/jnlp/GenerateJNLPApplicationTest.java  |    3 -
 .../project/suite/BuildZipDistributionTest.java    |    1 -
 .../project/universe/ModuleListTest.java           |    4 -
 .../src/generators/NetBeansPlatform.groovy         |    3 +-
 .../netbeans/junit/NbModuleSuiteHideExtraTest.java |    1 -
 .../src/org/netbeans/junit/NbModuleSuiteTest.java  |   64 --
 .../testjunit/AskForOrgOpenideUtilEnumClass.java   |   50 -
 .../xsl/grammar/XSLGrammarQueryProvider.java       |    7 +-
 .../nbcode/nbproject/platform.properties           |    1 -
 nbbuild/build.properties                           |    3 +-
 nbbuild/cluster.properties                         |    1 -
 nbbuild/hudson/core-main                           |    1 -
 nbbuild/javadoctools/links.xml                     |    1 -
 nbbuild/javadoctools/properties.xml                |    1 -
 nbbuild/javadoctools/replaces.xml                  |    1 -
 nbbuild/templates/common.xml                       |    1 -
 .../org/netbeans/nbbuild/FixDependenciesTest.java  |    1 -
 .../src/org/openide/util/enum/ArrayEnumTest.java   |    4 -
 .../org/openide/util/enum/Sequence2EnumTest.java   |   50 -
 .../org/openide/util/enum/SequenceEnumTest.java    |   44 -
 platform/openide.modules/module-auto-deps.xml      |    1 -
 platform/openide.util.enumerations/apichanges.xml  |   90 --
 platform/openide.util.enumerations/arch.xml        | 1062 --------------------
 platform/openide.util.enumerations/build.xml       |   44 -
 platform/openide.util.enumerations/manifest.mf     |    7 -
 .../nbproject/org-openide-util-enumerations.sig    |   90 --
 .../nbproject/project.properties                   |   26 -
 .../nbproject/project.xml                          |   62 --
 .../org/openide/util/enum/AlterEnumeration.java    |   64 --
 .../org/openide/util/enum/ArrayEnumeration.java    |   63 --
 .../src/org/openide/util/enum/Bundle.properties    |   25 -
 .../org/openide/util/enum/EmptyEnumeration.java    |   42 -
 .../org/openide/util/enum/FilterEnumeration.java   |  102 --
 .../org/openide/util/enum/QueueEnumeration.java    |  110 --
 .../util/enum/RemoveDuplicatesEnumeration.java     |   51 -
 .../org/openide/util/enum/SequenceEnumeration.java |  105 --
 .../openide/util/enum/SingletonEnumeration.java    |   63 --
 .../src/org/openide/util/enum/package.html         |   31 -
 .../org/openide/util/enum/OldEnumerationsTest.java |  180 ----
 40 files changed, 3 insertions(+), 2458 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f529bd9..1e53249 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -181,7 +181,6 @@ matrix:
             - hide-logs.sh ant $OPTS -f platform/openide.options test
             - travis_retry hide-logs.sh ant $OPTS -f platform/openide.text test
             - hide-logs.sh ant $OPTS -f platform/openide.util test
-            - hide-logs.sh ant $OPTS -f platform/openide.util.enumerations test
             - hide-logs.sh ant $OPTS -f platform/openide.util.lookup test
             - hide-logs.sh ant $OPTS -f platform/openide.util.ui test
             - hide-logs.sh ant $OPTS -f platform/openide.windows test
diff --git 
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
 
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
index f5b4384..27bb66d 100644
--- 
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
+++ 
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/jnlp/GenerateJNLPApplicationTest.java
@@ -129,7 +129,6 @@ public class GenerateJNLPApplicationTest extends TestBase {
 //            "org.openide.options," +
 //            "org.openide.text," +
 //            "org.openide.windows," +
-//            "org.openide.util.enumerations" +
 //            "");
 //        ep.setProperty("jnlp.servlet.jar", someJar.toString());
 //        
suite.getHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);
@@ -246,7 +245,6 @@ public class GenerateJNLPApplicationTest extends TestBase {
 //            "org.openide.options," +
 //            "org.openide.text," +
 //            "org.openide.windows," +
-//            "org.openide.util.enumerations" +
 //            "");
 //        
suite.getHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);
 //        ProjectManager.getDefault().saveProject(suite);
@@ -447,7 +445,6 @@ public class GenerateJNLPApplicationTest extends TestBase {
 //            "org.openide.options," +
 //            "org.openide.text," +
 //            "org.openide.windows," +
-//            "org.openide.util.enumerations" +
 //            "");
 //        ep.setProperty("jnlp.servlet.jar", someJar.toString());
 //        
suite.getHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);
diff --git 
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
 
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
index db0309f..73eba80 100644
--- 
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
+++ 
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
@@ -114,7 +114,6 @@ public class BuildZipDistributionTest extends TestBase {
             "org.openide.compat," +
             "org.netbeans.api.progress," +
             "org.netbeans.core.multiview," +
-            "org.openide.util.enumerations" +
             "");
         
suite.getHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);
         ProjectManager.getDefault().saveProject(suite);
diff --git 
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
 
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
index 35d2120..f39facd 100644
--- 
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
+++ 
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
@@ -281,7 +281,6 @@ public class ModuleListTest extends TestBase {
 //        assertEquals("correct CP extensions (using runtime-relative-path)",
 //            ":" + file("nbbuild/netbeans/" + TestBase.CLUSTER_IDE + 
"/modules/ext/org-netbeans-tax.jar"),
 //            e.getClassPathExtensions());
-//        e = ml.getEntry("org.openide.util.enumerations");
 //        assertNotNull(e);
 //        assertTrue("this one is deprecated", e.isDeprecated());
 //        e = ml.getEntry("org.netbeans.modules.projectui");
@@ -354,9 +353,6 @@ public class ModuleListTest extends TestBase {
         e = ml.getEntry("org.openide.util");
         assertNotNull(e);
         assertFalse("binary API not deprecated", e.isDeprecated());
-        e = ml.getEntry("org.openide.util.enumerations");
-        assertNotNull(e);
-        assertTrue("this one is deprecated", e.isDeprecated());
         // From suite3, can find itself and netbeans.org modules in binary 
form.
         ml = ModuleList.getModuleList(file(standaloneSuite3, "dummy-project"));
         e = ml.getEntry("org.netbeans.examples.modules.dummy");
diff --git 
a/groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
 
b/groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
index 8925876..06289be 100644
--- 
a/groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
+++ 
b/groovy/groovy.samples/sample_src/NBProjectGenerators/src/generators/NetBeansPlatform.groovy
@@ -100,8 +100,7 @@ disabled.modules=\
     org.netbeans.upgrader,\
     org.openide.compat,\
     org.openide.execution,\
-    org.openide.options,\
-    org.openide.util.enumerations
+    org.openide.options
 enabled.clusters=\
     nb,\
     platform
diff --git 
a/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteHideExtraTest.java
 
b/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteHideExtraTest.java
index 4eb2c89..28da028 100644
--- 
a/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteHideExtraTest.java
+++ 
b/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteHideExtraTest.java
@@ -25,7 +25,6 @@ import test.pkg.not.in.junit.NbModuleSuiteIns;
 import test.pkg.not.in.junit.NbModuleSuiteT;
 import test.pkg.not.in.junit.NbModuleSuiteS;
 import java.io.File;
-import org.netbeans.testjunit.AskForOrgOpenideUtilEnumClass;
 import java.util.Properties;
 import java.util.Set;
 import junit.framework.Test;
diff --git 
a/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteTest.java 
b/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteTest.java
index 139b96f..1e106e2 100644
--- a/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteTest.java
+++ b/harness/nbjunit/test/unit/src/org/netbeans/junit/NbModuleSuiteTest.java
@@ -26,7 +26,6 @@ import test.pkg.not.in.junit.NbModuleSuiteT;
 import test.pkg.not.in.junit.NbModuleSuiteS;
 import java.io.File;
 import java.net.URL;
-import org.netbeans.testjunit.AskForOrgOpenideUtilEnumClass;
 import java.util.Properties;
 import java.util.Set;
 import junit.framework.Test;
@@ -173,69 +172,6 @@ public class NbModuleSuiteTest extends NbTestCase {
         assertEquals("Property " + name, value, v);
     }
 
-    public void testTwoClassesAtOnce() throws Exception {
-        System.setProperty("ins.one", "No");
-        System.setProperty("ins.two", "No");
-        System.setProperty("ins.three", "No");
-        System.setProperty("en.one", "No");
-
-        NbModuleSuite.Configuration config = 
NbModuleSuite.Configuration.create(
-            AskForOrgOpenideUtilEnumClass.class
-        ).enableModules("org.openide.util.enumerations").gui(false)
-        .addTest(NbModuleSuiteIns.class, "testSecond");
-        Test instance = config.suite();
-        junit.textui.TestRunner.run(instance);
-
-        assertProperty("en.one", "OK");
-        assertProperty("ins.one", "No");
-        assertProperty("ins.two", "OK");
-        assertProperty("ins.three", "No");
-    }
-    public void testCumulativeUseOfModules() throws Exception {
-        System.setProperty("ins.one", "No");
-        System.setProperty("ins.two", "No");
-        System.setProperty("ins.three", "No");
-        System.setProperty("ins.java", "No");
-        System.setProperty("en.one", "No");
-
-        NbModuleSuite.Configuration config = 
NbModuleSuite.Configuration.create(
-            AskForOrgOpenideUtilEnumClass.class
-        )
-        .enableModules("ide", "org.netbeans.modules.java.platform.*")
-        .enableModules("platform", "org.openide.util.enumerations")
-        .enableModules("ide", "org.openide.loaders.*")
-        .gui(false)
-        .addTest(NbModuleSuiteIns.class);
-        Test instance = config.suite();
-        junit.textui.TestRunner.run(instance);
-
-        assertProperty("en.one", "OK");
-        assertProperty("ins.java", "No"); // no Windows as it is not in ide 
cluster
-        assertProperty("ins.two", "OK");
-    }
-
-    public void testAccessExtraDefinedAutoload() {
-        System.setProperty("en.one", "No");
-
-        NbModuleSuite.Configuration config = 
NbModuleSuite.Configuration.create(AskForOrgOpenideUtilEnumClass.class);
-        NbModuleSuite.Configuration addEnum = 
config.enableModules("org.openide.util.enumerations");
-        Test instance = addEnum.gui(false).suite();
-        junit.textui.TestRunner.run(instance);
-
-        assertEquals("OK", System.getProperty("en.one"));
-    }
-
-    public void testAutoloadNotUsedIfAutoloadsAreSupposedToBeIgnored() {
-        System.setProperty("en.one", "No");
-
-        NbModuleSuite.Configuration config = 
NbModuleSuite.Configuration.create(AskForOrgOpenideUtilEnumClass.class);
-        NbModuleSuite.Configuration addEnum = 
config.enableModules("org.openide.util.enumerations");
-        Test instance = addEnum.gui(false).honorAutoloadEager(true).suite();
-        junit.textui.TestRunner.run(instance);
-
-        assertEquals("No", System.getProperty("en.one"));
-    }
-
     public void testClustersCanBeCumulated() throws Exception {
         if (!isExtIDE()) {
             // skip
diff --git 
a/harness/nbjunit/test/unit/src/org/netbeans/testjunit/AskForOrgOpenideUtilEnumClass.java
 
b/harness/nbjunit/test/unit/src/org/netbeans/testjunit/AskForOrgOpenideUtilEnumClass.java
deleted file mode 100644
index 5d36381..0000000
--- 
a/harness/nbjunit/test/unit/src/org/netbeans/testjunit/AskForOrgOpenideUtilEnumClass.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.netbeans.testjunit;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.netbeans.junit.*;
-import junit.framework.TestCase;
-
-/** This class needs to be in other package than
- * org.netbeans.junit in order to not be loaded by the application
- * classloader but by the started NetBeans IDE
- * 
- * @author Jaroslav Tulach
- */
-public class AskForOrgOpenideUtilEnumClass extends TestCase {
-
-    public AskForOrgOpenideUtilEnumClass(String t) {
-        super(t);
-    }
-
-    public void testOne() {
-        try {
-            ClassLoader l = 
AskForOrgOpenideUtilEnumClass.class.getClassLoader();
-            if (l == NbTestCase.class.getClassLoader()) {
-                fail("This test shall not be loaded by the same classloader!");
-            }
-            Class<?> access = 
Class.forName("org.openide.util.enum.ArrayEnumeration");
-            System.setProperty("en.one", "OK");
-        } catch (Exception ex) {
-            Logger.getLogger("testOne").log(Level.INFO, ex.getMessage(), ex);
-        }
-    }
-}
diff --git 
a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQueryProvider.java 
b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQueryProvider.java
index 9a065fc..7adf66f 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQueryProvider.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQueryProvider.java
@@ -53,12 +53,7 @@ public class XSLGrammarQueryProvider extends 
GrammarQueryManager {
         Enumeration en = ctx.getDocumentChildren();
         while (en.hasMoreElements()) {
             Node next = (Node) en.nextElement();
-            if (next.getNodeType() == next.DOCUMENT_TYPE_NODE) {
-//                DocumentType doctype = (DocumentType) next;
-//                if (PUBLIC.equals(doctype.getPublicId()) || 
SYSTEM.equals(doctype.getSystemId())) {
-//                    return new SingletonEnumeration(next);
-//                }
-            } else if (next.getNodeType() == next.ELEMENT_NODE) {
+            if (next.getNodeType() == next.ELEMENT_NODE) {
                 Element element = (Element) next;
                 String tag = element.getTagName();
                 if (tag.indexOf(":") == -1) {  // NOI18N
diff --git a/java/java.lsp.server/nbcode/nbproject/platform.properties 
b/java/java.lsp.server/nbcode/nbproject/platform.properties
index 15e5470..0737f11 100644
--- a/java/java.lsp.server/nbcode/nbproject/platform.properties
+++ b/java/java.lsp.server/nbcode/nbproject/platform.properties
@@ -322,7 +322,6 @@ disabled.modules=\
     org.openide.compat,\
     org.openide.execution.compat8,\
     org.openide.options,\
-    org.openide.util.enumerations,\
     org.openidex.util,\
     org.netbeans.api.web.webmodule,\
     org.netbeans.libs.amazon,\
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 96d1582..08dab86 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -223,8 +223,7 @@ config.javadoc.friend=\
 config.javadoc.deprecated=\
     openide.compat,\
     openide.options,\
-    o.openidex.util,\
-    openide.util.enumerations
+    o.openidex.util
 
 # List of all javadocs for development version
 # is composed from the javadocs split by stability
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 307c9df..8bb3903 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -286,7 +286,6 @@ nb.cluster.platform=\
         openide.nodes,\
         openide.options,\
         openide.text,\
-        openide.util.enumerations,\
         openide.util.ui.svg,\
         openide.windows,\
         options.api,\
diff --git a/nbbuild/hudson/core-main b/nbbuild/hudson/core-main
index 4175c77..eac1ca5 100644
--- a/nbbuild/hudson/core-main
+++ b/nbbuild/hudson/core-main
@@ -109,7 +109,6 @@ openide.nodes,\
 openide.options,\
 openide.text,\
 openide.util,\
-openide.util.enumerations,\
 openide.util.lookup,\
 openide.util.ui,\
 openide.windows,\
diff --git a/nbbuild/javadoctools/links.xml b/nbbuild/javadoctools/links.xml
index d163be9..96e4fe0 100644
--- a/nbbuild/javadoctools/links.xml
+++ b/nbbuild/javadoctools/links.xml
@@ -91,7 +91,6 @@
 <link href="${javadoc.docs.org-netbeans-api-mdr}" offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-mdr"/>
 <link href="${javadoc.docs.org-netbeans-api-progress}" offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-progress"/>
 <link href="${javadoc.docs.org-openide-filesystems}" offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-openide-filesystems"/>
-<link href="${javadoc.docs.org-openide-util-enumerations}" offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-openide-util-enumerations"/>
 <link href="${javadoc.docs.org-netbeans-modules-editor-completion}" 
offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-editor-completion"/>
 <link href="${javadoc.docs.org-netbeans-modules-adaptable}" offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-adaptable"/>
 <link href="${javadoc.docs.org-netbeans-spi-navigator}" offline="true" 
packagelistloc="${netbeans.javadoc.dir}/org-netbeans-spi-navigator"/>
diff --git a/nbbuild/javadoctools/properties.xml 
b/nbbuild/javadoctools/properties.xml
index f85ccc1..65a0f95 100644
--- a/nbbuild/javadoctools/properties.xml
+++ b/nbbuild/javadoctools/properties.xml
@@ -91,7 +91,6 @@
 <property name="javadoc.docs.org-netbeans-api-mdr" 
value="${javadoc.web.root}/org-netbeans-api-mdr"/>
 <property name="javadoc.docs.org-netbeans-api-progress" 
value="${javadoc.web.root}/org-netbeans-api-progress"/>
 <property name="javadoc.docs.org-openide-filesystems" 
value="${javadoc.web.root}/org-openide-filesystems"/>
-<property name="javadoc.docs.org-openide-util-enumerations" 
value="${javadoc.web.root}/org-openide-util-enumerations"/>
 <property name="javadoc.docs.org-netbeans-modules-editor-completion" 
value="${javadoc.web.root}/org-netbeans-modules-editor-completion"/>
 <property name="javadoc.docs.org-netbeans-modules-adaptable" 
value="${javadoc.web.root}/org-netbeans-modules-adaptable"/>
 <property name="javadoc.docs.org-netbeans-spi-navigator" 
value="${javadoc.web.root}/org-netbeans-spi-navigator"/>
diff --git a/nbbuild/javadoctools/replaces.xml 
b/nbbuild/javadoctools/replaces.xml
index d0ec100..e911454 100644
--- a/nbbuild/javadoctools/replaces.xml
+++ b/nbbuild/javadoctools/replaces.xml
@@ -91,7 +91,6 @@
 <replacefilter token="@org-netbeans-api-mdr@" 
value="${javadoc.docs.org-netbeans-api-mdr}"/>
 <replacefilter token="@org-netbeans-api-progress@" 
value="${javadoc.docs.org-netbeans-api-progress}"/>
 <replacefilter token="@org-openide-filesystems@" 
value="${javadoc.docs.org-openide-filesystems}"/>
-<replacefilter token="@org-openide-util-enumerations@" 
value="${javadoc.docs.org-openide-util-enumerations}"/>
 <replacefilter token="@org-netbeans-modules-editor-completion@" 
value="${javadoc.docs.org-netbeans-modules-editor-completion}"/>
 <replacefilter token="@org-netbeans-modules-adaptable@" 
value="${javadoc.docs.org-netbeans-modules-adaptable}"/>
 <replacefilter token="@org-netbeans-spi-navigator@" 
value="${javadoc.docs.org-netbeans-spi-navigator}"/>
diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
index 377b6db..1671f08 100644
--- a/nbbuild/templates/common.xml
+++ b/nbbuild/templates/common.xml
@@ -1361,7 +1361,6 @@
             <replace codenamebase="org.openide" addcompiletime="true" >
                 <module codenamebase="org.openide.filesystems" spec="6.2"/>
                 <module codenamebase="org.openide.util" spec="6.2"/>
-                <module codenamebase="org.openide.util.enumerations" 
spec="6.2"/>
                 <module codenamebase="org.openide.modules" spec="6.2"/>
                 <module codenamebase="org.openide.nodes" spec="6.2"/>
                 <module codenamebase="org.openide.explorer" spec="6.2"/>
diff --git 
a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java 
b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java
index 1886e27..7c6dfbd 100644
--- a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java
+++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java
@@ -537,7 +537,6 @@ public class FixDependenciesTest extends TestBase {
             "  <replace codenamebase='org.openide'>\n" +  
             "   <module codenamebase='org.openide.filesystems' spec='6.2'/>\n" 
+
             "   <module codenamebase='org.openide.util' spec='6.2'/>\n" +
-            "   <module codenamebase='org.openide.util.enumerations' 
spec='6.2'/>\n" +
             "   <module codenamebase='org.openide.modules' spec='6.2'/>\n" +
             "   <module codenamebase='org.openide.nodes' spec='6.2'/>\n" +
             "   <module codenamebase='org.openide.explorer' spec='6.2'/>\n" +
diff --git 
a/platform/core.kit/test/perf/src/org/openide/util/enum/ArrayEnumTest.java 
b/platform/core.kit/test/perf/src/org/openide/util/enum/ArrayEnumTest.java
index 45cd4ce..4a796e4 100644
--- a/platform/core.kit/test/perf/src/org/openide/util/enum/ArrayEnumTest.java
+++ b/platform/core.kit/test/perf/src/org/openide/util/enum/ArrayEnumTest.java
@@ -31,10 +31,6 @@ public class ArrayEnumTest extends EnumBenchmark {
        array = new Object[arg];
     }
 
-    protected Object createInstance() {
-       return new ArrayEnumeration( array );
-    }
-
     public static void main( String[] args ) {
        junit.textui.TestRunner.run( new junit.framework.TestSuite( 
ArrayEnumTest.class ) );
     }
diff --git 
a/platform/core.kit/test/perf/src/org/openide/util/enum/Sequence2EnumTest.java 
b/platform/core.kit/test/perf/src/org/openide/util/enum/Sequence2EnumTest.java
deleted file mode 100644
index 72c9ec7..0000000
--- 
a/platform/core.kit/test/perf/src/org/openide/util/enum/Sequence2EnumTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-public class Sequence2EnumTest extends EnumBenchmark {
-
-    public Sequence2EnumTest( String name ) {
-       super( name );
-    }
-
-    Object[] array;
-
-    protected void preSetUp() {
-       int arg = ((Integer)getArgument()).intValue();
-       array = new Object[arg/4];
-    }
-
-    protected Object createInstance() {
-       return new SequenceEnumeration(
-           new SequenceEnumeration(
-               new ArrayEnumeration( array ),
-               new ArrayEnumeration( array )
-           ),
-           new SequenceEnumeration(
-               new ArrayEnumeration( array ),
-               new ArrayEnumeration( array )
-           )
-       );
-    }
-
-    public static void main( String[] args ) {
-            junit.textui.TestRunner.run( new junit.framework.TestSuite( 
Sequence2EnumTest.class ) );
-    }
-}
diff --git 
a/platform/core.kit/test/perf/src/org/openide/util/enum/SequenceEnumTest.java 
b/platform/core.kit/test/perf/src/org/openide/util/enum/SequenceEnumTest.java
deleted file mode 100644
index 1ba4113..0000000
--- 
a/platform/core.kit/test/perf/src/org/openide/util/enum/SequenceEnumTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-public class SequenceEnumTest extends EnumBenchmark {
-
-    public SequenceEnumTest( String name ) {
-       super( name );
-    }
-
-    Object[] array;
-
-    protected void preSetUp() {
-       int arg = ((Integer)getArgument()).intValue();
-       array = new Object[arg/2];
-    }
-
-    protected Object createInstance() {
-       return new SequenceEnumeration(
-           new ArrayEnumeration( array ),
-           new ArrayEnumeration( array )
-       );
-    }
-
-    public static void main( String[] args ) {
-        junit.textui.TestRunner.run( new junit.framework.TestSuite( 
SequenceEnumTest.class ) );
-    }
-}
diff --git a/platform/openide.modules/module-auto-deps.xml 
b/platform/openide.modules/module-auto-deps.xml
index 624493d..ae2cd06 100644
--- a/platform/openide.modules/module-auto-deps.xml
+++ b/platform/openide.modules/module-auto-deps.xml
@@ -37,7 +37,6 @@
                 <result>
                     <module-dependency codenamebase="org.openide.filesystems" 
spec="6.0"/>
                     <module-dependency codenamebase="org.openide.util" 
spec="6.0"/>
-                    <module-dependency 
codenamebase="org.openide.util.enumerations" spec="6.0"/>
                     <module-dependency codenamebase="org.openide.modules" 
spec="6.0"/>
                     <module-dependency codenamebase="org.openide.nodes" 
spec="6.0"/>
                     <module-dependency codenamebase="org.openide.explorer" 
spec="6.0"/>
diff --git a/platform/openide.util.enumerations/apichanges.xml 
b/platform/openide.util.enumerations/apichanges.xml
deleted file mode 100644
index efb0ddd..0000000
--- a/platform/openide.util.enumerations/apichanges.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" 
"../../nbbuild/javadoctools/apichanges.dtd">
-
-<apichanges>
-<apidefs>
-    <apidef name="enum">Old Enumeration API</apidef>
-</apidefs>
-<changes>
-<change>
-     <api name="enum"/>
-     <summary>enum package deprecated and replaced by Enumerations factory 
class</summary>
-     <version major="4" minor="37"/>
-     <date day="7" month="6" year="2004"/>
-     <author login="jtulach"/>
-     <compatibility deprecation="yes" addition="yes" binary="compatible" 
source="compatible" semantic="compatible" deletion="no" modification="no"/>
-     <description>
-        enum is a keyword in JDK 1.5 and as such it should not be used. 
-        That is the reason why we had to deprecated our 
-        <code>org.openide.util.enum</code> package. We are providing 
-        replacements of the original classes in form of factory methods
-        <a 
href="@org-openide-util@/org/openide/util/Enumerations.html">org.openide.util.Enumerations</a>.
-     </description>
-     <package name="org.openide.util.enum" />
-     <issue number="41166"/>
-    </change>
-<change>
-      <api name="enum"/>
-      <summary>Default filter enumeration accepts any non-<code>null</code> 
value</summary>
-      <date day="19" month="10" year="2000"/>
-      <compatibility modification="yes" binary="compatible" 
source="compatible" semantic="compatible" deprecation="no" addition="no" 
deletion="no"/>
-      <description>
-        <code>FilterEnumeration</code> is no longer abstract. The default
-        implementation accepts all <code>non-null</code> values.
-      </description>
-      <class package="org.openide.util.enum" name="FilterEnumeration"/>
-    </change>
-</changes>
-<htmlcontents>
-<head>
-<title>Change History for the Old Enumeration API</title>
-<link rel="stylesheet" href="prose.css" type="text/css"/>
-</head>
-<body>
-<p class="overviewlink">
-<a href="overview-summary.html">Overview</a>
-</p>
-<h1>Introduction</h1>
-<h2>What do the Dates Mean?</h2>
-<p>The supplied dates indicate when the API change was made, on the CVS
-trunk. From this you can generally tell whether the change should be
-present in a given build or not; for trunk builds, simply whether it
-was made before or after the change; for builds on a stabilization
-branch, whether the branch was made before or after the given date. In
-some cases corresponding API changes have been made both in the trunk
-and in an in-progress stabilization branch, if they were needed for a
-bug fix; this ought to be marked in this list.</p>
-<ul>
-<li>The <code>release41</code> branch was made on Apr 03 '05 for use in the 
NetBeans 4.1 release.
-Specification versions: 6.0 begins after this point.</li>
-<li>The <code>release40</code> branch was made on Nov 01 '04 for use in the 
NetBeans 4.0 release.
-Specification versions: 5.0 begins after this point.</li>
-</ul>
-<hr/>
-<standard-changelists module-code-name="org.openide.util.enum"/>
-<hr/>
-<p>@FOOTER@</p>
-</body>
-</htmlcontents>
-</apichanges>
diff --git a/platform/openide.util.enumerations/arch.xml 
b/platform/openide.util.enumerations/arch.xml
deleted file mode 100644
index b7cb50a..0000000
--- a/platform/openide.util.enumerations/arch.xml
+++ /dev/null
@@ -1,1062 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" 
"../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM 
"../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
-]>
-
-<api-answers
-  question-version="1.28"
-  author="jtul...@netbeans.org"
->
-
-  &api-questions;
-
-
-<!--
-        <question id="arch-overall" when="init">
-            Describe the overall architecture. 
-            <hint>
-            What will be API for 
-            <a 
href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi";>
-                clients and what support API</a>? 
-            What parts will be pluggable?
-            How will plug-ins be registered? Please use <code>&lt;api 
type="export"/&gt;</code>
-            to describe your general APIs and specify their
-            <a 
href="http://openide.netbeans.org/tutorial/api-design.html#category-private";>
-            stability categories</a>.
-            If possible please provide simple diagrams.
-            </hint>
-        </question>
--->
- <answer id="arch-overall">
-  <p>
-  This module contains utility classes to work with, create, compose or filter 
enumerations.
-  However as these classes reside in <a 
href="@org-openide-util-enumerations@/org/openide/util/enum/package-summary.html">enum</a>
-  package, they cannot be referenced when using javac's <code>-source 
1.5</code>.
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="arch-quality" when="init">
-            How will the <a 
href="http://www.netbeans.org/community/guidelines/q-evangelism.html";>quality</a>
-            of your code be tested and 
-            how are future regressions going to be prevented?
-            <hint>
-            What kind of testing do
-            you want to use? How much functionality, in which areas,
-            should be covered by the tests? How you find out that your
-            project was successful?
-            </hint>
-        </question>
--->
- <answer id="arch-quality">
-  <p>
-  There are supposed to be no regressions, as nobody will touch this package
-  in future.
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="arch-time" when="init">
-            What are the time estimates of the work?
-            <hint>
-            Please express your estimates of how long the design, 
implementation,
-            stabilization are likely to last. How many people will be needed to
-            implement this and what is the expected milestone by which the 
work should be 
-            ready?
-            </hint>
-        </question>
--->
- <answer id="arch-time">
-  <p>
-  Mostly coded in 1997.
-  </p>
- </answer>
-
-
-
- <answer id="arch-usecases">
-  <p>
-  Most of the functionality is deprecated, so it is better to go
-  and use <a href="@org-openide-util@/org/openide/util/Enumerations.html">the 
-  replacement API</a> in <code>org-openide-util.jar</code>.
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="arch-what" when="init">
-            What is this project good for?
-            <hint>
-            Please provide here a few lines describing the project, 
-            what problem it should solve, provide links to documentation, 
-            specifications, etc.
-            </hint>
-        </question>
--->
- <answer id="arch-what">
-  <p>
-   <api name="OldEnumerationsAPI" group="java" category="deprecated" 
type="export">
-       is deprecated and replaced with the
-       <a href="@org-openide-util@/org/openide/util/Enumerations.html">
-       Enumerations</a> class.
-   </api>
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="arch-where" when="impl">
-            Where one can find sources for your module?
-            <hint>
-                Please provide link to the CVS web client at
-                http://www.netbeans.org/download/source_browse.html
-                or just use tag defaultanswer generate='here'
-            </hint>
-        </question>
--->
- <answer id="arch-where">
-  <defaultanswer generate='here' />
- </answer>
-
-
-
-<!--
-        <question id="compat-deprecation" when="init">
-            How the introduction of your project influences functionality
-            provided by previous version of the product?
-            <hint>
-            If you are planning to deprecate/remove/change any existing APIs,
-            list them here accompanied with the reason explaining why you
-            are doing so.
-            </hint>
-        </question>
--->
- <answer id="compat-deprecation">
-  <p>
-   XXX no answer for compat-deprecation
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="compat-i18n" when="impl">
-            Is your module correctly internationalized?
-            <hint>
-            Correct internationalization means that it obeys instructions 
-            at <a 
href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html";>
-            NetBeans I18N pages</a>.
-            </hint>
-        </question>
--->
- <answer id="compat-i18n">
-  <p>
-   XXX no answer for compat-i18n
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="compat-standards" when="init">
-            Does the module implement or define any standards? Is the 
-            implementation exact or does it deviate somehow?
-        </question>
--->
- <answer id="compat-standards">
-  <p>
-   XXX no answer for compat-standards
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="compat-version" when="impl">
-            Can your module coexist with earlier and future
-            versions of itself? Can you correctly read all old settings? Will 
future
-            versions be able to read your current settings? Can you read
-            or politely ignore settings stored by a future version?
-            
-            <hint>
-            Very helpful for reading settings is to store version number
-            there, so future versions can decide whether how to read/convert
-            the settings and older versions can ignore the new ones.
-            </hint>
-        </question>
--->
- <answer id="compat-version">
-  <p>
-   XXX no answer for compat-version
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="dep-jre" when="final">
-            Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
-            <hint>
-            It is expected that if your module runs on 1.x that it will run 
-            on 1.x+1 if no, state that please. Also describe here cases where
-            you run different code on different versions of JRE and why.
-            </hint>
-        </question>
--->
- <answer id="dep-jre">
-  <p>
-   XXX no answer for dep-jre
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="dep-jrejdk" when="final">
-            Do you require the JDK or is the JRE enough?
-        </question>
--->
- <answer id="dep-jrejdk">
-  <p>
-   XXX no answer for dep-jrejdk
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="dep-nb" when="init">
-            What other NetBeans projects and modules does this one depend on?
-            <hint>
-            Depending on other NetBeans projects influnces the ability of
-            users of your work to customize their own branded version of
-            NetBeans by enabling and disabling some modules. Too
-            much dependencies restrict this kind of customization. If that
-            is your case, then you may want to split your functionality into
-            pieces of autoload, eager and regular modules which can be
-            enabled independently. Usually the answer to this question
-            is generated from your <code>project.xml</code> file, but
-            if it is not guessed correctly, you can suppress it by
-            specifying &lt;defaultanswer generate="none"/&gt; and
-            write here your own. Please describe such projects as imported 
APIs using
-            the <code>&lt;api name="identification" type="import or export" 
category="stable" url="where is the description" /&gt;</code>.
-            By doing this information gets listed in the summary page of your
-            javadoc.
-            </hint>
-        </question>
--->
- <answer id="dep-nb">
-  <defaultanswer generate='here' />
- </answer>
-
-
-
-<!--
-        <question id="dep-non-nb" when="init">
-            What other projects outside NetBeans does this one depend on?
-            
-            <hint>
-            Depending on 3rd party libraries is always problematic,
-            especially if they are not open source, as that complicates
-            the licensing scheme of NetBeans. Please enumerate your
-            external dependencies here, so it is correctly understood since
-            the begining what are the legal implications of your project.
-            Also please note that
-            some non-NetBeans projects are packaged as NetBeans modules
-            (see <a href="http://libs.netbeans.org/";>libraries</a>) and
-            it is preferred to use this approach when more modules may
-            depend and share such third-party libraries.
-            </hint>
-        </question>
--->
- <answer id="dep-non-nb">
-  <p>
-   XXX no answer for dep-non-nb
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="dep-platform" when="init">
-            On which platforms does your module run? Does it run in the same
-            way on each?
-            <hint>
-            If you plan any dependency on OS or any usage of native code,
-            please describe why you are doing so and describe how you envision
-            to enforce the portability of your code.
-            Please note that there is a support for <a 
href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#how-os-specific";>OS
 conditionally
-            enabled modules</a> which together with autoload/eager modules
-            can allow you to enable to provide the best OS aware support
-            on certain OSes while providing compatibility bridge on the not
-            supported ones.
-            Also please list the supported
-            OSes/HW platforms and mentioned the lovest version of JDK required
-            for your project to run on. Also state whether JRE is enough or
-            you really need JDK.
-            </hint>
-        </question>
--->
- <answer id="dep-platform">
-  <p>
-   XXX no answer for dep-platform
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="deploy-dependencies" when="final">
-            What do other modules need to do to declare a dependency on this 
one,
-            in addition to or instead of the normal module dependency 
declaration
-            (e.g. tokens to require)?
-            <hint>
-                Provide a sample of the actual lines you would add to a module 
manifest
-                to declare a dependency, for example OpenIDE-Module-Requires: 
some.token.
-                If other modules should not depend on this module, or should 
just use a
-                simple regular module dependency, you can just answer 
"nothing". If you
-                intentionally expose a semistable API to clients using 
implementation
-                dependencies, you should mention that here (but there is no 
need to give
-                an example of usage).
-            </hint>
-        </question>
--->
- <answer id="deploy-dependencies">
-  <p>
-   Nothing.
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="deploy-jar" when="impl">
-            Do you deploy just module JAR file(s) or other files as well?
-            <hint>
-            Usually a module consist of one JAR file (perhaps with Class-Path
-            extensions) and also a configuration file that enables it. If you
-            have any other files, use
-            &lt;api group="java.io.File" name="yourname" type="export" 
category="friend"&gt;...&lt;/api&gt;
-            to define the location, name and stability of your files (of course
-            changing "yourname" and "friend" to suit your needs).
-            
-            If it uses more than one JAR, describe where they are located, how
-            they refer to each other. 
-            If it consist of module JAR(s) and other files, please describe
-            what is their purpose, why other files are necessary. Please 
-            make sure that installation/uninstallation leaves the system 
-            in state as it was before installation.
-            </hint>
-        </question>
--->
- <answer id="deploy-jar">
-  <p>
-   XXX no answer for deploy-jar
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="deploy-nbm" when="impl">
-            Can you deploy an NBM via the Update Center?
-            <hint>
-            If not why?
-            </hint>
-        </question>
--->
- <answer id="deploy-nbm">
-  <p>
-   XXX no answer for deploy-nbm
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="deploy-packages" when="init">
-            Are packages of your module made inaccessible by not declaring them
-            public?
-            
-            <hint>
-            By default NetBeans build harness treats all packages are private.
-            If you export some of them - either as public or friend packages,
-            you should have a reason. If the reason is described elsewhere
-            in this document, you can ignore this question.
-            </hint>
-        </question>
--->
- <answer id="deploy-packages">
-  <p>
-   XXX no answer for deploy-packages
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="deploy-shared" when="final">
-            Do you need to be installed in the shared location only, or in the 
user directory only,
-            or can your module be installed anywhere?
-            <hint>
-            Installation location shall not matter, if it does explain why.
-            Consider also whether <code>InstalledFileLocator</code> can help.
-            </hint>
-        </question>
--->
- <answer id="deploy-shared">
-  <p>
-   XXX no answer for deploy-shared
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-ant-tasks" when="impl">
-            Do you define or register any ant tasks that other can use?
-            
-            <hint>
-            If you provide an ant task that users can use, you need to be very
-            careful about its syntax and behaviour, as it most likely forms an
-                 API for end users and as there is a lot of end users, their 
reaction
-            when such API gets broken can be pretty strong.
-            </hint>
-        </question>
--->
- <answer id="exec-ant-tasks">
-  <p>
-   XXX no answer for exec-ant-tasks
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-classloader" when="impl">
-            Does your code create its own class loader(s)?
-            <hint>
-            A bit unusual. Please explain why and what for.
-            </hint>
-        </question>
--->
- <answer id="exec-classloader">
-  <p>
-   XXX no answer for exec-classloader
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-component" when="impl">
-            Is execution of your code influenced by any (string) property
-            of any of your components?
-            
-            <hint>
-            Often <code>JComponent.getClientProperty</code>, 
<code>Action.getValue</code>
-            or <code>PropertyDescriptor.getValue</code>, etc. are used to 
influence
-            a behavior of some code. This of course forms an interface that 
should
-            be documented. Also if one depends on some interface that an object
-            implements (<code>component instanceof Runnable</code>) that forms 
an
-            API as well.
-            </hint>
-        </question>
--->
- <answer id="exec-component">
-  <p>
-   XXX no answer for exec-component
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-introspection" when="impl">
-            Does your module use any kind of runtime type information 
(<code>instanceof</code>,
-            work with <code>java.lang.Class</code>, etc.)?
-            <hint>
-            Check for cases when you have an object of type A and you also
-            expect it to (possibly) be of type B and do some special action. 
That
-            should be documented. The same applies on operations in meta-level
-            (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
-            </hint>
-        </question>
--->
- <answer id="exec-introspection">
-  <p>
-   XXX no answer for exec-introspection
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-privateaccess" when="final">
-            Are you aware of any other parts of the system calling some of 
-            your methods by reflection?
-            <hint>
-            If so, describe the "contract" as an API. Likely private or friend 
one, but
-            still API and consider rewrite of it.
-            </hint>
-        </question>
--->
- <answer id="exec-privateaccess">
-  <p>
-   XXX no answer for exec-privateaccess
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-process" when="impl">
-            Do you execute an external process from your module? How do you 
ensure
-            that the result is the same on different platforms? Do you parse 
output?
-            Do you depend on result code?
-            <hint>
-            If you feed an input, parse the output please declare that as an 
API.
-            </hint>
-        </question>
--->
- <answer id="exec-process">
-  <p>
-   XXX no answer for exec-process
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-property" when="impl">
-            Is execution of your code influenced by any environment or
-            Java system (<code>System.getProperty</code>) property?
-            
-            <hint>
-            If there is a property that can change the behavior of your 
-            code, somebody will likely use it. You should describe what it 
does 
-            and the <a 
href="http://openide.netbeans.org/tutorial/api-design.html#life";>stability 
category</a>
-            of this API. You may use
-            <pre>
-                &lt;api type="export" group="property" name="id" 
category="private" url="http://..."&gt;
-                    description of the property, where it is used, what it 
influence, etc.
-                &lt;/api&gt;            
-            </pre>
-            </hint>
-        </question>
--->
- <answer id="exec-property">
-  <p>
-   XXX no answer for exec-property
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-reflection" when="impl">
-            Does your code use Java Reflection to execute other code?
-            <hint>
-            This usually indicates a missing or insufficient API in the other
-            part of the system. If the other side is not aware of your 
dependency
-            this contract can be easily broken.
-            </hint>
-        </question>
--->
- <answer id="exec-reflection">
-  <p>
-   XXX no answer for exec-reflection
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="exec-threading" when="init">
-            What threading models, if any, does your module adhere to? How the
-            project behaves with respect to threading?
-            <hint>
-                Is your API threadsafe? Can it be accessed from any threads or
-                just from some dedicated ones? Any special relation to AWT and
-                its Event Dispatch thread? Also
-                if your module calls foreign APIs which have a specific 
threading model,
-                indicate how you comply with the requirements for 
multithreaded access
-                (synchronization, mutexes, etc.) applicable to those APIs.
-                If your module defines any APIs, or has complex internal 
structures
-                that might be used from multiple threads, declare how you 
protect
-                data against concurrent access, race conditions, deadlocks, 
etc.,
-                and whether such rules are enforced by runtime warnings, 
errors, assertions, etc.
-                Examples: a class might be non-thread-safe (like Java 
Collections); might
-                be fully thread-safe (internal locking); might require access 
through a mutex
-                (and may or may not automatically acquire that mutex on behalf 
of a client method);
-                might be able to run only in the event queue; etc.
-                Also describe when any events are fired: synchronously, 
asynchronously, etc.
-                Ideas: <a 
href="http://core.netbeans.org/proposals/threading/index.html#recommendations";>Threading
 Recommendations</a> (in progress)
-            </hint>
-        </question>
--->
- <answer id="exec-threading">
-  <p>
-   XXX no answer for exec-threading
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="format-clipboard" when="impl">
-            Which data flavors (if any) does your code read from or insert to
-            the clipboard (by access to clipboard on means calling methods on 
<code>java.awt.datatransfer.Transferable</code>?
-            
-            <hint>
-            Often Node's deal with clipboard by usage of 
<code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
-            Check your code for overriding these methods.
-            </hint>
-        </question>
--->
- <answer id="format-clipboard">
-  <p>
-   XXX no answer for format-clipboard
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="format-dnd" when="impl">
-            Which protocols (if any) does your code understand during Drag 
&amp; Drop?
-            <hint>
-            Often Node's deal with clipboard by usage of <code>Node.drag, 
Node.getDropType</code>. 
-            Check your code for overriding these methods. Btw. if they are not 
overridden, they
-            by default delegate to <code>Node.clipboardCopy, Node.clipboardCut 
and Node.pasteTypes</code>.
-            </hint>
-        </question>
--->
- <answer id="format-dnd">
-  <p>
-   XXX no answer for format-dnd
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="format-types" when="impl">
-            Which protocols and file formats (if any) does your module read or 
write on disk,
-            or transmit or receive over the network? Do you generate an ant 
build script?
-            Can it be edited and modified? 
-            
-            <hint>
-            <p>
-            Files can be read and written by other programs, modules and 
users. If they influence
-            your behaviour, make sure you either document the format or claim 
that it is a private
-            api (using the &lt;api&gt; tag). 
-            </p>
-            
-            <p>
-            If you generate an ant build file, this is very likely going to be 
seen by end users and
-            they will be attempted to edit it. You should be ready for that 
and provide here a link
-            to documentation that you have for such purposes and also describe 
how you are going to
-            understand such files during next release, when you (very likely) 
slightly change the 
-            format.
-            </p>
-            </hint>
-        </question>
--->
- <answer id="format-types">
-  <p>
-   XXX no answer for format-types
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="lookup-lookup" when="init">
-            Does your module use <code>org.openide.util.Lookup</code>
-            or any similar technology to find any components to communicate 
with? Which ones?
-            
-            <hint>
-            NetBeans is build around a generic registry of services called
-            lookup. It is preferable to use it for registration and discovery
-            if possible. See
-            <a 
href="http://www.netbeans.org/download/dev/javadoc/org-openide-util/org/openide/util/lookup/doc-files/index.html";>
-            The Solution to Comunication Between Components
-            </a>. If you do not plan to use lookup and insist usage
-            of other solution, then please describe why it is not working for
-            you.
-            <br/>
-            When filling the final version of your arch document, please
-            describe the interfaces you are searching for, where 
-            are defined, whether you are searching for just one or more of 
them,
-            if the order is important, etc. Also classify the stability of such
-            API contract. Use &lt;api group=&amp;lookup&amp; /&gt; tag, so
-            your information gets listed in the summary page of your javadoc.
-            </hint>
-        </question>
--->
- <answer id="lookup-lookup">
-  <p>
-   XXX no answer for lookup-lookup
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="lookup-register" when="final">
-            Do you register anything into lookup for other code to find?
-            <hint>
-            Do you register using layer file or using 
<code>META-INF/services</code>?
-            Who is supposed to find your component?
-            </hint>
-        </question>
--->
- <answer id="lookup-register">
-  <p>
-   XXX no answer for lookup-register
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="lookup-remove" when="final">
-            Do you remove entries of other modules from lookup?
-            <hint>
-            Why? Of course, that is possible, but it can be dangerous. Is the 
module
-            your are masking resource from aware of what you are doing?
-            </hint>
-        </question>
--->
- <answer id="lookup-remove">
-  <p>
-   XXX no answer for lookup-remove
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-exit" when="final">
-            Does your module run any code on exit?
-        </question>
--->
- <answer id="perf-exit">
-  <p>
-   XXX no answer for perf-exit
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-huge_dialogs" when="final">
-            Does your module contain any dialogs or wizards with a large 
number of
-            GUI controls such as combo boxes, lists, trees, or text areas?
-        </question>
--->
- <answer id="perf-huge_dialogs">
-  <p>
-   XXX no answer for perf-huge_dialogs
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-limit" when="init">
-            Are there any hard-coded or practical limits in the number or size 
of
-            elements your code can handle?
-            <hint>
-                Most of algorithms have increasing memory and speed complexity
-                with respect to size of data they operate on. What is the 
critical
-                part of your project that can be seen as a bottleneck with
-                respect to speed or required memory? What are the practical
-                sizes of data you tested your project with? What is your 
estimate
-                of potential size of data that would cause visible performance
-                problems? Is there some kind of check to detect such situation
-                and prevent "hard" crashes - for example the 
CloneableEditorSupport
-                checks for size of a file to be opened in editor
-                and if it is larger than 1Mb it shows a dialog giving the
-                user the right to decide - e.g. to cancel or commit suicide.
-            </hint>
-        </question>
--->
- <answer id="perf-limit">
-  <p>
-   XXX no answer for perf-limit
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-mem" when="final">
-            How much memory does your component consume? Estimate
-            with a relation to the number of windows, etc.
-        </question>
--->
- <answer id="perf-mem">
-  <p>
-   XXX no answer for perf-mem
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-menus" when="final">
-            Does your module use dynamically updated context menus, or
-            context-sensitive actions with complicated and slow enablement 
logic?
-            <hint>
-                If you do a lot of tricks when adding actions to regular or 
context menus, you can significantly
-                slow down display of the menu, even when the user is not using 
your action. Pay attention to
-                actions you add to the main menu bar, and to context menus of 
foreign nodes or components. If
-                the action is conditionally enabled, or changes its display 
dynamically, you need to check the
-                impact on performance. In some cases it may be more 
appropriate to make a simple action that is
-                always enabled but does more detailed checks in a dialog if it 
is actually run.
-            </hint>
-        </question>
--->
- <answer id="perf-menus">
-  <p>
-   XXX no answer for perf-menus
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-progress" when="final">
-            Does your module execute any long-running tasks?
-            
-            <hint>Long running tasks should never block 
-            AWT thread as it badly hurts the UI
-            <a 
href="http://performance.netbeans.org/responsiveness/issues.html";>
-            responsiveness</a>.
-            Tasks like connecting over
-            network, computing huge amount of data, compilation
-            be done asynchronously (for example
-            using <code>RequestProcessor</code>), definitively it should 
-            not block AWT thread.
-            </hint>
-        </question>
--->
- <answer id="perf-progress">
-  <p>
-   XXX no answer for perf-progress
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-scale" when="init">
-            Which external criteria influence the performance of your
-            program (size of file in editor, number of files in menu, 
-            in source directory, etc.) and how well your code scales?
-            <hint>
-            Please include some estimates, there are other more detailed 
-            questions to answer in later phases of implementation. 
-            </hint>
-        </question>
--->
- <answer id="perf-scale">
-  <p>
-   XXX no answer for perf-scale
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-spi" when="init">
-            How the performance of the plugged in code will be enforced?
-            <hint>
-            If you allow foreign code to be plugged into your own module, how
-            do you enforce that it will behave correctly and quickly and will 
not
-            negatively influence the performance of your own module?
-            </hint>
-        </question>
--->
- <answer id="perf-spi">
-  <p>
-   XXX no answer for perf-spi
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-startup" when="final">
-            Does your module run any code on startup?
-        </question>
--->
- <answer id="perf-startup">
-  <p>
-   XXX no answer for perf-startup
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="perf-wakeup" when="final">
-            Does any piece of your code wake up periodically and do something
-            even when the system is otherwise idle (no user interaction)?
-        </question>
--->
- <answer id="perf-wakeup">
-  <p>
-   XXX no answer for perf-wakeup
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="resources-file" when="final">
-            Does your module use <code>java.io.File</code> directly?
-            
-            <hint>
-            NetBeans provide a logical wrapper over plain files called 
-            <code>org.openide.filesystems.FileObject</code> that
-            provides uniform access to such resources and is the preferred
-            way that should be used. But of course there can be situations when
-            this is not suitable.
-            </hint>
-        </question>
--->
- <answer id="resources-file">
-  <p>
-   XXX no answer for resources-file
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="resources-layer" when="final">
-            Does your module provide own layer? Does it create any files or
-            folders in it? What it is trying to communicate by that and with 
which 
-            components?
-            
-            <hint>
-            NetBeans allows automatic and declarative installation of 
resources 
-            by module layers. Module register files into appropriate places
-            and other components use that information to perform their task
-            (build menu, toolbar, window layout, list of templates, set of
-            options, etc.). 
-            </hint>
-        </question>
--->
- <answer id="resources-layer">
-  <p>
-   XXX no answer for resources-layer
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="resources-mask" when="final">
-            Does your module mask/hide/override any resources provided by 
other modules in
-            their layers?
-            
-            <hint>
-            If you mask a file provided by another module, you probably depend
-            on that and do not want the other module to (for example) change
-            the file's name. That module shall thus make that file available 
as an API
-            of some stability category.
-            </hint>
-        </question>
--->
- <answer id="resources-mask">
-  <p>
-   XXX no answer for resources-mask
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="resources-read" when="final">
-            Does your module read any resources from layers? For what purpose?
-            
-            <hint>
-            As this is some kind of intermodule dependency, it is a kind of 
API.
-            Please describe it and classify according to 
-            <a 
href="http://openide.netbeans.org/tutorial/api-design.html#categories";>
-            common stability categories</a>.
-            </hint>
-        </question>
--->
- <answer id="resources-read">
-  <p>
-   XXX no answer for resources-read
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="security-grant" when="final">
-            Does your code grant additional rights to some other code?
-            <hint>Avoid using a class loader that adds extra
-            permissions to loaded code unless really necessary.
-            Also note that your API implementation
-            can also expose unneeded permissions to enemy code by
-            calling AccessController.doPrivileged().</hint>
-        </question>
--->
- <answer id="security-grant">
-  <p>
-   XXX no answer for security-grant
-  </p>
- </answer>
-
-
-
-<!--
-        <question id="security-policy" when="final">
-            Does your functionality require modifications to the standard 
policy file?
-            <hint>Your code might pass control to third-party code not
-            coming from trusted domains. This could be code downloaded over the
-            network or code coming from libraries that are not bundled
-            with NetBeans. Which permissions need to be granted to which 
domains?</hint>
-        </question>
--->
- <answer id="security-policy">
-  <p>
-   XXX no answer for security-policy
-  </p>
- </answer>
-
-</api-answers>
diff --git a/platform/openide.util.enumerations/build.xml 
b/platform/openide.util.enumerations/build.xml
deleted file mode 100644
index be9bbfd..0000000
--- a/platform/openide.util.enumerations/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-<project name="platform/openide.util.enumerations" default="build" basedir=".">
-    <available property="is.jdk9" classname="java.lang.Module"/>
-    <import file="../../nbbuild/templates/projectized.xml"/>
-
-    <target name="compile" depends="-copy" unless="is.jdk9">
-        <antcall target="projectized-common.compile"/>
-    </target>
-
-    <target name="-copy" depends="init,up-to-date">
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${jar-excludes}"/>
-        </copy>
-    </target>
-
-    <target name="-do-junit" unless="is.jdk9">
-        <antcall target="projectized-common.-do-junit"/>
-    </target>
-
-    <target name="do-unit-test-build" unless="is.jdk9">
-        <antcall target="projectized-common.do-unit-test-build"/>
-    </target>
-</project>
diff --git a/platform/openide.util.enumerations/manifest.mf 
b/platform/openide.util.enumerations/manifest.mf
deleted file mode 100644
index d0ba9ae..0000000
--- a/platform/openide.util.enumerations/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.openide.util.enumerations
-OpenIDE-Module-Specification-Version: 6.49
-OpenIDE-Module-Localizing-Bundle: org/openide/util/enum/Bundle.properties
-OpenIDE-Module-Deprecated: true
-AutoUpdate-Essential-Module: true
-
diff --git 
a/platform/openide.util.enumerations/nbproject/org-openide-util-enumerations.sig
 
b/platform/openide.util.enumerations/nbproject/org-openide-util-enumerations.sig
deleted file mode 100644
index 6bf44e9..0000000
--- 
a/platform/openide.util.enumerations/nbproject/org-openide-util-enumerations.sig
+++ /dev/null
@@ -1,90 +0,0 @@
-#Signature file v4.1
-#Version 6.47
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws 
java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public abstract interface java.util.Enumeration<%0 extends 
java.lang.Object>
-meth public abstract boolean hasMoreElements()
-meth public abstract {java.util.Enumeration%0} nextElement()
-
-CLSS public abstract org.openide.util.enum.AlterEnumeration
-cons public init(java.util.Enumeration)
-intf java.util.Enumeration
-meth protected abstract java.lang.Object alter(java.lang.Object)
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-supr java.lang.Object
-hfds en
-
-CLSS public org.openide.util.enum.ArrayEnumeration
-cons public init(java.lang.Object[])
-intf java.util.Enumeration
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-supr java.lang.Object
-hfds array,index
-
-CLSS public final org.openide.util.enum.EmptyEnumeration
-cons public init()
-fld public final static org.openide.util.enum.EmptyEnumeration EMPTY
-intf java.util.Enumeration
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-supr java.lang.Object
-
-CLSS public org.openide.util.enum.FilterEnumeration
-cons public init(java.util.Enumeration)
-intf java.util.Enumeration
-meth protected boolean accept(java.lang.Object)
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-supr java.lang.Object
-hfds EMPTY,en,next
-
-CLSS public org.openide.util.enum.QueueEnumeration
-cons public init()
-intf java.util.Enumeration
-meth protected void process(java.lang.Object)
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-meth public void put(java.lang.Object)
-meth public void put(java.lang.Object[])
-supr java.lang.Object
-hfds last,next
-hcls ListItem
-
-CLSS public org.openide.util.enum.RemoveDuplicatesEnumeration
-cons public init(java.util.Enumeration)
-meth protected boolean accept(java.lang.Object)
-supr org.openide.util.enum.FilterEnumeration
-hfds all
-
-CLSS public org.openide.util.enum.SequenceEnumeration
-cons public init(java.util.Enumeration)
-cons public init(java.util.Enumeration,java.util.Enumeration)
-intf java.util.Enumeration
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-supr java.lang.Object
-hfds checked,current,en
-
-CLSS public org.openide.util.enum.SingletonEnumeration
-cons public init(java.lang.Object)
-intf java.util.Enumeration
-meth public boolean hasMoreElements()
-meth public java.lang.Object nextElement()
-supr java.lang.Object
-hfds object
-
diff --git a/platform/openide.util.enumerations/nbproject/project.properties 
b/platform/openide.util.enumerations/nbproject/project.properties
deleted file mode 100644
index bac7a70..0000000
--- a/platform/openide.util.enumerations/nbproject/project.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-javac.source=1.4
-is.autoload=true
-#javadoc.main.page=org/openide/util/doc-files/api.html
-#javadoc.arch=${basedir}/../arch/arch-openide-util.xml
-javadoc.apichanges=${basedir}/apichanges.xml
-
-javadoc.arch=${basedir}/arch.xml
-
-test.config.stableBTD.includes=**/*Test.class
diff --git a/platform/openide.util.enumerations/nbproject/project.xml 
b/platform/openide.util.enumerations/nbproject/project.xml
deleted file mode 100644
index dbd18cf..0000000
--- a/platform/openide.util.enumerations/nbproject/project.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1";>
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3";>
-            <code-name-base>org.openide.util.enumerations</code-name-base>
-            <module-dependencies/>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        
<code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util.ui</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        
<code-name-base>org.openide.util.lookup</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
-            <public-packages>
-                <package>org.openide.util.enum</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/AlterEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/AlterEnumeration.java
deleted file mode 100644
index dc32f12..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/AlterEnumeration.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-
-
-/**
- * Abstract class that takes an enumeration and alter their elements
- * to new objects.
- * To get this class fully work one must override <CODE>alter</CODE> method.
- * Objects in the input and resulting enumeration must not be 
<CODE>null</CODE>.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#convert}.
- * @author Jaroslav Tulach
- */
-public abstract class AlterEnumeration extends Object implements Enumeration {
-    /** enumeration to filter */
-    private Enumeration en;
-
-    /**
-    * @param en enumeration to filter
-    */
-    public AlterEnumeration(Enumeration en) {
-        this.en = en;
-    }
-
-    /** Alters objects. Overwrite this to alter the object in the
-    * enumeration by another.
-    * @param o the object to decide on
-    * @return new object to be placed into the output enumeration
-    */
-    protected abstract Object alter(Object o);
-
-    /** @return true if there is more elements in the enumeration
-    */
-    public boolean hasMoreElements() {
-        return en.hasMoreElements();
-    }
-
-    /** @return next object in the enumeration
-    * @exception NoSuchElementException can be thrown if there is no next 
object
-    *   in the enumeration
-    */
-    public Object nextElement() {
-        return alter(en.nextElement());
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/ArrayEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/ArrayEnumeration.java
deleted file mode 100644
index 1d526e3..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/ArrayEnumeration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-
-/**
- * The class that presents specifiED (in constructor) array
- * as an Enumeration.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#array}.
- * @author Ian Formanek
- */
-public class ArrayEnumeration implements Enumeration {
-    /** The array */
-    private Object[] array;
-
-    /** Current index in the array */
-    private int index = 0;
-
-    /** Constructs a new ArrayEnumeration for specified array */
-    public ArrayEnumeration(Object[] array) {
-        this.array = array;
-    }
-
-    /** Tests if this enumeration contains more elements.
-    * @return  <code>true</code> if this enumeration contains more elements;
-    *          <code>false</code> otherwise.
-    */
-    public boolean hasMoreElements() {
-        return (index < array.length);
-    }
-
-    /** Returns the next element of this enumeration.
-    * @return     the next element of this enumeration.
-    * @exception  NoSuchElementException  if no more elements exist.
-    */
-    public Object nextElement() {
-        try {
-            return array[index++];
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw new NoSuchElementException();
-        }
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/Bundle.properties
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/Bundle.properties
deleted file mode 100644
index a943c2c..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/Bundle.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# manifest
-OpenIDE-Module-Name=Old Enumeration API
-OpenIDE-Module-Display-Category=Infrastructure
-OpenIDE-Module-Short-Description=Enumeration API that is in wrong package.
-OpenIDE-Module-Long-Description=Enumeration API that is in wrong package, \
-  org.openide.util.enum and as such it cannot be compiled with Java 1.5, \
-  because enum is a keyword. Is replaced by class 
org.openide.util.Enumerations.
-OpenIDE-Module-Deprecation-Message=Use org.openide.util.Enumerations instead 
of this module.
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/EmptyEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/EmptyEnumeration.java
deleted file mode 100644
index 43b657c..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/EmptyEnumeration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-
-/**
- * The class that represents empty enumeration.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#empty()}.
- * @author Petr Hamernik
- */
-public final class EmptyEnumeration implements Enumeration {
-    /** instance of empty enumeration */
-    public static final EmptyEnumeration EMPTY = new EmptyEnumeration();
-
-    public boolean hasMoreElements() {
-        return false;
-    }
-
-    public Object nextElement() throws NoSuchElementException {
-        throw new NoSuchElementException();
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/FilterEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/FilterEnumeration.java
deleted file mode 100644
index c93ac30..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/FilterEnumeration.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-
-/**
- * Abstract class that takes an enumeration and filters its elements.
- * To get this class fully work one must override <CODE>accept</CODE> method.
- * Objects in the enumeration must not be <CODE>null</CODE>.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#filter}.
- * @author Jaroslav Tulach
- */
-public class FilterEnumeration extends Object implements Enumeration {
-    /** marker object stating there is no nexte element prepared */
-    private static final Object EMPTY = new Object();
-
-    /** enumeration to filter */
-    private Enumeration en;
-
-    /** element to be returned next time or {@link #EMPTY} if there is
-    * no such element prepared */
-    private Object next = EMPTY;
-
-    /**
-    * @param en enumeration to filter
-    */
-    public FilterEnumeration(Enumeration en) {
-        this.en = en;
-    }
-
-    /** Filters objects. Overwrite this to decide which objects should be
-    * included in enumeration and which not.
-    * <P>
-    * Default implementation accepts all non-null objects
-    *
-    * @param o the object to decide on
-    * @return true if it should be in enumeration and false if it should not
-    */
-    protected boolean accept(Object o) {
-        return o != null;
-    }
-
-    /** @return true if there is more elements in the enumeration
-    */
-    public boolean hasMoreElements() {
-        if (next != EMPTY) {
-            // there is a object already prepared
-            return true;
-        }
-
-        while (en.hasMoreElements()) {
-            // read next
-            next = en.nextElement();
-
-            if (accept(next)) {
-                // if the object is accepted
-                return true;
-            }
-
-            ;
-        }
-
-        next = EMPTY;
-
-        return false;
-    }
-
-    /** @return next object in the enumeration
-    * @exception NoSuchElementException can be thrown if there is no next 
object
-    *   in the enumeration
-    */
-    public Object nextElement() {
-        if ((next == EMPTY) && !hasMoreElements()) {
-            throw new NoSuchElementException();
-        }
-
-        Object res = next;
-        next = EMPTY;
-
-        return res;
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/QueueEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/QueueEnumeration.java
deleted file mode 100644
index 810880d..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/QueueEnumeration.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-
-/**
- * Enumeration that represents a queue. It allows by redefining
- * method <CODE>process</CODE> each outputed object to add other to the end of
- * queue of waiting objects by a call to <CODE>put</CODE>.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#queue}.
- * @author Jaroslav Tulach, Petr Hamernik
- */
-public class QueueEnumeration extends Object implements Enumeration {
-    /** next object to be returned */
-    private ListItem next = null;
-
-    /** last object in the queue */
-    private ListItem last = null;
-
-    /** Processes object before it is returned from nextElement method.
-    * This method allows to add other object to the end of the queue
-    * by a call to <CODE>put</CODE> method. This implementation does
-    * nothing.
-    *
-    * @see #put
-    * @param o the object to be processed
-    */
-    protected void process(Object o) {
-    }
-
-    /** Put adds new object to the end of queue.
-    * @param o the object to add
-    */
-    public synchronized void put(Object o) {
-        if (last != null) {
-            ListItem li = new ListItem(o);
-            last.next = li;
-            last = li;
-        } else {
-            next = last = new ListItem(o);
-        }
-    }
-
-    /** Adds array of objects into the queue.
-    * @param arr array of objects to put into the queue
-    */
-    public synchronized void put(Object[] arr) {
-        for (int i = 0; i < arr.length; i++) {
-            put(arr[i]);
-        }
-    }
-
-    /** Is there any next object?
-    * @return true if there is next object, false otherwise
-    */
-    public boolean hasMoreElements() {
-        return next != null;
-    }
-
-    /** @return next object in enumeration
-    * @exception NoSuchElementException if there is no next object
-    */
-    public synchronized Object nextElement() {
-        if (next == null) {
-            throw new NoSuchElementException();
-        }
-
-        Object res = next.object;
-
-        if ((next = next.next) == null) {
-            last = null;
-        }
-
-        ;
-        process(res);
-
-        return res;
-    }
-
-    /** item in linked list of Objects */
-    private static final class ListItem {
-        Object object;
-        ListItem next;
-
-        /** @param o the object for this item */
-        ListItem(Object o) {
-            object = o;
-        }
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/RemoveDuplicatesEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/RemoveDuplicatesEnumeration.java
deleted file mode 100644
index a530dda..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/RemoveDuplicatesEnumeration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-import java.util.HashSet;
-
-
-/**
- * Enumeration that scans through another one and removes duplicates.
- * Two objects are duplicate if <CODE>one.equals (another)</CODE>.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link 
org.openide.util.Enumerations#removeDuplicates}.
- * @author Jaroslav Tulach
- */
-public class RemoveDuplicatesEnumeration extends FilterEnumeration {
-    /** hashtable with all returned objects */
-    private HashSet all = new HashSet(37);
-
-    /**
-    * @param en enumeration to filter
-    */
-    public RemoveDuplicatesEnumeration(Enumeration en) {
-        super(en);
-    }
-
-    /** Filters objects. Overwrite this to decide which objects should be
-    * included in enumeration and which not.
-    * @param o the object to decide on
-    * @return true if it should be in enumeration and false if it should not
-    */
-    protected boolean accept(Object o) {
-        return all.add(o);
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/SequenceEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/SequenceEnumeration.java
deleted file mode 100644
index 57665fb..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/SequenceEnumeration.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-
-
-/**
- * Composes several enumerations into one.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#concat}.
- * @author Jaroslav Tulach, Petr Nejedly
- */
-public class SequenceEnumeration extends Object implements Enumeration {
-    /** enumeration of Enumerations */
-    private Enumeration en;
-
-    /** current enumeration */
-    private Enumeration current;
-
-    /** is {@link #current} up-to-date and has more elements?
-    * The combination <CODE>current == null</CODE> and
-    * <CODE>checked == true means there are no more elements
-    * in this enumeration.
-    */
-    private boolean checked = false;
-
-    /** Constructs new enumeration from already existing. The elements
-    * of <CODE>en</CODE> should be also enumerations. The resulting
-    * enumeration contains elements of such enumerations.
-    *
-    * @param en enumeration of Enumerations that should be sequenced
-    */
-    public SequenceEnumeration(Enumeration en) {
-        this.en = en;
-    }
-
-    /** Composes two enumerations into one.
-    * @param first first enumeration
-    * @param second second enumeration
-    */
-    public SequenceEnumeration(Enumeration first, Enumeration second) {
-        this(new ArrayEnumeration(new Enumeration[] { first, second }));
-    }
-
-    /** Ensures that current enumeration is set. If there aren't more
-    * elements in the Enumerations, sets the field <CODE>current</CODE> to 
null.
-    */
-    private void ensureCurrent() {
-        while ((current == null) || !current.hasMoreElements()) {
-            if (en.hasMoreElements()) {
-                current = (Enumeration) en.nextElement();
-            } else {
-                // no next valid enumeration
-                current = null;
-
-                return;
-            }
-        }
-    }
-
-    /** @return true if we have more elements */
-    public boolean hasMoreElements() {
-        if (!checked) {
-            ensureCurrent();
-            checked = true;
-        }
-
-        return current != null;
-    }
-
-    /** @return next element
-    * @exception NoSuchElementException if there is no next element
-    */
-    public synchronized Object nextElement() {
-        if (!checked) {
-            ensureCurrent();
-        }
-
-        if (current != null) {
-            checked = false;
-
-            return current.nextElement();
-        } else {
-            checked = true;
-            throw new java.util.NoSuchElementException();
-        }
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/SingletonEnumeration.java
 
b/platform/openide.util.enumerations/src/org/openide/util/enum/SingletonEnumeration.java
deleted file mode 100644
index 1a48ba7..0000000
--- 
a/platform/openide.util.enumerations/src/org/openide/util/enum/SingletonEnumeration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.openide.util.enum;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-
-/**
- * The class that encapsulates one object into one element enumeration.
- * @deprecated JDK 1.5 treats enum as a keyword so this class was
- *             replaced by {@link org.openide.util.Enumerations#singleton}.
- * @author Jaroslav Tulach
- */
-public class SingletonEnumeration implements Enumeration {
-    /** object to return */
-    private Object object;
-
-    /** @param object object to be put into the enumeration
-    */
-    public SingletonEnumeration(Object object) {
-        this.object = object;
-    }
-
-    /** Tests if this enumeration contains next element.
-    * @return  <code>true</code> if this enumeration contains it
-    *          <code>false</code> otherwise.
-    */
-    public boolean hasMoreElements() {
-        return object != null;
-    }
-
-    /** Returns the next element of this enumeration.
-    * @return     the next element of this enumeration.
-    * @exception  NoSuchElementException  if no more elements exist.
-    */
-    public synchronized Object nextElement() {
-        if (object == null) {
-            throw new NoSuchElementException();
-        } else {
-            Object o = object;
-            object = null;
-
-            return o;
-        }
-    }
-}
diff --git 
a/platform/openide.util.enumerations/src/org/openide/util/enum/package.html 
b/platform/openide.util.enumerations/src/org/openide/util/enum/package.html
deleted file mode 100644
index 8e9f6aa..0000000
--- a/platform/openide.util.enumerations/src/org/openide/util/enum/package.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-<html>
-<body>
-
-A set of old, deprecated utility classes for working with enumerations.
-Please use
-<a 
href="@org-openide-util@/org/openide/util/Enumerations.html">org.openide.util.Enumerations</a>
-instead.
-
-</body>
-</html>
diff --git 
a/platform/openide.util.enumerations/test/unit/src/org/openide/util/enum/OldEnumerationsTest.java
 
b/platform/openide.util.enumerations/test/unit/src/org/openide/util/enum/OldEnumerationsTest.java
deleted file mode 100644
index 6978a85..0000000
--- 
a/platform/openide.util.enumerations/test/unit/src/org/openide/util/enum/OldEnumerationsTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.openide.util.enum;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import org.openide.util.EnumerationsTest;
-import org.openide.util.EnumerationsTest.QueueProcess;
-
-/** Implement factory methods from EnumerationsTest, shares the same tests
- * with EnumerationsTest.
- *
- * @author Jaroslav Tulach
- */
-public class OldEnumerationsTest extends EnumerationsTest {
-
-    /** Creates a new instance of EnumerationsTest */
-    public OldEnumerationsTest(String testName) {
-        super(testName);
-    }
-    
-    protected Enumeration singleton(Object obj) {
-        return new SingletonEnumeration(obj);
-    }
-    
-    protected Enumeration convert(Enumeration en, final Map map) {
-        return new AlterEnumeration(en) {
-            protected Object alter(Object o) {
-                return map.get(o);
-            }
-        };
-    }
-    
-    protected Enumeration removeDuplicates(Enumeration en) {
-        return new RemoveDuplicatesEnumeration(en);
-    }
-    
-    protected Enumeration removeNulls(Enumeration en) {
-        return new FilterEnumeration(en);
-    }
-    
-    protected Enumeration concat(Enumeration en1, Enumeration en2) {
-        return new SequenceEnumeration(en1, en2);
-    }
-    
-    protected Enumeration array(Object[] arr) {
-        return new ArrayEnumeration(arr);
-    }
-    
-    protected Enumeration filter(Enumeration en, final Set filter) {
-        return new FilterEnumeration(en) {
-            protected boolean accept(Object obj) {
-                return filter.contains(obj);
-            }
-        };
-    }
-    protected Enumeration filter(Enumeration en, final QueueProcess filter) {
-        en = new AlterEnumeration(en) {
-            public Object alter(Object alter) {
-                return filter.process(alter, null);
-            }
-        };
-        
-        return new FilterEnumeration(en);
-    }
-    
-    protected Enumeration concat(Enumeration enumOfEnums) {
-        return new SequenceEnumeration(enumOfEnums);
-    }
-    
-    protected Enumeration empty() {
-        return new EmptyEnumeration();
-    }
-    
-    protected Enumeration queue(Collection init, final QueueProcess process) {
-        final HashMap diff = new HashMap();
-        
-        class QEAdd extends QueueEnumeration implements Collection {
-            protected void process(Object obj) {
-                Object different = process.process(obj, this);
-                if (different != obj) {
-                    diff.put(obj, different);
-                }
-            }
-            
-            public boolean add(Object o) {
-                put(o);
-                return true;
-            }
-            
-            public boolean addAll(Collection c) {
-                put(c.toArray());
-                return true;
-            }
-            
-            public void clear() {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public boolean contains(Object o) {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public boolean containsAll(Collection c) {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public boolean isEmpty() {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public Iterator iterator() {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public boolean remove(Object o) {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public boolean removeAll(Collection c) {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public boolean retainAll(Collection c) {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public int size() {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public Object[] toArray() {
-                throw new IllegalStateException("Unsupported");
-            }
-            
-            public Object[] toArray(Object[] a) {
-                throw new IllegalStateException("Unsupported");
-            }
-        }
-        QEAdd qe = new QEAdd();
-        qe.put(init.toArray());
-        
-        class Change extends AlterEnumeration {
-            public Change(Enumeration en) {
-                super(en);
-            }
-            
-            public Object alter(Object o) {
-                if (diff.keySet().contains(o)) {
-                    return diff.remove(o);
-                }
-                return o;
-            }
-        }
-        
-        return new Change(qe);
-    }
-    
-}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to