Attachment #25295 for bug #64968

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 64968
Collapse All | Expand All

Lines 191-196 Link Here

(-)apisupport/project/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerModuleList.java (+2 lines)
191	DISABLED_PLATFORM_MODULES.add("org.openide.io"); // NOI18N	191	DISABLED_PLATFORM_MODULES.add("org.openide.io"); // NOI18N
192	DISABLED_PLATFORM_MODULES.add("org.netbeans.core.output2"); // NOI18N	192	DISABLED_PLATFORM_MODULES.add("org.netbeans.core.output2"); // NOI18N
193	DISABLED_PLATFORM_MODULES.add("org.netbeans.core.multiview"); // NOI18N	193	DISABLED_PLATFORM_MODULES.add("org.netbeans.core.multiview"); // NOI18N
		194	// this one is useful only for writers of apps showing local disk
		195	DISABLED_PLATFORM_MODULES.add("org.netbeans.modules.favorites"); // NOI18N
194	// And these are deprecated:	196	// And these are deprecated:
195	DISABLED_PLATFORM_MODULES.add("org.openide.compat"); // NOI18N	197	DISABLED_PLATFORM_MODULES.add("org.openide.compat"); // NOI18N
196	DISABLED_PLATFORM_MODULES.add("org.openide.util.enumerations"); // NOI18N	198	DISABLED_PLATFORM_MODULES.add("org.openide.util.enumerations"); // NOI18N

Lines 427-433 Link Here

(-)apisupport/www/phase-V-ui.html (-1 / +2 lines)
427	The <q>platform</q> modules <b>Auto Update</b> (meaningless in JNLP mode and not necessarily desirable in	427	The <q>platform</q> modules <b>Auto Update</b> (meaningless in JNLP mode and not necessarily desirable in
428	other applications); <b>Execution API</b>, <b>Core - Execution</b>, <b>Input/Output APIs</b>, <b>Output	428	other applications); <b>Execution API</b>, <b>Core - Execution</b>, <b>Input/Output APIs</b>, <b>Output
429	Window</b>, and <b>Multi-View Windows</b> (not very likely to be wanted in non-IDE-oriented applications, and	429	Window</b>, and <b>Multi-View Windows</b> (not very likely to be wanted in non-IDE-oriented applications, and
430	can add undesirable GUI elements in JNLP mode); <b>Deprecated Compatibility APIs</b> and <b>Deprecated	430	can add undesirable GUI elements in JNLP mode); <b>Favorites</b> as that are needed only for applications
		431	accessing local files; <b>Deprecated Compatibility APIs</b> and <b>Deprecated
431	Enumeration APIs</b> (only exist for compatibility with old modules).	432	Enumeration APIs</b> (only exist for compatibility with old modules).
432	</p>	433	</p>
433	</li>	434	</li>

Lines 18-23 Link Here

(-)core/favorites/src/org/netbeans/modules/favorites/Bundle.properties (+1 lines)
18		18
19	Favorites=Favorites	19	Favorites=Favorites
20	Templates/Other=Other	20	Templates/Other=Other
		21	Templates/Other/Folder=Folder
21	Templates/Other/file=Empty File	22	Templates/Other/file=Empty File
22		23
23	#name [display name]	24	#name [display name]

Lines 86-91 Link Here

(-)core/favorites/src/org/netbeans/modules/favorites/resources/layer.xml (+11 lines)
86		86
87	<folder name="Templates" >	87	<folder name="Templates" >
88	<folder name="Other" >	88	<folder name="Other" >
		89	<folder name="Folder">
		90	<attr name="template" boolvalue="true"/>
		91	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.favorites.Bundle" />
		92	<attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/favorites/resources/templatesFolder.html" />
		93	</folder>
89	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.favorites.Bundle"/>	94	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.favorites.Bundle"/>
90	<file name="file">	95	<file name="file">
91	<![CDATA[]]>	96	<![CDATA[]]>
Lines 96-101 Link Here
96	<attr name="templateCategory" stringvalue="simple-files"/>	101	<attr name="templateCategory" stringvalue="simple-files"/>
97	</file>	102	</file>
98	</folder>	103	</folder>
		104	<!-- folder for all privileged templates -->
		105	<folder name="Privileged">
		106	<file name="Folder.shadow">
		107	<attr name="originalFile" stringvalue="Templates/Other/Folder"/>
		108	</file>
		109	</folder>
99	</folder>	110	</folder>
100		111
101	</filesystem>	112	</filesystem>




<!--
   -                 Sun Public License Notice
   - 
   - The contents of this file are subject to the Sun Public License
   - Version 1.0 (the "License"). You may not use this file except in
   - compliance with the License. A copy of the License is available at
   - http://www.sun.com/
   - 
   - The Original Code is NetBeans. The Initial Developer of the Original
   - Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
   - Microsystems, Inc. All Rights Reserved.
  -->

<HTML><BODY>
Creates a new folder on your disk.
</BODY></HTML>

Lines 243-249 Link Here

(-)core/src/org/netbeans/core/Bundle.properties (-1 lines)
243	Toolbars/StatusLine=Status Line	243	Toolbars/StatusLine=Status Line
244	Projects=Projects	244	Projects=Projects
245	Bookmarks=&Bookmarks	245	Bookmarks=&Bookmarks
246	Templates/Folder=Folder
247	Templates/Mount=Filesystems	246	Templates/Mount=Filesystems
248	Mount=Filesystems Settings	247	Mount=Filesystems Settings
249		248




<!--
   -                 Sun Public License Notice
   - 
   - The contents of this file are subject to the Sun Public License
   - Version 1.0 (the "License"). You may not use this file except in
   - compliance with the License. A copy of the License is available at
   - http://www.sun.com/
   - 
   - The Original Code is NetBeans. The Initial Developer of the Original
   - Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
   - Microsystems, Inc. All Rights Reserved.
  -->

<HTML><BODY>
Creates a new folder on your disk.
</BODY></HTML>




        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle"/>
        <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesRootDescription.html"/>
        <attr name="helpID" stringvalue="org.netbeans.core.actions.OptionsAction$Templates"/>

        <folder name="Folder">
            <attr name="template" boolvalue="true"/>
            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle" />
            <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesFolder.html" />
        </folder>
        
        <folder name="Services">
            <attr name="simple" boolvalue="false" />

            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.ui.resources.Bundle"/>
            <!-- a value to signal that this folder should not be visible in the simple new from template wizard -->
            <attr name="simple" boolvalue="false" />
	    <file name="Folder.shadow">
                <attr name="originalFile" stringvalue="Templates/Folder"/>
            </file>
	</folder>
        
        <!-- folder for all recent templates -->

Lines 7-12 Link Here

(-)ide/golden/cluster-deps.txt (+1 lines)
7	REQUIRES org.netbeans.core.startup/1 (platform)	7	REQUIRES org.netbeans.core.startup/1 (platform)
8	REQUIRES org.netbeans.core.ui/1 (platform)	8	REQUIRES org.netbeans.core.ui/1 (platform)
9	REQUIRES org.netbeans.modules.autoupdate/1 (platform)	9	REQUIRES org.netbeans.modules.autoupdate/1 (platform)
		10	REQUIRES org.netbeans.modules.favorites/1 (platform)
10	REQUIRES org.netbeans.modules.javahelp/1 (platform)	11	REQUIRES org.netbeans.modules.javahelp/1 (platform)
11	REQUIRES org.netbeans.modules.masterfs/1 (platform)	12	REQUIRES org.netbeans.modules.masterfs/1 (platform)
12	REQUIRES org.netbeans.modules.queries/1 (platform)	13	REQUIRES org.netbeans.modules.queries/1 (platform)




ide6/config/Modules/org-netbeans-modules-editor-util.xml
ide6/config/Modules/org-netbeans-modules-editor.xml
ide6/config/Modules/org-netbeans-modules-extbrowser.xml
ide6/config/Modules/org-netbeans-modules-favorites.xml
ide6/config/Modules/org-netbeans-modules-form.xml
ide6/config/Modules/org-netbeans-modules-html-editor-lib.xml
ide6/config/Modules/org-netbeans-modules-html-editor.xml

ide6/modules/org-netbeans-modules-editor-util.jar
ide6/modules/org-netbeans-modules-editor.jar
ide6/modules/org-netbeans-modules-extbrowser.jar
ide6/modules/org-netbeans-modules-favorites.jar
ide6/modules/org-netbeans-modules-form.jar
ide6/modules/org-netbeans-modules-html-editor-lib.jar
ide6/modules/org-netbeans-modules-html-editor.jar

ide6/update_tracking/org-netbeans-modules-editor-util.xml
ide6/update_tracking/org-netbeans-modules-editor.xml
ide6/update_tracking/org-netbeans-modules-extbrowser.xml
ide6/update_tracking/org-netbeans-modules-favorites.xml
ide6/update_tracking/org-netbeans-modules-form.xml
ide6/update_tracking/org-netbeans-modules-html-editor-lib.xml
ide6/update_tracking/org-netbeans-modules-html-editor.xml

platform6/config/Modules/org-netbeans-core-windows.xml
platform6/config/Modules/org-netbeans-core.xml
platform6/config/Modules/org-netbeans-modules-autoupdate.xml
platform6/config/Modules/org-netbeans-modules-favorites.xml
platform6/config/Modules/org-netbeans-modules-javahelp.xml
platform6/config/Modules/org-netbeans-modules-masterfs.xml
platform6/config/Modules/org-netbeans-modules-queries.xml

platform6/modules/org-netbeans-core-windows.jar
platform6/modules/org-netbeans-core.jar
platform6/modules/org-netbeans-modules-autoupdate.jar
platform6/modules/org-netbeans-modules-favorites.jar
platform6/modules/org-netbeans-modules-javahelp.jar
platform6/modules/org-netbeans-modules-masterfs.jar
platform6/modules/org-netbeans-modules-queries.jar

platform6/update_tracking/org-netbeans-core-windows.xml
platform6/update_tracking/org-netbeans-core.xml
platform6/update_tracking/org-netbeans-modules-autoupdate.xml
platform6/update_tracking/org-netbeans-modules-favorites.xml
platform6/update_tracking/org-netbeans-modules-javahelp.xml
platform6/update_tracking/org-netbeans-modules-masterfs.xml
platform6/update_tracking/org-netbeans-modules-queries.xml

Lines 66-72 Link Here

(-)ide/golden/modules.txt (-1 / +1 lines)
66	MODULE org.netbeans.modules.editor.structure/1 (ide)	66	MODULE org.netbeans.modules.editor.structure/1 (ide)
67	MODULE org.netbeans.modules.editor.util/1 (ide)	67	MODULE org.netbeans.modules.editor.util/1 (ide)
68	MODULE org.netbeans.modules.extbrowser/1 (ide)	68	MODULE org.netbeans.modules.extbrowser/1 (ide)
69	MODULE org.netbeans.modules.favorites/1 (ide)	69	MODULE org.netbeans.modules.favorites/1 (platform)
70	MODULE org.netbeans.modules.form/2 (ide)	70	MODULE org.netbeans.modules.form/2 (ide)
71	MODULE org.netbeans.modules.html/1 (ide)	71	MODULE org.netbeans.modules.html/1 (ide)
72	MODULE org.netbeans.modules.html.editor/1 (ide)	72	MODULE org.netbeans.modules.html.editor/1 (ide)

Lines 42-47 Link Here

(-)nbbuild/cluster.properties (-1 / +1 lines)
42	core/swing/plaf,\	42	core/swing/plaf,\
43	core/swing/tabcontrol,\	43	core/swing/tabcontrol,\
44	core/ui,\	44	core/ui,\
		45	core/favorites,\
45	core/windows,\	46	core/windows,\
46	openide/actions,\	47	openide/actions,\
47	openide/awt,\	48	openide/awt,\
Lines 65-71 Link Here
65	nb.pkg.idesupport=\	66	nb.pkg.idesupport=\
66	editor/completion,\	67	editor/completion,\
67	ant/debugger,\	68	ant/debugger,\
68	core/favorites,\
69	core/ide,\	69	core/ide,\
70	core/navigator,\	70	core/navigator,\
71	core/options,\	71	core/options,\

Lines 17-33 Link Here

(-)projects/projectui/nbproject/project.xml (-19 / +28 lines)
17	<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">	17	<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
18	<code-name-base>org.netbeans.modules.projectui</code-name-base>	18	<code-name-base>org.netbeans.modules.projectui</code-name-base>
19	<module-dependencies>	19	<module-dependencies>
20	<!-- XXX is this still necessary? -->	20	<dependency>
		21	<code-name-base>org.netbeans.core.execution</code-name-base>
		22	<run-dependency>
		23	<release-version>1</release-version>
		24	</run-dependency>
		25	</dependency>
21	<dependency>	26	<dependency>
22	<code-name-base>org.netbeans.core.ui</code-name-base>	27	<code-name-base>org.netbeans.core.ui</code-name-base>
		28	<build-prerequisite/>
		29	<compile-dependency/>
23	<run-dependency>	30	<run-dependency>
24	<release-version>1</release-version>	31	<release-version>1</release-version>
		32	<specification-version>1.8</specification-version>
25	</run-dependency>	33	</run-dependency>
26	</dependency>	34	</dependency>
27	<dependency>	35	<dependency>
28	<code-name-base>org.netbeans.core.execution</code-name-base>	36	<code-name-base>org.netbeans.modules.favorites</code-name-base>
29	<run-dependency>	37	<run-dependency>
30	<release-version>1</release-version>	38	<release-version>1</release-version>
		39	<specification-version>1.10</specification-version>
31	</run-dependency>	40	</run-dependency>
32	</dependency>	41	</dependency>
33	<dependency>	42	<dependency>
Lines 54-60 Link Here
54	<release-version>1</release-version>	63	<release-version>1</release-version>
55	<implementation-version/>	64	<implementation-version/>
56	</run-dependency>	65	</run-dependency>
57	</dependency>	66	</dependency>
58	<dependency>	67	<dependency>
59	<code-name-base>org.netbeans.modules.queries</code-name-base>	68	<code-name-base>org.netbeans.modules.queries</code-name-base>
60	<build-prerequisite/>	69	<build-prerequisite/>
Lines 73-79 Link Here
73	</run-dependency>	82	</run-dependency>
74	</dependency>	83	</dependency>
75	<dependency>	84	<dependency>
76	<code-name-base>org.openide.filesystems</code-name-base>	85	<code-name-base>org.openide.actions</code-name-base>
77	<build-prerequisite/>	86	<build-prerequisite/>
78	<compile-dependency/>	87	<compile-dependency/>
79	<run-dependency>	88	<run-dependency>
Lines 81-95 Link Here
81	</run-dependency>	90	</run-dependency>
82	</dependency>	91	</dependency>
83	<dependency>	92	<dependency>
84	<code-name-base>org.openide.util</code-name-base>	93	<code-name-base>org.openide.awt</code-name-base>
85	<build-prerequisite/>	94	<build-prerequisite/>
86	<compile-dependency/>	95	<compile-dependency/>
87	<run-dependency>	96	<run-dependency>
88	<specification-version>6.4</specification-version>	97	<specification-version>6.5</specification-version>
89	</run-dependency>	98	</run-dependency>
90	</dependency>	99	</dependency>
91	<dependency>	100	<dependency>
92	<code-name-base>org.openide.modules</code-name-base>	101	<code-name-base>org.openide.dialogs</code-name-base>
93	<build-prerequisite/>	102	<build-prerequisite/>
94	<compile-dependency/>	103	<compile-dependency/>
95	<run-dependency>	104	<run-dependency>
Lines 97-103 Link Here
97	</run-dependency>	106	</run-dependency>
98	</dependency>	107	</dependency>
99	<dependency>	108	<dependency>
100	<code-name-base>org.openide.nodes</code-name-base>	109	<code-name-base>org.openide.explorer</code-name-base>
101	<build-prerequisite/>	110	<build-prerequisite/>
102	<compile-dependency/>	111	<compile-dependency/>
103	<run-dependency>	112	<run-dependency>
Lines 105-111 Link Here
105	</run-dependency>	114	</run-dependency>
106	</dependency>	115	</dependency>
107	<dependency>	116	<dependency>
108	<code-name-base>org.openide.explorer</code-name-base>	117	<code-name-base>org.openide.filesystems</code-name-base>
109	<build-prerequisite/>	118	<build-prerequisite/>
110	<compile-dependency/>	119	<compile-dependency/>
111	<run-dependency>	120	<run-dependency>
Lines 113-127 Link Here
113	</run-dependency>	122	</run-dependency>
114	</dependency>	123	</dependency>
115	<dependency>	124	<dependency>
116	<code-name-base>org.openide.awt</code-name-base>	125	<code-name-base>org.openide.loaders</code-name-base>
117	<build-prerequisite/>	126	<build-prerequisite/>
118	<compile-dependency/>	127	<compile-dependency/>
119	<run-dependency>	128	<run-dependency>
120	<specification-version>6.5</specification-version>	129	<specification-version>5.1</specification-version>
121	</run-dependency>	130	</run-dependency>
122	</dependency>	131	</dependency>
123	<dependency>	132	<dependency>
124	<code-name-base>org.openide.dialogs</code-name-base>	133	<code-name-base>org.openide.modules</code-name-base>
125	<build-prerequisite/>	134	<build-prerequisite/>
126	<compile-dependency/>	135	<compile-dependency/>
127	<run-dependency>	136	<run-dependency>
Lines 129-135 Link Here
129	</run-dependency>	138	</run-dependency>
130	</dependency>	139	</dependency>
131	<dependency>	140	<dependency>
132	<code-name-base>org.openide.options</code-name-base>	141	<code-name-base>org.openide.nodes</code-name-base>
133	<build-prerequisite/>	142	<build-prerequisite/>
134	<compile-dependency/>	143	<compile-dependency/>
135	<run-dependency>	144	<run-dependency>
Lines 137-143 Link Here
137	</run-dependency>	146	</run-dependency>
138	</dependency>	147	</dependency>
139	<dependency>	148	<dependency>
140	<code-name-base>org.openide.windows</code-name-base>	149	<code-name-base>org.openide.options</code-name-base>
141	<build-prerequisite/>	150	<build-prerequisite/>
142	<compile-dependency/>	151	<compile-dependency/>
143	<run-dependency>	152	<run-dependency>
Lines 153-171 Link Here
153	</run-dependency>	162	</run-dependency>
154	</dependency>	163	</dependency>
155	<dependency>	164	<dependency>
156	<code-name-base>org.openide.actions</code-name-base>	165	<code-name-base>org.openide.util</code-name-base>
157	<build-prerequisite/>	166	<build-prerequisite/>
158	<compile-dependency/>	167	<compile-dependency/>
159	<run-dependency>	168	<run-dependency>
160	<specification-version>6.2</specification-version>	169	<specification-version>6.4</specification-version>
161	</run-dependency>	170	</run-dependency>
162	</dependency>	171	</dependency>
163	<dependency>	172	<dependency>
164	<code-name-base>org.openide.loaders</code-name-base>	173	<code-name-base>org.openide.windows</code-name-base>
165	<build-prerequisite/>	174	<build-prerequisite/>
166	<compile-dependency/>	175	<compile-dependency/>
167	<run-dependency>	176	<run-dependency>
168	<specification-version>5.1</specification-version>	177	<specification-version>6.2</specification-version>
169	</run-dependency>	178	</run-dependency>
170	</dependency>	179	</dependency>
171	<dependency>	180	<dependency>

Lines 156-163 Link Here

(-)projects/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml (-2 lines)
156	</folder>	156	</folder>
157	</folder>	157	</folder>
158		158
159	<folder name="Folder_hidden"/>
160
161	<attr name="XML/Ant" boolvalue="true"/>	159	<attr name="XML/Ant" boolvalue="true"/>
162	<attr name="JUnit/XML" boolvalue="true"/>	160	<attr name="JUnit/XML" boolvalue="true"/>
163	<attr name="Beans/JUnit" boolvalue="true"/>	161	<attr name="Beans/JUnit" boolvalue="true"/>

Return to bug 64968

Lines 252-263 Link Here

(-)core/ui/src/org/netbeans/core/ui/resources/layer.xml (-9 lines)
252	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle"/>	252	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle"/>
253	<attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesRootDescription.html"/>	253	<attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesRootDescription.html"/>
254	<attr name="helpID" stringvalue="org.netbeans.core.actions.OptionsAction$Templates"/>	254	<attr name="helpID" stringvalue="org.netbeans.core.actions.OptionsAction$Templates"/>
255
256	<folder name="Folder">
257	<attr name="template" boolvalue="true"/>
258	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.Bundle" />
259	<attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/core/resources/templatesFolder.html" />
260	</folder>
261		255
262	<folder name="Services">	256	<folder name="Services">
263	<attr name="simple" boolvalue="false" />	257	<attr name="simple" boolvalue="false" />
Lines 275-283 Link Here
275	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.ui.resources.Bundle"/>	269	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.core.ui.resources.Bundle"/>
276	<!-- a value to signal that this folder should not be visible in the simple new from template wizard -->	270	<!-- a value to signal that this folder should not be visible in the simple new from template wizard -->
277	<attr name="simple" boolvalue="false" />	271	<attr name="simple" boolvalue="false" />
278	<file name="Folder.shadow">
279	<attr name="originalFile" stringvalue="Templates/Folder"/>
280	</file>
281	</folder>	272	</folder>
282		273
283	<!-- folder for all recent templates -->	274	<!-- folder for all recent templates -->

Added Link Here

(-)core/favorites/src/org/netbeans/modules/favorites/resources/templatesFolder.html (+16 lines)
1	<!--
2	- Sun Public License Notice
3	-
4	- The contents of this file are subject to the Sun Public License
5	- Version 1.0 (the "License"). You may not use this file except in
6	- compliance with the License. A copy of the License is available at
7	- http://www.sun.com/
8	-
9	- The Original Code is NetBeans. The Initial Developer of the Original
10	- Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
11	- Microsystems, Inc. All Rights Reserved.
12	-->
13
14	<HTML><BODY>
15	Creates a new folder on your disk.
16	</BODY></HTML>

Removed Link Here

(-)core/src/org/netbeans/core/resources/templatesFolder.html (-16 lines)
1	<!--
2	- Sun Public License Notice
3	-
4	- The contents of this file are subject to the Sun Public License
5	- Version 1.0 (the "License"). You may not use this file except in
6	- compliance with the License. A copy of the License is available at
7	- http://www.sun.com/
8	-
9	- The Original Code is NetBeans. The Initial Developer of the Original
10	- Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
11	- Microsystems, Inc. All Rights Reserved.
12	-->
13
14	<HTML><BODY>
15	Creates a new folder on your disk.
16	</BODY></HTML>

Lines 621-627 Link Here

(-)ide/golden/deps.txt (-1 / +2 lines)
621	REQUIRES org.openide.modules.ModuleFormat1	621	REQUIRES org.openide.modules.ModuleFormat1
622	REQUIRES org.openide.options (platform)	622	REQUIRES org.openide.options (platform)
623	REQUIRES org.openide.util (platform)	623	REQUIRES org.openide.util (platform)
624	MODULE org.netbeans.modules.favorites/1 (ide)	624	MODULE org.netbeans.modules.favorites/1 (platform)
625	REQUIRES org.openide.actions (platform)	625	REQUIRES org.openide.actions (platform)
626	REQUIRES org.openide.awt (platform)	626	REQUIRES org.openide.awt (platform)
627	REQUIRES org.openide.dialogs (platform)	627	REQUIRES org.openide.dialogs (platform)
Lines 1630-1635 Link Here
1630	MODULE org.netbeans.modules.projectui (ide)	1630	MODULE org.netbeans.modules.projectui (ide)
1631	REQUIRES org.netbeans.core.execution/1 (platform)	1631	REQUIRES org.netbeans.core.execution/1 (platform)
1632	REQUIRES org.netbeans.core.ui/1 (platform)	1632	REQUIRES org.netbeans.core.ui/1 (platform)
		1633	REQUIRES org.netbeans.modules.favorites/1 (platform)
1633	REQUIRES org.netbeans.modules.masterfs/1 (platform)	1634	REQUIRES org.netbeans.modules.masterfs/1 (platform)
1634	REQUIRES org.netbeans.modules.projectapi/1 (ide)	1635	REQUIRES org.netbeans.modules.projectapi/1 (ide)
1635	REQUIRES org.netbeans.modules.projectuiapi/1 (ide)	1636	REQUIRES org.netbeans.modules.projectuiapi/1 (ide)

Lines 616-622 Link Here

(-)ide/golden/files-layout.txt (-3 / +3 lines)
616	ide6/config/Modules/org-netbeans-modules-editor-util.xml	616	ide6/config/Modules/org-netbeans-modules-editor-util.xml
617	ide6/config/Modules/org-netbeans-modules-editor.xml	617	ide6/config/Modules/org-netbeans-modules-editor.xml
618	ide6/config/Modules/org-netbeans-modules-extbrowser.xml	618	ide6/config/Modules/org-netbeans-modules-extbrowser.xml
619	ide6/config/Modules/org-netbeans-modules-favorites.xml
620	ide6/config/Modules/org-netbeans-modules-form.xml	619	ide6/config/Modules/org-netbeans-modules-form.xml
621	ide6/config/Modules/org-netbeans-modules-html-editor-lib.xml	620	ide6/config/Modules/org-netbeans-modules-html-editor-lib.xml
622	ide6/config/Modules/org-netbeans-modules-html-editor.xml	621	ide6/config/Modules/org-netbeans-modules-html-editor.xml
Lines 774-780 Link Here
774	ide6/modules/org-netbeans-modules-editor-util.jar	773	ide6/modules/org-netbeans-modules-editor-util.jar
775	ide6/modules/org-netbeans-modules-editor.jar	774	ide6/modules/org-netbeans-modules-editor.jar
776	ide6/modules/org-netbeans-modules-extbrowser.jar	775	ide6/modules/org-netbeans-modules-extbrowser.jar
777	ide6/modules/org-netbeans-modules-favorites.jar
778	ide6/modules/org-netbeans-modules-form.jar	776	ide6/modules/org-netbeans-modules-form.jar
779	ide6/modules/org-netbeans-modules-html-editor-lib.jar	777	ide6/modules/org-netbeans-modules-html-editor-lib.jar
780	ide6/modules/org-netbeans-modules-html-editor.jar	778	ide6/modules/org-netbeans-modules-html-editor.jar
Lines 891-897 Link Here
891	ide6/update_tracking/org-netbeans-modules-editor-util.xml	889	ide6/update_tracking/org-netbeans-modules-editor-util.xml
892	ide6/update_tracking/org-netbeans-modules-editor.xml	890	ide6/update_tracking/org-netbeans-modules-editor.xml
893	ide6/update_tracking/org-netbeans-modules-extbrowser.xml	891	ide6/update_tracking/org-netbeans-modules-extbrowser.xml
894	ide6/update_tracking/org-netbeans-modules-favorites.xml
895	ide6/update_tracking/org-netbeans-modules-form.xml	892	ide6/update_tracking/org-netbeans-modules-form.xml
896	ide6/update_tracking/org-netbeans-modules-html-editor-lib.xml	893	ide6/update_tracking/org-netbeans-modules-html-editor-lib.xml
897	ide6/update_tracking/org-netbeans-modules-html-editor.xml	894	ide6/update_tracking/org-netbeans-modules-html-editor.xml
Lines 1089-1094 Link Here
1089	platform6/config/Modules/org-netbeans-core-windows.xml	1086	platform6/config/Modules/org-netbeans-core-windows.xml
1090	platform6/config/Modules/org-netbeans-core.xml	1087	platform6/config/Modules/org-netbeans-core.xml
1091	platform6/config/Modules/org-netbeans-modules-autoupdate.xml	1088	platform6/config/Modules/org-netbeans-modules-autoupdate.xml
		1089	platform6/config/Modules/org-netbeans-modules-favorites.xml
1092	platform6/config/Modules/org-netbeans-modules-javahelp.xml	1090	platform6/config/Modules/org-netbeans-modules-javahelp.xml
1093	platform6/config/Modules/org-netbeans-modules-masterfs.xml	1091	platform6/config/Modules/org-netbeans-modules-masterfs.xml
1094	platform6/config/Modules/org-netbeans-modules-queries.xml	1092	platform6/config/Modules/org-netbeans-modules-queries.xml
Lines 1127-1132 Link Here
1127	platform6/modules/org-netbeans-core-windows.jar	1125	platform6/modules/org-netbeans-core-windows.jar
1128	platform6/modules/org-netbeans-core.jar	1126	platform6/modules/org-netbeans-core.jar
1129	platform6/modules/org-netbeans-modules-autoupdate.jar	1127	platform6/modules/org-netbeans-modules-autoupdate.jar
		1128	platform6/modules/org-netbeans-modules-favorites.jar
1130	platform6/modules/org-netbeans-modules-javahelp.jar	1129	platform6/modules/org-netbeans-modules-javahelp.jar
1131	platform6/modules/org-netbeans-modules-masterfs.jar	1130	platform6/modules/org-netbeans-modules-masterfs.jar
1132	platform6/modules/org-netbeans-modules-queries.jar	1131	platform6/modules/org-netbeans-modules-queries.jar
Lines 1156-1161 Link Here
1156	platform6/update_tracking/org-netbeans-core-windows.xml	1155	platform6/update_tracking/org-netbeans-core-windows.xml
1157	platform6/update_tracking/org-netbeans-core.xml	1156	platform6/update_tracking/org-netbeans-core.xml
1158	platform6/update_tracking/org-netbeans-modules-autoupdate.xml	1157	platform6/update_tracking/org-netbeans-modules-autoupdate.xml
		1158	platform6/update_tracking/org-netbeans-modules-favorites.xml
1159	platform6/update_tracking/org-netbeans-modules-javahelp.xml	1159	platform6/update_tracking/org-netbeans-modules-javahelp.xml
1160	platform6/update_tracking/org-netbeans-modules-masterfs.xml	1160	platform6/update_tracking/org-netbeans-modules-masterfs.xml
1161	platform6/update_tracking/org-netbeans-modules-queries.xml	1161	platform6/update_tracking/org-netbeans-modules-queries.xml