Attachment #161534 for bug #274550

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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




				if (isProjectPackageFragmentRoot(root)) {
					// filter out package fragments that correspond to projects and
					// replace them with the package fragments directly
//					Object[] fragments= getPackageFragmentRootContent(root);
//					for (int j= 0; j < fragments.length; j++) {
//						result.add(fragments[j]);
//					}
				} /*else if(!shouldHide){
					result.add(root);
				}*/
			}
		}
		




				</or>
		     </enablement>
		  </commonWizard>
  		<!--  <dropAssistant
    			class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaDropAdapterAssistant"
   				id="org.eclipse.wst.jsdt.ui.dropAssistant">
 				<possibleDropTargets>

       					<instanceof value="org.eclipse.wst.jsdt.core.IJavaScriptElement"/>
    				</or>
 				</possibleDropTargets>
 			</dropAssistant>	
 			-->	   
		</navigatorContent>
		<!--
  		<commonFilter

		        name="%HideEmptyPackages.label"
		        description="%HideEmptyPackages.description"
		        id="org.eclipse.wst.jsdt.java.ui.filters.HideEmptyPackages"/>
    	-->
  		<commonFilter
		        activeByDefault="true"
		        class="org.eclipse.wst.jsdt.internal.ui.navigator.NonEssentialEmptyInnerPackageFilter"

		        name="%HideFields.label"
		        description="%HideFields.description"
		        id="org.eclipse.wst.jsdt.java.ui.filters.HideFields"/>
		
  		<commonFilter
		        activeByDefault="true"
		        class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"
		        name="%HideImportDeclaration.label"
		        description="%HideImportDeclaration.description"
		        id="org.eclipse.wst.jsdt.java.ui.filters.HideImportDeclaration"/> 
  		-->
  		<commonFilter 
		        class="org.eclipse.wst.jsdt.internal.ui.filters.JavaFileFilter"
		        name="%HideJavaFiles.label"

		        name="%HideLocalTypes.label"
		        description="%HideLocalTypes.description"
		        id="org.eclipse.wst.jsdt.java.ui.filters.HideLocalTypes"/>
 
  		<commonFilter 
		        class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicFilter"
		        name="%HideNonPublic.label"
		        description="%HideNonPublic.description"
		        id="org.eclipse.wst.jsdt.java.ui.filters.HideNonPublic"/>   
  		
  		<commonFilter 
		        class="org.eclipse.wst.jsdt.internal.ui.filters.LibraryFilter"
		        name="%HideReferencedLibraries.label"

		        name="%HideStatics.label"
		        description="%HideStatics.description"
		        id="org.eclipse.wst.jsdt.java.ui.filters.HideStatics"/>
	-->
   </extension>
   <extension
       point="org.eclipse.ui.navigator.linkHelper">

Lines 33-42 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/JavaPerspectiveFactory.java (-2 / +2 lines)
33	String editorArea = layout.getEditorArea();	33	String editorArea = layout.getEditorArea();
34		34
35	IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.25, editorArea); //$NON-NLS-1$	35	IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.25, editorArea); //$NON-NLS-1$
36	folder.addView(JavaScriptUI.ID_PACKAGES);	36	folder.addView(IPageLayout.ID_PROJECT_EXPLORER);
		37	folder.addPlaceholder(JavaScriptUI.ID_PACKAGES);
37	folder.addView(JavaScriptUI.ID_TYPE_HIERARCHY);	38	folder.addView(JavaScriptUI.ID_TYPE_HIERARCHY);
38	folder.addPlaceholder(IPageLayout.ID_RES_NAV);	39	folder.addPlaceholder(IPageLayout.ID_RES_NAV);
39	folder.addPlaceholder(IPageLayout.ID_PROJECT_EXPLORER);
40		40
41	IFolderLayout outputfolder= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.75, editorArea); //$NON-NLS-1$	41	IFolderLayout outputfolder= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.75, editorArea); //$NON-NLS-1$
42	outputfolder.addView(IPageLayout.ID_PROBLEM_VIEW);	42	outputfolder.addView(IPageLayout.ID_PROBLEM_VIEW);

Lines 169-175 Link Here

(-)src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java (-1 / +1 lines)
169	}	169	}
170		170
171	private void createSourceClassPath() {	171	private void createSourceClassPath() {
172	if (hasAValidSourcePath() \|\| true) {	172	if (hasAValidSourcePath()) {
173	return;	173	return;
174	}	174	}
175	IIncludePathEntry[] entries = new ConvertUtility(fCurrProject).getDefaultSourcePaths(fCurrProject);	175	IIncludePathEntry[] entries = new ConvertUtility(fCurrProject).getDefaultSourcePaths(fCurrProject);

Return to bug 274550

Lines 416-428 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/packageview/PackageExplorerContentProvider.java (-6 / +6 lines)
416	if (isProjectPackageFragmentRoot(root)) {	416	if (isProjectPackageFragmentRoot(root)) {
417	// filter out package fragments that correspond to projects and	417	// filter out package fragments that correspond to projects and
418	// replace them with the package fragments directly	418	// replace them with the package fragments directly
419	Object[] fragments= getPackageFragmentRootContent(root);	419	// Object[] fragments= getPackageFragmentRootContent(root);
420	for (int j= 0; j < fragments.length; j++) {	420	// for (int j= 0; j < fragments.length; j++) {
421	result.add(fragments[j]);	421	// result.add(fragments[j]);
422	}	422	// }
423	} else if(!shouldHide){	423	} /*else if(!shouldHide){
424	result.add(root);	424	result.add(root);
425	}	425	}*/
426	}	426	}
427	}	427	}
428		428

Lines 5384-5390 Link Here

(-)plugin.xml (-7 / +7 lines)
5384	</or>	5384	</or>
5385	</enablement>	5385	</enablement>
5386	</commonWizard>	5386	</commonWizard>
5387	<dropAssistant	5387	<!-- <dropAssistant
5388	class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaDropAdapterAssistant"	5388	class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaDropAdapterAssistant"
5389	id="org.eclipse.wst.jsdt.ui.dropAssistant">	5389	id="org.eclipse.wst.jsdt.ui.dropAssistant">
5390	<possibleDropTargets>	5390	<possibleDropTargets>
Lines 5393-5399 Link Here
5393	<instanceof value="org.eclipse.wst.jsdt.core.IJavaScriptElement"/>	5393	<instanceof value="org.eclipse.wst.jsdt.core.IJavaScriptElement"/>
5394	</or>	5394	</or>
5395	</possibleDropTargets>	5395	</possibleDropTargets>
5396	</dropAssistant>	5396	</dropAssistant>
		5397	-->
5397	</navigatorContent>	5398	</navigatorContent>
5398	<!--	5399	<!--
5399	<commonFilter	5400	<commonFilter
Lines 5402-5408 Link Here
5402	name="%HideEmptyPackages.label"	5403	name="%HideEmptyPackages.label"
5403	description="%HideEmptyPackages.description"	5404	description="%HideEmptyPackages.description"
5404	id="org.eclipse.wst.jsdt.java.ui.filters.HideEmptyPackages"/>	5405	id="org.eclipse.wst.jsdt.java.ui.filters.HideEmptyPackages"/>
5405	-->
5406	<commonFilter	5406	<commonFilter
5407	activeByDefault="true"	5407	activeByDefault="true"
5408	class="org.eclipse.wst.jsdt.internal.ui.navigator.NonEssentialEmptyInnerPackageFilter"	5408	class="org.eclipse.wst.jsdt.internal.ui.navigator.NonEssentialEmptyInnerPackageFilter"
Lines 5414-5427 Link Here
5414	name="%HideFields.label"	5414	name="%HideFields.label"
5415	description="%HideFields.description"	5415	description="%HideFields.description"
5416	id="org.eclipse.wst.jsdt.java.ui.filters.HideFields"/>	5416	id="org.eclipse.wst.jsdt.java.ui.filters.HideFields"/>
5417	<!--	5417
5418	<commonFilter	5418	<commonFilter
5419	activeByDefault="true"	5419	activeByDefault="true"
5420	class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"	5420	class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"
5421	name="%HideImportDeclaration.label"	5421	name="%HideImportDeclaration.label"
5422	description="%HideImportDeclaration.description"	5422	description="%HideImportDeclaration.description"
5423	id="org.eclipse.wst.jsdt.java.ui.filters.HideImportDeclaration"/>	5423	id="org.eclipse.wst.jsdt.java.ui.filters.HideImportDeclaration"/>
5424	-->
5425	<commonFilter	5424	<commonFilter
5426	class="org.eclipse.wst.jsdt.internal.ui.filters.JavaFileFilter"	5425	class="org.eclipse.wst.jsdt.internal.ui.filters.JavaFileFilter"
5427	name="%HideJavaFiles.label"	5426	name="%HideJavaFiles.label"
Lines 5432-5444 Link Here
5432	name="%HideLocalTypes.label"	5431	name="%HideLocalTypes.label"
5433	description="%HideLocalTypes.description"	5432	description="%HideLocalTypes.description"
5434	id="org.eclipse.wst.jsdt.java.ui.filters.HideLocalTypes"/>	5433	id="org.eclipse.wst.jsdt.java.ui.filters.HideLocalTypes"/>
5435	<!--	5434
5436	<commonFilter	5435	<commonFilter
5437	class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicFilter"	5436	class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicFilter"
5438	name="%HideNonPublic.label"	5437	name="%HideNonPublic.label"
5439	description="%HideNonPublic.description"	5438	description="%HideNonPublic.description"
5440	id="org.eclipse.wst.jsdt.java.ui.filters.HideNonPublic"/>	5439	id="org.eclipse.wst.jsdt.java.ui.filters.HideNonPublic"/>
5441	-->	5440
5442	<commonFilter	5441	<commonFilter
5443	class="org.eclipse.wst.jsdt.internal.ui.filters.LibraryFilter"	5442	class="org.eclipse.wst.jsdt.internal.ui.filters.LibraryFilter"
5444	name="%HideReferencedLibraries.label"	5443	name="%HideReferencedLibraries.label"
Lines 5449-5454 Link Here
5449	name="%HideStatics.label"	5448	name="%HideStatics.label"
5450	description="%HideStatics.description"	5449	description="%HideStatics.description"
5451	id="org.eclipse.wst.jsdt.java.ui.filters.HideStatics"/>	5450	id="org.eclipse.wst.jsdt.java.ui.filters.HideStatics"/>
		5451	-->
5452	</extension>	5452	</extension>
5453	<extension	5453	<extension
5454	point="org.eclipse.ui.navigator.linkHelper">	5454	point="org.eclipse.ui.navigator.linkHelper">