1. netbeans
  2. main-silver

Commits

jgl...@netbeans.org  committed 332fb07

#19443: separation of openide, phase I.

  • Participants
  • Parent commits 48344bd
  • Branches default

Comments (0)

Files changed (160)

File beans/build.xml

View file
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
         <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
 	<pathelement location="../java/netbeans/modules/java.jar"/>
 	<pathelement location="{java.home}/lib/tools.jar"/>
       </classpath>

File beans/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.beans/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/beans/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/beans/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.java/1 > 1.7
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.12
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.java/1 > 1.7, org.openide.deprecated > 1.0, org.openide.src > 1.0
 
 Name: org/netbeans/modules/beans/AddPropertyAction.class
 OpenIDE-Module-Class: Action

File core.execution/manifest.mf

View file
 OpenIDE-Module-Localizing-Bundle: org/netbeans/core/execution/resources/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
 OpenIDE-Module-Module-Dependencies: org.netbeans.core.ui/1 > 1.0
 OpenIDE-Module-Layer: org/netbeans/core/execution/resources/layer.xml
 

File core.ide/manifest.mf

View file
 OpenIDE-Module: org.netbeans.core.ide/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/core/ide/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
 OpenIDE-Module-Module-Dependencies: org.netbeans.core.compiler/1 > 1.0, org.netbeans.core.execution/1 > 1.0
 OpenIDE-Module-Layer: org/netbeans/core/ide/resources/layer.xml
 

File core.ide/src/org/netbeans/core/ide/resources/layer.xml

View file
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle"/>
     </folder>
         
-    <folder name="Services"> <!-- PENDING - move to Java module -->
-        <file name="org-openide-src-nodes-SourceOptions.settings" url="SourceOptions.settings">
-            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle" />
-            <attr name="SystemFileSystem.icon" urlvalue="nbresloc:org/openide/resources/src/sourceOptions.gif" />
-        </file>
+    <folder name="Services">
         <folder name="ScriptType">
             <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/core/resources/scriptTypes.gif" />
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle"/>
 
                 <folder name="LookAndFeel"> 
                     <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle" />
-
-                    <file name="org-openide-src-nodes-SourceOptions.shadow">
-                        <attr name="originalFile" stringvalue="Services/org-openide-src-nodes-SourceOptions.settings"/>
-                    </file>
                 </folder>
                 
                 <folder name="ServerAndExternalToolSettings">

File core.ui/manifest.mf

View file
 OpenIDE-Module-Localizing-Bundle: org/netbeans/core/ui/resources/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
 OpenIDE-Module-Module-Dependencies: org.netbeans.core.windows/1 > 1.0
 OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
 

File core.ui/src/org/netbeans/core/ui/resources/layer.xml

View file
                         <attr name="instanceClass" stringvalue="org.openide.nodes.Node" />
                     </file>
 
-                    <!--file name="org-openide-src-nodes-SourceOptions.shadow">
-                        <attr name="originalFile" stringvalue="Services/org-openide-src-nodes-SourceOptions.settings"/>
-                    </file -->
-
                     <file name="Menu.instance">
                         <attr name="instanceCreate" newvalue="org.netbeans.core.MenuFolderNode" />
                         <attr name="instanceClass" stringvalue="org.openide.nodes.Node" />

File core.windows/manifest.mf

View file
 OpenIDE-Module-Localizing-Bundle: org/netbeans/core/windows/resources/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
 OpenIDE-Module-Module-Dependencies: org.netbeans.core/1 > 1.0
 OpenIDE-Module-Layer: org/netbeans/core/windows/resources/layer.xml
 

File core.windows/src/META-INF/services/org.openide.nodes.NodeOperation

View file
+org.netbeans.core.NbNodeOperation

File debugger.jpda/build.xml

View file
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
         <!-- Hopefully set up bu nbbuild/build.xml: -->
         <pathelement location="${jdkhome}/lib/tools.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
 	<pathelement location="../debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
       </classpath>
     </javac>

File debugger.jpda/manifest.mf

View file
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/debugger/jpda/JPDADebuggerModule.class
 OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/resources/mf-layer.xml
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.26
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.debugger.core/3 > 2.3
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.debugger.core/3 > 2.3, org.openide.deprecated > 1.0, org.openide.src > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Specification-Version: 1.13
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
 

File diff/build.xml

View file
       <classpath>
         <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
 	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <fileset dir="${nbroot}/openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
         <fileset dir="${nbroot}/core/external">
           <include name="regexp*.jar"/>
         </fileset>

File diff/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.diff/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/diff/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Layer: org/netbeans/modules/diff/mf-layer.xml
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.editor/1 > 1.7
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.editor/1 > 1.7, org.openide.deprecated > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
 OpenIDE-Module-Package-Dependencies: org.apache.regexp[RE]
 
 Name: org/netbeans/modules/diff/DiffAction.class

File editor/build.xml

View file
        <pathelement location="../core/netbeans/lib/core.jar"/>
        <pathelement location="libsrc"/>
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
         <fileset dir="../core/external">
           <include name="regexp*.jar"/>
           <include name="xml-apis*.jar"/>

File editor/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.editor/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/editor/EditorModule.class
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.12
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Layer: org/netbeans/modules/editor/resources/layer.xml
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
-OpenIDE-Module-Module-Dependencies: org.netbeans.core/1 > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Module-Dependencies: org.netbeans.core/1 > 1.0, org.openide.deprecated > 1.0, org.openide.src > 1.0
+OpenIDE-Module-Requires: org.openide.TopManager
 Class-Path: ext/nb-editor.jar
 
 Name: org/netbeans/modules/editor/java/JCUpdateAction.class

File extbrowser/build.xml

View file
       <classpath>
         <!--<pathelement location="patches"/>-->
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
       </classpath>
     </javac>
   </target>

File extbrowser/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.extbrowser/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extbrowser/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/extbrowser/resources/layer.xml
-OpenIDE-Module-Specification-Version: 0.6
+OpenIDE-Module-Specification-Version: 0.7
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Module-Dependencies: org.openide.deprecated > 1.0
 

File form/build.xml

View file
         <!-- XXX illegally uses org.netbeans.beaninfo classes: -->
         <pathelement location="../core/netbeans/lib/core.jar"/>
         <pathelement location="release/modules/ext/AbsoluteLayout.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
         <pathelement location="../java/netbeans/modules/java.jar"/>
         <fileset dir="../core/external">
           <include name="xml-apis*.jar" />

File form/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.form/2
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/form/Bundle2.properties
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Install: org/netbeans/modules/form/FormEditorModule.class
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.5
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.java/1, org.netbeans.core/1 > 1.0
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.java/1, org.netbeans.core/1 > 1.0, org.openide.deprecated > 1.0, org.openide.src > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
 OpenIDE-Module-Layer: org/netbeans/modules/form/resources/layer.xml
 Class-Path: ext/AbsoluteLayout.jar
 

File html/build.xml

View file
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
       </classpath>
     </javac>
   </target>

File html/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.html/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/html/mf-layer.xml
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Module-Dependencies: org.openide.deprecated > 1.0
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Specification-Version: 1.11
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
 Name: org/netbeans/modules/html/HtmlLoader.class

File httpserver/build.xml

View file
     <ant dir="external" target="unscramble"/>
     <path id="httpserver-cp">
       <pathelement location="../openide/openide-13javac-workaround.jar"/>
-      <fileset dir="../openide/netbeans/lib">
-        <include name="openide*.jar" />
-      </fileset>
+      <pathelement location="../openide/netbeans/lib/openide.jar"/>
+      <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
       <fileset dir="external">
         <include name="webserver*.jar"/>
         <include name="servlet-2.2.jar"/>

File httpserver/manifest.mf

View file
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/httpserver/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/httpserver/HttpServerModule.class
 OpenIDE-Module-Layer: org/netbeans/modules/httpserver/layer.xml
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Provides: org.openide.util.HttpServer$Impl
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.servletapi/1
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.servletapi/1, org.openide.deprecated > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
 OpenIDE-Module-Package-Dependencies: [org.apache.tomcat.core.Context]
 Class-Path: ext/webserver.jar
 

File i18n/build.xml

View file
       <exclude name="org/netbeans/modules/i18n/form/"/>
       <classpath>
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
         <pathelement location="../core/netbeans/lib/core.jar"/>
         <pathelement location="../properties/netbeans/modules/properties.jar"/>
         <fileset dir="../core/external">
       <include name="org/netbeans/modules/i18n/form/"/>
       <classpath>
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
         <pathelement location="../properties/netbeans/modules/properties.jar"/>
         <pathelement location="../form/netbeans/modules/form.jar"/>
         <pathelement location="../java/netbeans/modules/java.jar"/>

File i18n/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.i18n/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/i18n/Bundle.properties
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.24
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
 OpenIDE-Module-Module-Dependencies: 
  org.netbeans.modules.properties/1, 
- org.netbeans.core/1 > 1.0
-OpenIDE-Module-Specification-Version: 1.11
+ org.netbeans.core/1 > 1.0,
+ org.openide.deprecated > 1.0, org.openide.src > 1.0
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Specification-Version: 1.12
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Layer: org/netbeans/modules/i18n/Layer.xml
 OpenIDE-Module-Package-Dependencies: org.apache.regexp[RE]

File image/build.xml

View file
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
       </classpath>
     </javac>
   </target>

File image/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.image/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/image/Bundle.properties
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.24
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Module-Dependencies: org.openide.deprecated > 1.0
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Specification-Version: 1.10
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Layer: org/netbeans/modules/image/Layer.xml
 

File j2eeserver/build.xml

View file
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" excludes="org/netbeans/modules/j2ee/deployment/model/**,org/netbeans/modules/j2ee/deployment/support/**">
       <classpath>
         <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
-        <fileset dir="${nbroot}/openide/netbeans/lib">
-                <include name="openide*.jar"/>
-        </fileset>
+        <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
+        <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="${nbroot}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
         <pathelement location="${jdkhome}/lib/tools.jar"/>
         <!-- orion_ea requires logger !!!
         <pathelement location="${nbroot}/logger/netbeans/lib/ext/logger.jar"/>

File j2eeserver/manifest.mf

View file
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.j2eeserver/2
 OpenIDE-Module-Install: org/netbeans/modules/j2ee/IntegrationModule.class
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.debugger.jpda/1
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.debugger.core/3, org.netbeans.modules.debugger.jpda/1, org.openide.deprecated > 1.0, org.openide.src > 1.0
 OpenIDE-Module-Layer: org/netbeans/modules/j2ee/impl/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/impl/Bundle.properties
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.24
 
 Name: org/netbeans/modules/j2ee/ui/ServerRegistryNode.class
 OpenIDE-Module-Class: Node

File javadoc/build.xml

View file
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
 	<pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
 	<fileset dir="../core/external">
 	    <include name="regexp*.jar"/>
 	</fileset>

File javadoc/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.javadoc/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javadoc/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/javadoc/resources/mf-layer.xml
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.java/1 > 1.7
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.java/1 > 1.7, org.openide.deprecated > 1.0, org.openide.src > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
 OpenIDE-Module-Package-Dependencies: org.apache.regexp[RE]
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.12
 
 Name: org/netbeans/modules/javadoc/GenerateDocAction.class
 OpenIDE-Module-Class: Action

File javahelp/build.xml

View file
         </copy>
     </target>
 
-    <target name="netbeans" depends="jars,release">
+    <target name="netbeans" depends="jars,release" description="Build everything.">
         <genlist targetname="nbm" outputfiledir="../../nbbuild/netbeans"/>
     </target>
 
-    <target name="nbm" depends="netbeans">
+    <target name="nbm" depends="netbeans" description="Build NBM.">
         <makenbm file="javahelp-api.nbm"
                  topdir="."
                  module="netbeans/modules/autoload/javahelp-api.jar"
             </fileset>
         </copy>
     </target>
-    <target name="test" depends="test-build">
+    <target name="test" depends="test-build" description="Try reloading.">
         <nbinstaller module="reload/javahelp-api.jar" action="reinstall"/>
     </target>
 
-    <target name="clean">
+    <target name="clean" description="Clean build products.">
         <delete>
             <fileset dir="src">
                 <include name="**/*.class"/>

File javahelp/manifest.mf

View file
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.javahelp/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javahelp/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Provides: org.netbeans.api.javahelp.Help
 OpenIDE-Module-Public-Packages: org.netbeans.api.javahelp.*, javax.help.**
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.19
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
 OpenIDE-Module-Package-Dependencies: javax.help[HelpSet] > 1.0
 OpenIDE-Module-Layer: org/netbeans/modules/javahelp/resources/layer.xml
 OpenIDE-Module-Install: org/netbeans/modules/javahelp/Installer.class

File javahelp/src/org/netbeans/modules/javahelp/HelpAction.java

View file
 import javax.swing.*;
 
 import org.openide.ErrorManager;
-import org.openide.TopManager;
 import org.openide.util.*;
 import org.openide.util.actions.SystemAction;
 import org.netbeans.api.javahelp.Help;
+import org.openide.awt.StatusDisplayer;
 
 /**
  * Shows help for the currently focused component
             help = findHelpCtx();
         }
         
-        TopManager.getDefault().setStatusText(NbBundle.getMessage(HelpAction.class, "CTL_OpeningHelp"));
+        StatusDisplayer.getDefault().setStatusText(NbBundle.getMessage(HelpAction.class, "CTL_OpeningHelp"));
         h.showHelp (help);
-        TopManager.getDefault ().setStatusText (""); // NOI18N
+        StatusDisplayer.getDefault ().setStatusText (""); // NOI18N
     }
 }

File javahelp/src/org/netbeans/modules/javahelp/HelpSetProcessor.java

View file
 import javax.help.HelpSet;
 import javax.help.HelpSetException;
 
-import org.openide.TopManager;
 import org.openide.cookies.InstanceCookie;
 import org.openide.loaders.XMLDataObject;
+import org.openide.util.Lookup;
 
 /** An XML processor for help set references.
  * Provides an instance of javax.swing.HelpSet.
                 Boolean.valueOf(mergeS).booleanValue();
                 // Make sure nbdocs: protocol is ready:
                 Object ignore = NbDocsStreamHandler.class;
-                hs = new HelpSet(TopManager.getDefault().systemClassLoader(), new URL(url));
+                hs = new HelpSet(((ClassLoader)Lookup.getDefault().lookup(ClassLoader.class)), new URL(url));
                 hs.setKeyData(HELPSET_MERGE_CONTEXT, HELPSET_MERGE_ATTR, merge ? Boolean.TRUE : Boolean.FALSE);
                 BPMChanger.invoke(BPMChanger.INC_VALUE);
             } catch (SAXException saxe) {

File javahelp/src/org/netbeans/modules/javahelp/NbDocsStreamHandler.java

View file
 import java.util.*;
 
 import org.openide.ErrorManager;
-import org.openide.TopManager;
 import org.openide.execution.NbfsStreamHandlerFactory;
+import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
 import org.openide.util.NbBundle;
 
 /** Handler & connection cribbed from NbResourceStreamHandler.
      * used to handle nbdocs: requests
      */    
     private static Reference docsLoader = null; // Reference<ClassLoader>
+    
+    private static Lookup.Result classLoaderQuery = Lookup.getDefault().lookup(new Lookup.Template(ClassLoader.class));
 
     /** @return the classloader used to resolve
      * nbdocs: requests
             l = null;
         }
         if (l == null) {
-            l = new URLClassLoader(getDocsURLs(), TopManager.getDefault().systemClassLoader());
+            l = new URLClassLoader(getDocsURLs(), (ClassLoader)classLoaderQuery.allInstances().iterator().next());
             if (! addedTmSysLoaderListener) {
-                TopManager.getDefault().addPropertyChangeListener(new PropertyChangeListener() {
-                    public void propertyChange(PropertyChangeEvent ev) {
-                        // XXX this is not an official property name...
-                        if ("systemClassLoader".equals(ev.getPropertyName())) { // NOI18N
-                            docsLoader = null;
-                        }
+                classLoaderQuery.addLookupListener(new LookupListener() {
+                    public void resultChanged(LookupEvent e) {
+                        docsLoader = null;
                     }
                 });
                 addedTmSysLoaderListener = true;

File junit/build.xml

View file
         <fileset dir="../openide/netbeans/lib">
           <include name="openide*.jar" />
         </fileset>
+        <!-- XXX -->
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/>
+        <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
         <fileset dir="external">
           <include name="junit*.jar"/>
         </fileset>

File nbbuild/build.properties

View file
 # root of the source tree, separated by commas.
 moduleconfig=stable
 
+# XXX remove */deprecated when autoupdate no longer requires them
 config.fixedmodules.platform=core, \
         openide, \
+        openide/deprecated, \
+        core/deprecated, \
         core/ui, \
         core/windows
 config.modules.platform=autoupdate, \
 
 config.fixedmodules.superslim=core, \
         openide, \
+        openide/deprecated, \
+        core/deprecated, \
+        java/srcmodel, \
         core/javahelp, \
         core/compiler, \
         core/execution, \

File nbbuild/build.xml

View file
     <echo message="Building Open APIs..."/>
     <ant dir="../openide" target="netbeans"/>
   </target>
-  <target name="all-core" depends="all-openide">
+  <target name="all-openide/deprecated" depends="all-openide,all-java/srcmodel">
+    <echo message="Building openide/deprecated..."/>
+    <ant dir="../openide/deprecated" target="netbeans"/>
+  </target>
+  <target name="all-core/deprecated" depends="all-openide/deprecated,all-core">
+    <echo message="Building core/deprecated..."/>
+    <ant dir="../core/deprecated" target="netbeans"/>
+  </target>
+  <target name="all-java/srcmodel" depends="all-openide">
+    <echo message="Building java/srcmodel..."/>
+    <ant dir="../java/srcmodel" target="netbeans"/>
+  </target>
+  <target name="all-core" depends="all-openide,all-openide/deprecated">
     <echo message="Building IDE core implementation..."/>
     <ant dir="../core" target="netbeans"/>
   </target>
-  <target name="all-core/javahelp" depends="all-openide">
+  <target name="all-core/javahelp" depends="all-openide,all-openide/deprecated">
     <echo message="Building module core/javahelp..."/>
     <ant dir="../core/javahelp" target="netbeans"/>
   </target>
-  <target name="all-core/compiler" depends="all-openide,all-core">
+  <target name="all-core/compiler" depends="all-openide,all-core,all-openide/deprecated">
     <echo message="Building module core/compiler..."/>
     <ant dir="../core/compiler" target="netbeans"/>
   </target>
   </target>
 
   <!-- And the modules: -->
-  <target name="all-ant" depends="all-openide,all-core/javahelp">
+  <target name="all-ant" depends="all-openide,all-core/javahelp,all-openide/deprecated">
     <echo message="Building module ant..."/>
     <ant dir="../ant" target="netbeans"/>
   </target>
     <echo message="Building module ant/docs..."/>
     <ant dir="../ant/docs" target="netbeans"/>
   </target>
-  <target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-jarpackager,all-apisupport/lite,all-java/api">
+  <target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-jarpackager,all-apisupport/lite,all-java/api,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module apisupport..."/>
     <ant dir="../apisupport" target="netbeans"/>
   </target>
     <ant dir="../apisupport/ant" target="netbeans"/>
   </target>
   <!-- #27098: MakeParserDB requires several modules to have been successfully built: -->
-  <target name="all-apisupport/apidocs" depends="all-openide,all-apisupport,all-core,all-classfile,all-java,all-java/api,all-editor">
+  <target name="all-apisupport/apidocs" depends="all-openide,all-apisupport,all-core,all-classfile,all-java,all-java/api,all-editor,all-java/srcmodel,all-openide/deprecated,all-core/deprecated">
     <echo message="Building module apisupport/apidocs..."/>
     <ant dir="../apisupport/apidocs" target="netbeans"/>
   </target>
-  <target name="all-apisupport/lite" depends="all-openide,all-core,all-jarpackager">
+  <target name="all-apisupport/lite" depends="all-openide,all-core,all-jarpackager,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module apisupport lite..."/>
     <ant dir="../apisupport/lite" target="netbeans"/>
   </target>
-  <target name="all-applet" depends="all-openide,all-debuggercore">
+  <target name="all-applet" depends="all-openide,all-debuggercore,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module applet..."/>
     <ant dir="../applet" target="netbeans"/>
   </target>
-  <target name="all-autoupdate" depends="all-openide,all-core">
+  <target name="all-autoupdate" depends="all-openide,all-core,all-openide/deprecated">
     <echo message="Building module autoupdate..."/>
     <ant dir="../autoupdate" target="netbeans"/>
   </target>
-  <target name="all-beans" depends="all-openide,all-java">
+  <target name="all-beans" depends="all-openide,all-java,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module beans..."/>
     <ant dir="../beans" target="netbeans"/>
   </target>
     <echo message="Building module classclosure..."/>
     <ant dir="../classclosure" target="netbeans"/>
   </target>
-  <target name="all-clazz" depends="all-openide,all-classfile">
+  <target name="all-clazz" depends="all-openide,all-classfile,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module clazz..."/>
     <ant dir="../clazz" target="netbeans"/>
   </target>
     <echo message="Building module db..."/>
     <ant dir="../db" target="netbeans"/>
   </target>
-  <target name="all-debuggercore" depends="all-openide">
+  <target name="all-debuggercore" depends="all-openide,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module debuggercore..."/>
     <ant dir="../debuggercore" target="netbeans"/>
   </target>
-  <target name="all-debuggerjpda" depends="all-openide,all-debuggercore">
+  <target name="all-debuggerjpda" depends="all-openide,all-debuggercore,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module debuggerjpda..."/>
     <ant dir="../debuggerjpda" target="netbeans"/>
   </target>
     <ant dir="../debuggertools" target="netbeans"/>
   </target>
   <!-- XXX illegal dependence on core! -->
-  <target name="all-editor" depends="all-openide,all-core">
+  <target name="all-editor" depends="all-openide,all-core,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module editor..."/>
     <ant dir="../editor" target="netbeans"/>
   </target>
-  <target name="all-diff" depends="all-openide,all-editor">
+  <target name="all-diff" depends="all-openide,all-editor,all-openide/deprecated">
     <echo message="Building module diff..."/>
     <ant dir="../diff" target="netbeans"/>
   </target>
-  <target name="all-extbrowser" depends="all-openide,all-httpserver">
+  <target name="all-extbrowser" depends="all-openide,all-httpserver,all-openide/deprecated">
     <echo message="Building module extbrowser..."/>
     <ant dir="../extbrowser" target="netbeans"/>
   </target>
     <ant dir="../extbrowser/webclient" target="netbeans"/>
   </target>
   <!-- XXX illegal dependence on core! -->
-  <target name="all-form" depends="all-openide,all-java,all-core">
+  <target name="all-form" depends="all-openide,all-java,all-core,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module form..."/>
     <ant dir="../form" target="netbeans"/>
   </target>
     <echo message="Building module freestylebrowser..."/>
     <ant dir="../freestylebrowser" target="netbeans"/>
   </target>
-  <target name="all-html" depends="all-openide">
+  <target name="all-html" depends="all-openide,all-openide/deprecated">
     <echo message="Building module html..."/>
     <ant dir="../html" target="netbeans"/>
   </target>
-  <target name="all-httpserver" depends="all-openide, all-httpserver/servletapi">
+  <target name="all-httpserver" depends="all-openide, all-httpserver/servletapi,all-openide/deprecated">
     <echo message="Building module httpserver..."/>
     <ant dir="../httpserver" target="netbeans"/>
   </target>
     <echo message="Building module httpserver/servletapi..."/>
     <ant dir="../httpserver/servletapi" target="netbeans"/>
   </target>
-  <target name="all-i18n" depends="all-openide,all-core,all-properties,all-form">
+  <target name="all-i18n" depends="all-openide,all-core,all-properties,all-form,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module i18n..."/>
     <ant dir="../i18n" target="netbeans"/>
   </target>
     <echo message="Building module icebrowser..."/>
     <ant dir="../icebrowser" target="netbeans"/>
   </target>
-  <target name="all-image" depends="all-openide">
+  <target name="all-image" depends="all-openide,all-openide/deprecated">
     <echo message="Building module image..."/>
     <ant dir="../image" target="netbeans"/>
   </target>
     <echo message="Building module innertesters..."/>
     <ant dir="../innertesters" target="netbeans"/>
   </target>
-  <target name="all-j2eeserver" depends="all-openide,all-jarpackager,all-debuggercore,all-debuggerjpda">
+  <target name="all-j2eeserver" depends="all-openide,all-jarpackager,all-debuggercore,all-debuggerjpda,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module j2eeserver..."/>
     <ant dir="../j2eeserver" target="netbeans"/>
   </target>
     <echo message="Building module junit..."/>
     <ant dir="../junit" target="netbeans"/>
   </target>
-  <target name="all-jarpackager" depends="all-openide">
+  <target name="all-jarpackager" depends="all-openide,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module jarpackager..."/>
     <ant dir="../jarpackager" target="netbeans"/>
   </target>
-  <target name="all-java" depends="all-openide,all-java/api,all-classfile">
+  <target name="all-java" depends="all-openide,all-java/api,all-classfile,all-java/srcmodel,all-openide/deprecated">
     <echo message="Building module java..."/>
     <ant dir="../java" target="netbeans"/>
   </target>
     <echo message="Building Java support APIs.."/>
     <ant dir="../java/api" target="netbeans"/>
   </target>
-  <target name="all-javadoc" depends="all-openide,all-java">
+  <target name="all-javadoc" depends="all-openide,all-java,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module javadoc..."/>
     <ant dir="../javadoc" target="netbeans"/>
   </target>
     <echo message="Building module jini..."/>
     <ant dir="../jini" target="netbeans"/>
   </target>
-  <target name="all-jndi" depends="all-openide,all-openidex">
+  <target name="all-jndi" depends="all-openide,all-openidex,all-openide/deprecated">
     <echo message="Building module jndi..."/>
     <ant dir="../jndi" target="netbeans"/>
   </target>
     <echo message="Building module objectbrowser..."/>
     <ant dir="../objectbrowser" target="netbeans"/>
   </target>
-  <target name="all-openidex" depends="all-openide">
+  <target name="all-openidex" depends="all-openide,all-openide/deprecated">
     <echo message="Building module openidex..."/>
     <ant dir="../openidex" target="netbeans"/>
   </target>
-  <target name="all-projects" depends="all-openide,all-core">
+  <target name="all-projects" depends="all-openide,all-core,all-openide/deprecated">
     <echo message="Building module projects..."/>
     <ant dir="../projects" target="netbeans"/>
   </target>
-  <target name="all-properties" depends="all-openide,all-editor">
+  <target name="all-properties" depends="all-openide,all-editor,all-openide/deprecated">
     <echo message="Building module properties..."/>
     <ant dir="../properties" target="netbeans"/>
   </target>
     <echo message="Building module remotefs..."/>
     <ant dir="../remotefs" target="netbeans"/>
   </target>
-  <target name="all-rmi" depends="all-openide,all-java,all-debuggercore">
+  <target name="all-rmi" depends="all-openide,all-java,all-debuggercore,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module rmi..."/>
     <ant dir="../rmi" target="netbeans"/>
   </target>
     <ant dir="../schema2beans" target="netbeans"/>
   </target>
   <!-- XXX illegal dependence on core! -->
-  <target name="all-scripting" depends="all-openide,all-openidex,all-core">
+  <target name="all-scripting" depends="all-openide,all-openidex,all-core,all-openide/deprecated">
     <echo message="Building module scripting..."/>
     <ant dir="../scripting" target="netbeans"/>
   </target>
     <echo message="Building module testtools..."/>
     <ant dir="../testtools" target="netbeans"/>
   </target>
-  <target name="all-text" depends="all-openide">
+  <target name="all-text" depends="all-openide,all-openide/deprecated">
     <echo message="Building module text..."/>
     <ant dir="../text" target="netbeans"/>
   </target>
     <echo message="Building module tomcatint/tomcat32..."/>
     <ant dir="../tomcatint/tomcat32" target="netbeans"/>
   </target>
-  <target name="all-tomcatint/tomcat40" depends="all-openide,all-web/core,all-schema2beans">
+  <target name="all-tomcatint/tomcat40" depends="all-openide,all-web/core,all-schema2beans,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module tomcatint/tomcat40..."/>
     <ant dir="../tomcatint/tomcat40" target="netbeans"/>
   </target>
     <echo message="Building module usersguide..."/>
     <ant dir="../usersguide" target="netbeans"/>
   </target>
-  <target name="all-utilities" depends="all-openide,all-openidex,all-core/settings">
+  <target name="all-utilities" depends="all-openide,all-openidex,all-core/settings,all-openide/deprecated">
     <echo message="Building module utilities..."/>
     <ant dir="../utilities" target="netbeans"/>
   </target>
     <echo message="Building module vcscvs compat..."/>
     <ant dir="../vcscvs/compat" target="netbeans"/>
   </target>
-  <target name="all-vcsgeneric" depends="all-openide,all-openidex,all-vcscore,all-diff">
+  <target name="all-vcsgeneric" depends="all-openide,all-openidex,all-vcscore,all-diff,all-openide/deprecated">
     <echo message="Building module vcsgeneric..."/>
     <ant dir="../vcsgeneric" target="netbeans"/>
   </target>
 
-  <target name="all-vcsgeneric/profiles/cvsprofiles" depends="all-vcsgeneric">
+  <target name="all-vcsgeneric/profiles/cvsprofiles" depends="all-vcsgeneric,all-openide/deprecated">
     <echo message="Building module vcsgeneric/profiles/cvsprofiles"/>
     <ant dir="../vcsgeneric/profiles/cvsprofiles" target="netbeans"/>
   </target>
 
-  <target name="all-vcsgeneric/profiles/pvcs" depends="all-vcsgeneric">
+  <target name="all-vcsgeneric/profiles/pvcs" depends="all-vcsgeneric,all-openide/deprecated">
     <echo message="Building module vcsgeneric/profiles/pvcs"/>
     <ant dir="../vcsgeneric/profiles/pvcs" target="netbeans"/>
   </target>
   </target>
 
   <!-- XXX check editor dependecy -->
-  <target name="all-vcscore" depends="all-openide,all-openidex,all-editor">
+  <target name="all-vcscore" depends="all-openide,all-openidex,all-editor,all-openide/deprecated">
     <echo message="Building module vcscore..."/>
     <ant dir="../vcscore" target="netbeans"/>
   </target>
-  <target name="all-javacvs" depends="all-openide,all-openidex,all-vcscore, all-diff">
+  <target name="all-javacvs" depends="all-openide,all-openidex,all-vcscore, all-diff,all-openide/deprecated">
     <echo message="Building module javacvs..."/>
     <ant dir="../javacvs" target="netbeans"/>
   </target>
     <ant dir="../web/servletapi23" target="netbeans"/>
   </target>
   <!-- XXX illegal dependence on core! -->
-  <target name="all-web/core" depends="all-openide,all-java,all-core,all-editor,all-j2eeserver,all-html,all-httpserver,all-jarpackager,all-debuggercore,all-openidex,all-schema2beans,all-xml/api">
+  <target name="all-web/core" depends="all-openide,all-java,all-core,all-editor,all-j2eeserver,all-html,all-httpserver,all-jarpackager,all-debuggercore,all-openidex,all-schema2beans,all-xml/api,all-openide/deprecated,all-java/srcmodel">
     <echo message="Building module web/core..."/>
     <ant dir="../web/core" target="netbeans"/>
   </target>
-  <target name="all-web/jspparser" depends="all-web/core,all-web/servletapi23">
+  <target name="all-web/jspparser" depends="all-web/core,all-web/servletapi23,all-openide/deprecated">
     <echo message="Building module web/jspparser..."/>
     <ant dir="../web/jspparser" target="netbeans"/>
   </target>
-  <target name="all-web/jspsyntax" depends="all-web/core,all-xml/text-edit">
+  <target name="all-web/jspsyntax" depends="all-web/core,all-xml/text-edit,all-openide/deprecated">
     <echo message="Building module web/jspsyntax..."/>
     <ant dir="../web/jspsyntax" target="netbeans"/>
   </target>
   </target>
 
   <!-- XXX illegal dependence on core! -->
-  <target name="all-ui/welcome" depends="all-openide,all-core,all-utilities">
+  <target name="all-ui/welcome" depends="all-openide,all-core,all-utilities,all-openide/deprecated">
     <echo message="Building module ui/welcome..."/>
     <ant dir="../ui/welcome" target="netbeans"/>
   </target>
       <ant dir="../xml/api" target="netbeans"/>
   </target>
 
-  <target name="all-xml/tax" depends="all-openide, all-xml/api">
+  <target name="all-xml/tax" depends="all-openide, all-xml/api,all-openide/deprecated">
       <echo message="Building module xml/tax..."/>
       <ant dir="../xml/tax" target="netbeans"/>
   </target>
 
-  <target name="all-xml/core" depends="all-openide, all-openidex, all-xml/api, all-xml/tax">
+  <target name="all-xml/core" depends="all-openide, all-openidex, all-xml/api, all-xml/tax,all-openide/deprecated">
       <echo message="Building module xml/core..."/>
       <ant dir="../xml/core" target="netbeans"/>
   </target>
 
-  <target name="all-xml/catalog" depends="all-openide, all-xml/api, all-xml/core">
+  <target name="all-xml/catalog" depends="all-openide, all-xml/api, all-xml/core,all-openide/deprecated">
       <echo message="Building module xml/catalog..."/>
       <ant dir="../xml/catalog" target="netbeans"/>
   </target>
 
-  <target name="all-xml/tools" depends="all-openide, all-libs/jaxp, all-xml/api, all-xml/tax, all-xml/core">
+  <target name="all-xml/tools" depends="all-openide, all-libs/jaxp, all-xml/api, all-xml/tax, all-xml/core,all-openide/deprecated,all-java/srcmodel">
       <echo message="Building module xml/tools..."/>
       <ant dir="../xml/tools" target="netbeans"/>
   </target>
       <ant dir="../xml/text-edit" target="netbeans"/>
   </target>
 
-  <target name="all-xml/tree-edit" depends="all-openide, all-openidex, all-xml/api, all-xml/tax, all-xml/core">
+  <target name="all-xml/tree-edit" depends="all-openide, all-openidex, all-xml/api, all-xml/tax, all-xml/core,all-openide/deprecated">
       <echo message="Building module xml/tree-edit..."/>
       <ant dir="../xml/tree-edit" target="netbeans"/>
   </target>
 
-  <target name="all-xml/css" depends="all-openide, all-editor, all-xml/api">
+  <target name="all-xml/css" depends="all-openide, all-editor, all-xml/api,all-openide/deprecated">
       <echo message="Building module xml/css..."/>
       <ant dir="../xml/css" target="netbeans"/>
   </target>
 
-  <target name="all-xml/xsl" depends="all-openide, all-httpserver/servletapi, all-libs/jaxp, all-xml/api, all-xml/tax, all-xml/core">
+  <target name="all-xml/xsl" depends="all-openide, all-httpserver/servletapi, all-libs/jaxp, all-xml/api, all-xml/tax, all-xml/core,all-openide/deprecated">
       <echo message="Building module xml/xsl..."/>
       <ant dir="../xml/xsl" target="netbeans"/>
   </target>

File o.apache.tools.ant.module/build.xml

View file
     <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
       <classpath>
         <pathelement location="../openide/openide-13javac-workaround.jar"/>
-        <fileset dir="../openide/netbeans/lib">
-          <include name="openide*.jar" />
-        </fileset>
+        <pathelement location="../openide/netbeans/lib/openide.jar"/>
+        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
         <fileset dir="external">
           <include name="ant-1.*.jar"/>
         </fileset>

File o.apache.tools.ant.module/manifest.mf

View file
 Manifest-Version: 1.0
 OpenIDE-Module: org.apache.tools.ant.module/2
 OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.11
+OpenIDE-Module-Specification-Version: 2.12
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
 OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.javahelp/1 > 1.0
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
+OpenIDE-Module-Module-Dependencies: org.netbeans.modules.javahelp/1 > 1.0, org.openide.deprecated > 1.0
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
+OpenIDE-Module-Requires: org.openide.TopManager
 OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location], [org.apache.xerces.parsers.DOMParser], [org.apache.xml.serialize.EncodingInfo]
 Class-Path: ext/ant-1.4.1.jar ext/ant-optional-1.4.1.jar
 

File o.n.core/manifest.mf

View file
 OpenIDE-Module: org.netbeans.core/1
-OpenIDE-Module-Specification-Version: 1.6
+OpenIDE-Module-Specification-Version: 1.7
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.21
 OpenIDE-Module-Localizing-Bundle: org/netbeans/core/Bundle.properties

File o.n.core/src/META-INF/services/java.awt.datatransfer.Clipboard

View file
+org.netbeans.core.NbClipboard

File o.n.core/src/META-INF/services/org.openide.LifecycleManager

View file
+org.netbeans.core.NbTopManager$NbLifecycleManager

File o.n.core/src/META-INF/services/org.openide.awt.HtmlBrowser$URLDisplayer

View file
+org.netbeans.core.NbTopManager$NbURLDisplayer

File o.n.core/src/META-INF/services/org.openide.awt.StatusDisplayer

View file
+org.netbeans.core.NbTopManager$NbStatusDisplayer

File o.n.core/src/META-INF/services/org.openide.loaders.RepositoryNodeFactory

View file
+org.netbeans.core.DataSystem$NbRepositoryNodeFactory

File o.n.core/src/org/netbeans/beaninfo/Bundle.properties

View file
 HINT_PEBI_workingDirectory_RW=The working directory to start the process in. If "null", the IDE's directory is used.
 HINT_PEBI_workingDirectory_RO=NOTE: you need JDK 1.3 (release version) to use this feature!
 
-LAB_DebuggerTypeDefault=Default Debugging
-HINT_DebuggerTypeDefault=Simple debugging according to the debugger's own preferences.
-
 LAB_CompilerType=Compiler Types
 HINT_CompilerType=All types of compilers registered in the system.
 
 LAB_IndentEngineDefault=No Indentation
 HINT_IndentEngineDefault=No Indentation
 
-LAB_DebuggerType=Debugger Types
-HINT_DebuggerType=All types of debuggers registered in the system.
-
 LAB_ExecutorType=Execution Types
 HINT_ExecutorType=All types of executors registered in the system.
 
 HINT_SwingBrowser=Simple HTML Browser based on Swing component
 PROP_SwingBrowserDescription=Browser Description
 HINT_SwingBrowserDescription=Description of HTML browser
-
-# MemberElementBeanInfo
-PROP_MEMBER_NAME=Name
-PROP_MEMBER_JAVADOC=JavaDoc comment
-PROP_MEMBER_MODIFIERS=Modifiers
-
-# ClassElementBeanInfo
-PROP_CLASS_SUPERCLASS=Superclass
-PROP_CLASS_INTERFACES=Interfaces
-PROP_CLASS_IS_CLASS=Is class
-
-# ConstructorElementBeanInfo
-PROP_METHOD_BODY=Body
-PROP_METHOD_PARAMETERS=Parameters
-PROP_METHOD_EXCEPTIONS=Exceptions
-
-# MethodElementBeanInfo
-PROP_METHOD_TYPE=Return type
-
-# FieldElementBeanInfo
-PROP_FIELD_TYPE=Type
-PROP_FIELD_INIT_VALUE=Initial value

File o.n.core/src/org/netbeans/beaninfo/editors/Bundle.properties

View file
 
 #ServiceTypeEditor + Debbuger, exec, compiler
 LAB_DefaultServiceType=Default
-LAB_ChooseDebugger=Choose and Configure Object's Debugger
 LAB_ChooseExecutor=Choose and Configure Object's Executor
 LAB_ChooseCompiler=Choose and Configure Object's Compiler
 LAB_ChooseIndentEngine=Choose and Configure Indentation Engine
 LAB_ChooseServiceType=Choose and Configure Service Type
-LAB_NoDebugger=(do not debug)
 LAB_NoCompiler=(do not compile)
 LAB_NoExecutor=(do not execute)
 # {0} - class name
-EXC_NoDebugger=The class {0} is not configured to be debugged.\nYou may change this if you wish.
-# {0} - class name
 EXC_NoExecutor=The class {0} is not configured to be executed.\nYou may change this if you wish.
 # {0} - file name as resource
 MSG_NoCompiler=The file {0} is not configured to be compiled. You can change this on its property sheet.
 ACSN_DataObjectPanel=N/A
 ACSD_DataObjectPanel=N/A
 
+#StringArrayCustomEditor
+CTL_Empty=<empty>
+CTL_Item=Item:
+CTL_Item_Mnemonic=I
+ACSD_CTL_Item=N/A
+CTL_ItemList=Item List
+CTL_ItemList_Mnemonic=L
+ACSD_CTL_ItemList=N/A
+CTL_Add_StringArrayCustomEditor=Add
+CTL_Add_StringArrayCustomEditor_Mnemonic=A
+ACSD_CTL_Add_StringArrayCustomEditor=N/A
+CTL_Change_StringArrayCustomEditor=Edit
+CTL_Change_StringArrayCustomEditor_Mnemonic=E
+ACSD_CTL_Change_StringArrayCustomEditor=N/A
+CTL_Remove=Remove
+CTL_Remove_Mnemonic=R
+ACSD_CTL_Remove=N/A
+CTL_MoveUp=Up
+CTL_MoveUp_Mnemonic=U
+ACSD_CTL_MoveUp=N/A
+CTL_MoveDown=Down
+CTL_MoveDown_Mnemonic=w
+ACSD_CTL_MoveDown=N/A
+ACSD_StringArrayCustomEditor=N/A

File o.n.core/src/org/netbeans/beaninfo/editors/ClassEditor.java

View file
 
 package org.netbeans.beaninfo.editors;
 
+
+import org.openide.util.Lookup;
+
 /** A property editor for Class.
 * @author   Jan Jancura
 */
     */
     public void setAsText(String text) throws java.lang.IllegalArgumentException {
         try {
-            setValue (org.openide.TopManager.getDefault ().systemClassLoader ().loadClass (text));
+            ClassLoader loader = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+            setValue (loader.loadClass (text));
         } catch (ClassNotFoundException e) {
             // ignore
         }

File o.n.core/src/org/netbeans/beaninfo/editors/ColorEditor.java

View file
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;
 import org.openide.util.HelpCtx;

File o.n.core/src/org/netbeans/beaninfo/editors/DataFolderPanel.java

View file
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 
-import org.openide.TopManager;
 import org.openide.DialogDescriptor;
 import org.openide.ErrorManager;
-import org.openide.Places;
 import org.openide.WizardDescriptor;
 import org.openide.loaders.*;
 import org.openide.nodes.*;
     /** Creates node that displays all packages.
     */
     private Node createPackagesNode () {
-        return ((Places)Lookup.getDefault ().lookup( Places.class )).nodes ().repository(
-                   this
-               );
+        return RepositoryNodeFactory.getDefault().repository(this);
     }
 
     /** This method is called from within the constructor to

File o.n.core/src/org/netbeans/beaninfo/editors/DataObjectEditor.java

View file
 
 import java.beans.*;
 
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.util.NbBundle;
 import org.openide.loaders.DataObject;

File o.n.core/src/org/netbeans/beaninfo/editors/DataObjectPanel.java

View file
                             return dataFilter.acceptDataObject(obj);
                         }
                     };
-                    rootNode = TopManager.getDefault().getPlaces().
-                    nodes().repository(dFilter);
+                    rootNode = RepositoryNodeFactory.getDefault().repository(dFilter);
                 } else {
-                    rootNode = TopManager.getDefault().getPlaces().
-                    nodes().repository(dataFilter);
+                    rootNode = RepositoryNodeFactory.getDefault().repository(dataFilter);
                 }
             } else {
                 if (folderFilter != null) {
-                    rootNode = TopManager.getDefault().getPlaces().
-                    nodes().repository(folderFilter);
+                    rootNode = RepositoryNodeFactory.getDefault().repository(folderFilter);
                 } else {
-                    rootNode = TopManager.getDefault().getPlaces().
-                    nodes().repository();
+                    rootNode = RepositoryNodeFactory.getDefault().repository(DataFilter.ALL);
                 }
             }
         }

File o.n.core/src/org/netbeans/beaninfo/editors/DimensionCustomEditor.java

View file
 import java.util.ResourceBundle;
 
 import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.util.NbBundle;
 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;

File o.n.core/src/org/netbeans/beaninfo/editors/DimensionEditor.java

View file
 import java.awt.Dimension;
 import java.util.ResourceBundle;
 
-import org.openide.TopManager;
 import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
 
     */
     void setValues(int[] val) {
         if ((val[0] < 0) || (val[1] < 0)) {
-            //TopManager.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
+            //DialogDisplayer.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
             //PropertyEditor lost focus and setValues() method is called. After closing error dialog is focus returned
             //to PropertyEditor and setValues() method is called again.
             javax.swing.SwingUtilities.invokeLater(new Runnable() {
-                                                       public void run() {
-                                                           TopManager.getDefault().notify(new NotifyDescriptor.Message(bundle.getString("CTL_NegativeSize"), NotifyDescriptor.ERROR_MESSAGE));
-                                                       }
-                                                   });
+                   public void run() {
+                       org.openide.DialogDisplayer.getDefault().notify(
+                           new NotifyDescriptor.Message(
+                               bundle.getString("CTL_NegativeSize"),
+                               NotifyDescriptor.ERROR_MESSAGE));
+                   }
+               });
         }
         else
             setValue(new Dimension(val[0], val[1]));

File o.n.core/src/org/netbeans/beaninfo/editors/ExtensionListCustomEditor.java

View file
 
 import javax.swing.*;
 import javax.swing.border.*;
-import org.openide.explorer.propertysheet.editors.StringArrayCustomizable;
 import org.openide.loaders.ExtensionList;
 
 //import org.openide.util.HelpCtx;

File o.n.core/src/org/netbeans/beaninfo/editors/ExtensionListEditor.java

View file
 import org.openide.loaders.ExtensionList;
 import org.openide.util.enum.ArrayEnumeration;
 import org.openide.util.NbBundle;
-import org.openide.explorer.propertysheet.editors.*;
 import org.openide.nodes.Node;
 
 /** Property editor for {@link ExtensionList}s.
 * @author Jaroslav Tulach
 * @version 0.11 November 11, 1997
 */
-public class ExtensionListEditor extends Object implements PropertyEditor, StringArrayCustomizable,
+public class ExtensionListEditor extends Object implements PropertyEditor,
         ExPropertyEditor {
     /** value to edit */
     private ExtensionList value;

File o.n.core/src/org/netbeans/beaninfo/editors/FileArrayEditor.java

View file
 import javax.swing.JFileChooser;
 
 import org.openide.ErrorManager;
-import org.openide.TopManager;
 import org.openide.nodes.Node;
 import org.openide.explorer.propertysheet.ExPropertyEditor;
 import org.openide.explorer.propertysheet.PropertyEnv;

File o.n.core/src/org/netbeans/beaninfo/editors/FileEditor.java

View file
 import javax.swing.KeyStroke;
 
 import org.openide.ErrorManager;
-import org.openide.TopManager;
 import org.openide.nodes.Node;
 import org.openide.explorer.propertysheet.ExPropertyEditor;
 import org.openide.explorer.propertysheet.PropertyEnv;

File o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java

View file
 import javax.swing.border.*;
 import javax.swing.event.*;
 
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;
 import org.openide.util.HelpCtx;

File o.n.core/src/org/netbeans/beaninfo/editors/HtmlBrowser.java

View file
 import java.util.Iterator;
 
 import org.openide.ErrorManager;
-import org.openide.TopManager;
 import org.openide.cookies.InstanceCookie;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.Repository;

File o.n.core/src/org/netbeans/beaninfo/editors/IndentEngineEditor.java

View file
 import java.text.MessageFormat;
 
 import org.openide.compiler.*;
-import org.openide.TopManager;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.loaders.*;

File o.n.core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.java

View file
 import java.util.ResourceBundle;
 
 import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.util.NbBundle;
 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;

File o.n.core/src/org/netbeans/beaninfo/editors/InsetsEditor.java

View file
 import java.awt.Insets;
 import java.util.ResourceBundle;
 
-import org.openide.TopManager;
 import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
 
     */
     void setValues(int[] val) {
         if ((val[0] < 0) || (val[1] < 0) || (val[2] < 0) || (val[3] < 0)) {
-            //TopManager.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
+            //DialogDisplayer.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
             //PropertyEditor lost focus and setValues() method is called. After closing error dialog is focus returned
             //to PropertyEditor and setValues() method is called again.
             javax.swing.SwingUtilities.invokeLater(new Runnable() {
-                                                       public void run() {
-                                                           TopManager.getDefault().notify(new NotifyDescriptor.Message(bundle.getString("CTL_NegativeSize"), NotifyDescriptor.ERROR_MESSAGE));
-                                                       }
-                                                   });
+                   public void run() {
+                       org.openide.DialogDisplayer.getDefault().notify(
+                           new NotifyDescriptor.Message(
+                               bundle.getString("CTL_NegativeSize"),
+                               NotifyDescriptor.ERROR_MESSAGE));
+                   }
+               });
         }
         else
             setValue(new Insets(val[0], val[1], val[2], val[3]));

File o.n.core/src/org/netbeans/beaninfo/editors/ObjectEditor.java

View file
 import java.awt.Component;
 import java.util.*;
 
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.cookies.InstanceCookie;
 import org.openide.filesystems.*;
     protected synchronized Node root () {
         if (root == null) {
             root = new org.netbeans.core.ui.LookupNode (
-                org.netbeans.core.NbPlaces.findSessionFolder ("/Services") // NOI18N
+                org.netbeans.core.NbPlaces.getDefault().findSessionFolder ("/Services") // NOI18N
             ); 
         }
         return root;

File o.n.core/src/org/netbeans/beaninfo/editors/PointCustomEditor.java

View file
 import java.util.ResourceBundle;
 
 import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.util.NbBundle;
 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;

File o.n.core/src/org/netbeans/beaninfo/editors/PointEditor.java

View file
 import java.awt.Point;
 import java.util.ResourceBundle;
 
-import org.openide.TopManager;
 import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
 
     */
     void setValues(int[] val) {
         if ((val[0] < 0) || (val[1] < 0)) {
-            //TopManager.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
+            //DilaogDisplayer.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
             //PropertyEditor lost focus and setValues() method is called. After closing error dialog is focus returned
             //to PropertyEditor and setValues() method is called again.
             javax.swing.SwingUtilities.invokeLater(new Runnable() {
-                                                       public void run() {
-                                                           TopManager.getDefault().notify(new NotifyDescriptor.Message(bundle.getString("CTL_NegativeSize"), NotifyDescriptor.ERROR_MESSAGE));
-                                                       }
-                                                   });
+                   public void run() {
+                       org.openide.DialogDisplayer.getDefault().notify(
+                           new NotifyDescriptor.Message(
+                               bundle.getString("CTL_NegativeSize"),
+                               NotifyDescriptor.ERROR_MESSAGE));
+                   }
+               });
         }
         else
             setValue(new Point(val[0], val[1]));

File o.n.core/src/org/netbeans/beaninfo/editors/PropertiesCustomEditor.java

View file
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
 
 /** A custom editor for Properties.
  *
             NotifyDescriptor.Confirmation nd = new NotifyDescriptor.Confirmation(
                     NbBundle.getBundle(PropertiesCustomEditor.class).getString("MSG_PropertiesComments")
                 );
-            if ( !TopManager.getDefault().notify( nd ).equals( NotifyDescriptor.YES_OPTION ) ) {
+            if ( !org.openide.DialogDisplayer.getDefault().notify( nd )
+            .equals( NotifyDescriptor.YES_OPTION ) ) {
                 throw new IllegalStateException();
             }
         }

File o.n.core/src/org/netbeans/beaninfo/editors/PropertiesEditor.java

View file
 import java.util.Properties;
 
 import org.openide.ErrorManager;
-import org.openide.TopManager;
 
 
 /** A property editor for Properties class.

File o.n.core/src/org/netbeans/beaninfo/editors/RectangleCustomEditor.java

View file
 import java.util.ResourceBundle;
 
 import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
 import org.openide.ErrorManager;
 import org.openide.util.NbBundle;
 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;

File o.n.core/src/org/netbeans/beaninfo/editors/RectangleEditor.java

View file
 import java.awt.Rectangle;
 import java.util.ResourceBundle;
 
-import org.openide.TopManager;
 import org.openide.NotifyDescriptor;
 import org.openide.util.NbBundle;
 
     */
     void setValues(int[] val) {
         if ((val[0] < 0) || (val[1] < 0) || (val[2] < 0) || (val[3] < 0)) {
-            //TopManager.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
+            //DialogDisplayer.getDefault().notify(...) cannot be called synchronous, because when error dialog is displayed
             //PropertyEditor lost focus and setValues() method is called. After closing error dialog is focus returned
             //to PropertyEditor and setValues() method is called again.
             javax.swing.SwingUtilities.invokeLater(new Runnable() {
-                                                       public void run() {
-                                                           TopManager.getDefault().notify(new NotifyDescriptor.Message(bundle.getString("CTL_NegativeSize"), NotifyDescriptor.ERROR_MESSAGE));
-                                                       }
-                                                   });
+                   public void run() {
+                       org.openide.DialogDisplayer.getDefault().notify(
+                           new NotifyDescriptor.Message(
+                               bundle.getString("CTL_NegativeSize"),
+                               NotifyDescriptor.ERROR_MESSAGE));
+                   }
+               });
         }
         else
             setValue(new Rectangle(val[0], val[1], val[2], val[3]));

File o.n.core/src/org/netbeans/beaninfo/editors/ServiceTypeEditor.java

View file
 import java.util.ArrayList;
 import java.util.Enumeration;
 
-import org.openide.TopManager;
+import org.openide.filesystems.Repository;
 import org.openide.ServiceType;
 import org.openide.execution.Executor;
 import org.openide.explorer.propertysheet.*;
+import org.openide.util.Lookup;
+
 
 /** Support for property editor for Executor.
 *
      */
     private void updateTags () {
         java.util.LinkedList names = new java.util.LinkedList ();
-        Enumeration ee = TopManager.getDefault ().getServices ().services (clazz);
+        ServiceType.Registry registry = (ServiceType.Registry)Lookup.getDefault ()
+                .lookup (ServiceType.Registry.class);
+        Enumeration ee = registry.services (clazz);
         while (ee.hasMoreElements()) {
             ServiceType e = (ServiceType) ee.nextElement();
             names.add(e.getName());
         if (none != null && none.getName ().equals (text))
             setValue (none);
         else {
-            Enumeration en = TopManager.getDefault ().getServices ().services (clazz);
+            ServiceType.Registry registry = (ServiceType.Registry)Lookup.getDefault ()