Date: 02/04/05 07:52:29

  Modified:    tree-edit/src/org/netbeans/modules/xml/tree/resources
                        mf-layer.xml
  Log:
  Fixed bug #21951 - Do not load classes on startup.
  
  Revision  Changes    Path
  1.8       +20 -4     xml/catalog/src/org/netbeans/modules/xml/catalog/resources/mf-layer.xml
  
  http://xml.netbeans.org/source/browse/xml/catalog/src/org/netbeans/modules/xml/catalog/resources/mf-layer.xml.diff?r1=1.7&r2=1.8
(In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: mf-layer.xml
  ===================================================================
  RCS file: /cvs/xml/catalog/src/org/netbeans/modules/xml/catalog/resources/mf-layer.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- mf-layer.xml	2002/03/12 14:38:48	1.7
  +++ mf-layer.xml	2002/04/05 15:52:03	1.8
  @@ -33,10 +33,26 @@
       <folder name="Services">
<folder name="Hidden">
-            <file name="org-netbeans-modules-xml-catalog-CatalogEntityResolver.instance" />
-            <file name="org-netbeans-modules-xml-catalog-impl-SystemCatalogProvider.instance" />
-            <file name="org-netbeans-modules-xml-catalog-impl-XCatalogProvider.instance" />
-            <file name="org-netbeans-modules-xml-catalog-impl-sun-SunCatalogProvider.instance" />
+            <file name="org-netbeans-modules-xml-catalog-CatalogEntityResolver.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.catalog.CatalogEntityResolver" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.catalog.CatalogEntityResolver" />
+                <attr name="instanceOf"    stringvalue="org.xml.sax.EntityResolver, org.netbeans.modules.xml.core.tree.ModuleEntityResolver, org.netbeans.modules.xml.catalog.CatalogEntityResolver" />
+            </file>
+            <file name="org-netbeans-modules-xml-catalog-impl-SystemCatalogProvider.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.catalog.impl.SystemCatalogProvider" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.catalog.impl.SystemCatalogProvider" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.catalog.spi.CatalogProvider, org.netbeans.modules.xml.catalog.impl.SystemCatalogProvider" />
+            </file>
+            <file name="org-netbeans-modules-xml-catalog-impl-XCatalogProvider.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.catalog.impl.XCatalogProvider" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.catalog.impl.XCatalogProvider" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.catalog.spi.CatalogProvider, org.netbeans.modules.xml.catalog.impl.XCatalogProvider" />
+            </file>
+            <file name="org-netbeans-modules-xml-catalog-impl-sun-SunCatalogProvider.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.catalog.impl.sun.SunCatalogProvider" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.catalog.impl.sun.SunCatalogProvider" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.catalog.spi.CatalogProvider, org.netbeans.modules.xml.catalog.impl.sun.SunCatalogProvider" />
+            </file>
<!-- Store mounted catalogs per project. -->
<file name="org-netbeans-modules-xml-catalog-settings-CatalogSettings.settings" url="ProjectSettings.xml">
1.8       +5 -9      xml/text-edit/src/org/netbeans/modules/xml/text/syntax/XMLSettingsInitializer.java
  
  http://xml.netbeans.org/source/browse/xml/text-edit/src/org/netbeans/modules/xml/text/syntax/XMLSettingsInitializer.java.diff?r1=1.7&r2=1.8
(In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XMLSettingsInitializer.java
  ===================================================================
  RCS file: /cvs/xml/text-edit/src/org/netbeans/modules/xml/text/syntax/XMLSettingsInitializer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- XMLSettingsInitializer.java	2002/03/12 14:39:12	1.7
  +++ XMLSettingsInitializer.java	2002/04/05 15:52:20	1.8
  @@ -43,10 +43,9 @@
   import org.netbeans.editor.MultiKeyBinding;
   import org.netbeans.editor.ext.ExtSettingsNames;
   
  -import org.netbeans.modules.xml.core.actions.CollectXMLAction;
  -import org.netbeans.modules.xml.core.actions.CollectDTDAction;
  -
  -
  +/**
  + *
  + */
   public class XMLSettingsInitializer extends Settings.AbstractInitializer {
   
       /** Name assigned to initializer */
  @@ -108,8 +107,7 @@
                   (Arrays.asList (new String[] {
                       OpenAction.class.getName(),
                       null,
  -                    CollectDTDAction.class.getName(),
  -//                     "org.netbeans.modules.xml.tools.actions.CheckDTDAction", // NOI18N
  +                    "org.netbeans.modules.xml.core.actions.CollectDTDAction", // NOI18N
                       null,
                   }));
               dtdActionNames.addAll (commonActionNames);
  @@ -131,9 +129,7 @@
                       OpenAction.class.getName(),
                       ViewAction.class.getName(),
                       null,
  -                    CollectXMLAction.class.getName(),
  -//                     "org.netbeans.modules.xml.tools.actions.CheckAction", // NOI18N
  -//                     "org.netbeans.modules.xml.tools.actions.ValidateAction", // NOI18N
  +                    "org.netbeans.modules.xml.core.actions.CollectXMLAction", // NOI18N
                       null,
                   }));
               xmlActionNames.addAll (commonActionNames);
  
  
  
  1.8       +60 -15    xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml
  
  http://xml.netbeans.org/source/browse/xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml.diff?r1=1.7&r2=1.8
(In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: mf-layer.xml
  ===================================================================
  RCS file: /cvs/xml/tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- mf-layer.xml	2002/03/12 14:39:17	1.7
  +++ mf-layer.xml	2002/04/05 15:52:22	1.8
  @@ -19,21 +19,65 @@
       <!-- register services with Lookup -->
<folder name="Services">
<folder name="Hidden">
-            <file name="org-netbeans-modules-xml-tools-actions-CSSStyleAction.instance" />
-            <file name="org-netbeans-modules-xml-tools-actions-CheckAction.instance" />
-            <file name="org-netbeans-modules-xml-tools-actions-CheckDTDAction.instance" />
-            <file name="org-netbeans-modules-xml-tools-actions-ValidateAction.instance" />
-
  -            <file name="org-netbeans-modules-xml-tools-doclet-DocletAction.instance" />
-
  -            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateSupportFactory$Creator.instance" />
-            <file name="org-netbeans-modules-xml-tools-generator-DTDGenerateSupportFactory$Creator.instance" />
-
  -            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDTDAction.instance" />
-            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDocumentHandlerAction.instance" />
-            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDOMScannerAction.instance" />
-
  -            <file name="org-netbeans-modules-xml-tools-transform-actions-TransformAction.instance" />
+            <file name="org-netbeans-modules-xml-tools-actions-CSSStyleAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.actions.CSSStyleAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.actions.CSSStyleAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.core.actions.CollectDTDAction$DTDAction, org.netbeans.modules.xml.tools.actions.CSSStyleAction" />
+            </file>
+            <file name="org-netbeans-modules-xml-tools-actions-CheckAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.actions.CheckAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.actions.CheckAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.core.actions.CollectXMLAction$XMLAction, org.netbeans.modules.xml.tools.actions.CheckAction" />
+            </file>
+            <file name="org-netbeans-modules-xml-tools-actions-CheckDTDAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.actions.CheckDTDAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.actions.CheckDTDAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.core.actions.CollectDTDAction$DTDAction, org.netbeans.modules.xml.tools.actions.CheckDTDAction" />
+            </file>
+            <file name="org-netbeans-modules-xml-tools-actions-ValidateAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.actions.ValidateAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.actions.ValidateAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.core.actions.CollectXMLAction$XMLAction, org.netbeans.modules.xml.tools.actions.ValidateAction" />
+            </file>
+
  +            <file name="org-netbeans-modules-xml-tools-doclet-DocletAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.doclet.DocletAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.doclet.DocletAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.core.actions.CollectDTDAction$DTDAction, org.netbeans.modules.xml.tools.doclet.DocletAction" />
+            </file>
+
  +            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateSupportFactory$Creator.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateSupportFactory$Creator" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateSupportFactory$Creator" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.core.XMLDataObject$XMLCookieFactoryCreator, org.netbeans.modules.xml.tools.generator.XMLGenerateSupportFactory$Creator" />
+            </file>
+            <file name="org-netbeans-modules-xml-tools-generator-DTDGenerateSupportFactory$Creator.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.generator.DTDGenerateSupportFactory$Creator" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.generator.DTDGenerateSupportFactory$Creator" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.core.DTDDataObject$DTDCookieFactoryCreator, org.netbeans.modules.xml.tools.generator.DTDGenerateSupportFactory$Creator" />
+            </file>
+
  +            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDTDAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDTDAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDTDAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.tools.generator.XMLGenerateAction, org.netbeans.modules.xml.core.actions.CollectXMLAction$XMLAction, org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDTDAction" />
+            </file>
+            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDocumentHandlerAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDocumentHandlerAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDocumentHandlerAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.tools.generator.XMLGenerateAction, org.netbeans.modules.xml.core.actions.CollectDTDAction$DTDAction, org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDocumentHandlerAction" />
+            </file>
+            <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDOMScannerAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDOMScannerAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDOMScannerAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.tools.generator.XMLGenerateAction, org.netbeans.modules.xml.core.actions.CollectDTDAction$DTDAction, org.netbeans.modules.xml.tools.generator.XMLGenerateAction$GenerateDOMScannerAction" />
+            </file>
+
  +            <file name="org-netbeans-modules-xml-tools-transform-actions-TransformAction.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tools.transform.actions.TransformAction" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tools.transform.actions.TransformAction" />
+                <attr name="instanceOf"    stringvalue="org.openide.util.actions.SystemAction, org.openide.util.actions.CallableSystemAction, org.openide.util.actions.NodeAction, org.openide.util.actions.CookieAction, org.netbeans.modules.xml.core.actions.CollectXMLAction$XMLAction, org.netbeans.modules.xml.tools.transform.actions.TransformAction" />
+            </file>
</folder>
</folder>
@@ -49,6 +93,7 @@
               <file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDTDAction.instance" />
<file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDocumentHandlerAction.instance" />
<file name="org-netbeans-modules-xml-tools-generator-XMLGenerateAction$GenerateDOMScannerAction.instance" />
+            <file name="org-netbeans-modules-xml-tools-transform-actions-TransformAction.instance" />
</folder>
</folder>
1.11      +15 -3     xml/tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml
  
  http://xml.netbeans.org/source/browse/xml/tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml.diff?r1=1.10&r2=1.11
(In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: mf-layer.xml
  ===================================================================
  RCS file: /cvs/xml/tree-edit/src/org/netbeans/modules/xml/tree/resources/mf-layer.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- mf-layer.xml	2002/03/21 17:01:48	1.10
  +++ mf-layer.xml	2002/04/05 15:52:25	1.11
  @@ -19,10 +19,22 @@
       <folder name="Services">
<folder name="Hidden">
-            <file name="org-netbeans-modules-xml-tree-nodes-XMLDataNode$DataNodeCreatorImpl.instance" />
-            <file name="org-netbeans-modules-xml-tree-nodes-DTDDataNode$DataNodeCreatorImpl.instance" />
+            <file name="org-netbeans-modules-xml-tree-nodes-XMLDataNode$DataNodeCreatorImpl.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tree.nodes.XMLDataNode$DataNodeCreatorImpl" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tree.nodes.XMLDataNode$DataNodeCreatorImpl" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.core.XMLDataObject$DataNodeCreator, org.netbeans.modules.xml.tree.nodes.XMLDataNode$DataNodeCreatorImpl" />
+            </file>
+            <file name="org-netbeans-modules-xml-tree-nodes-DTDDataNode$DataNodeCreatorImpl.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tree.nodes.DTDDataNode$DataNodeCreatorImpl" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tree.nodes.DTDDataNode$DataNodeCreatorImpl" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.core.DTDDataObject$DataNodeCreator, org.netbeans.modules.xml.tree.nodes.DTDDataNode$DataNodeCreatorImpl" />
+            </file>
-            <file name="org-netbeans-modules-xml-tree-editor-TreeEditorSupport$TreeEditorSupportFactoryCreator.instance" />
+            <file name="org-netbeans-modules-xml-tree-editor-TreeEditorSupport$TreeEditorSupportFactoryCreator.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.xml.tree.editor.TreeEditorSupport$TreeEditorSupportFactoryCreator" />
+                <attr name="instanceCreate"   newvalue="org.netbeans.modules.xml.tree.editor.TreeEditorSupport$TreeEditorSupportFactoryCreator" />
+                <attr name="instanceOf"    stringvalue="org.netbeans.modules.xml.core.text.TextEditorSupport$EditorSupportFactoryCreater, org.netbeans.modules.xml.tree.editor.TreeEditorSupport$TreeEditorSupportFactoryCreator" />
+            </file>
</folder> <!-- Hidden -->
<folder name="Looks">