Attachment #2865 for bug #26642

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 26642
Collapse All | Expand All

Lines 45-51 Link Here

(-)ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewLabelProvider.java (-1 / +1 lines)
45	private TreeHierarchyLayoutProblemsDecorator fDecorator;	45	private TreeHierarchyLayoutProblemsDecorator fDecorator;
46		46
47	PackagesViewLabelProvider(int state) {	47	PackagesViewLabelProvider(int state) {
48	this(state, AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED, AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS \| JavaElementImageProvider.SMALL_ICONS);	48	this(state, AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED \| JavaElementLabels.P_PREFIX_REMOVE, AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS \| JavaElementImageProvider.SMALL_ICONS);
49	}	49	}
50		50
51	PackagesViewLabelProvider(int state, int textFlags, int imageFlags) {	51	PackagesViewLabelProvider(int state, int textFlags, int imageFlags) {

Lines 417-423 Link Here

(-)ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java (-1 / +1 lines)
417	}	417	}
418		418
419	private PackageExplorerLabelProvider createLabelProvider() {	419	private PackageExplorerLabelProvider createLabelProvider() {
420	return new PackageExplorerLabelProvider(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED,	420	return new PackageExplorerLabelProvider(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED \| JavaElementLabels.P_PREFIX_REMOVE,
421	AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS \| JavaElementImageProvider.SMALL_ICONS,	421	AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS \| JavaElementImageProvider.SMALL_ICONS,
422	fContentProvider);	422	fContentProvider);
423	}	423	}

Lines 35-40 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java (+28 lines)
35	private static final String PREF_OVERRIDE_INDICATOR= PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR;	35	private static final String PREF_OVERRIDE_INDICATOR= PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR;
36	private static final String PREF_COMPRESS_PACKAGE_NAMES= PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES;	36	private static final String PREF_COMPRESS_PACKAGE_NAMES= PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES;
37	private static final String PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW= PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW;	37	private static final String PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW= PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW;
		38	private static final String PREF_REMOVE_PACKAGE_PREFIXES= PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES;
		39	private static final String PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW= PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW;
38	private static final String STACK_BROWSING_VIEWS_VERTICALLY= PreferenceConstants.BROWSING_STACK_VERTICALLY;	40	private static final String STACK_BROWSING_VIEWS_VERTICALLY= PreferenceConstants.BROWSING_STACK_VERTICALLY;
39	private static final String PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER= PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER;	41	private static final String PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER= PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER;
40		42
Lines 73-80 Link Here
73	private SelectionButtonDialogField fShowMethodReturnType;	75	private SelectionButtonDialogField fShowMethodReturnType;
74	private SelectionButtonDialogField fShowOverrideIndicator;	76	private SelectionButtonDialogField fShowOverrideIndicator;
75	private SelectionButtonDialogField fCompressPackageNames;	77	private SelectionButtonDialogField fCompressPackageNames;
		78	private SelectionButtonDialogField fRemovePackagePrefixes;
76	private SelectionButtonDialogField fStackBrowsingViewsVertically;	79	private SelectionButtonDialogField fStackBrowsingViewsVertically;
77	private SelectionButtonDialogField fShowMembersInPackageView;	80	private SelectionButtonDialogField fShowMembersInPackageView;
		81	private StringDialogField fPackagePrefixList;
78	private StringDialogField fPackageNamePattern;	82	private StringDialogField fPackageNamePattern;
79	private SelectionButtonDialogField fFoldPackagesInPackageExplorer;	83	private SelectionButtonDialogField fFoldPackagesInPackageExplorer;
80		84
Lines 110-119 Link Here
110	fFoldPackagesInPackageExplorer.setDialogFieldListener(listener);	114	fFoldPackagesInPackageExplorer.setDialogFieldListener(listener);
111	fFoldPackagesInPackageExplorer.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.foldEmptyPackages")); //$NON-NLS-1$	115	fFoldPackagesInPackageExplorer.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.foldEmptyPackages")); //$NON-NLS-1$
112		116
		117	fRemovePackagePrefixes= new SelectionButtonDialogField(SWT.CHECK);
		118	fRemovePackagePrefixes.setDialogFieldListener(listener);
		119	fRemovePackagePrefixes.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pgkPrefixListEnable.label")); //$NON-NLS-1$
		120
113	fCompressPackageNames= new SelectionButtonDialogField(SWT.CHECK);	121	fCompressPackageNames= new SelectionButtonDialogField(SWT.CHECK);
114	fCompressPackageNames.setDialogFieldListener(listener);	122	fCompressPackageNames.setDialogFieldListener(listener);
115	fCompressPackageNames.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pkgNamePatternEnable.label")); //$NON-NLS-1$	123	fCompressPackageNames.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pkgNamePatternEnable.label")); //$NON-NLS-1$
116		124
		125	fPackagePrefixList= new StringDialogField();
		126	fPackagePrefixList.setDialogFieldListener(listener);
		127	fPackagePrefixList.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pgkPrefixList.label")); //$NON-NLS-1$
		128
117	fPackageNamePattern= new StringDialogField();	129	fPackageNamePattern= new StringDialogField();
118	fPackageNamePattern.setDialogFieldListener(listener);	130	fPackageNamePattern.setDialogFieldListener(listener);
119	fPackageNamePattern.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pkgNamePattern.label")); //$NON-NLS-1$	131	fPackageNamePattern.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pkgNamePattern.label")); //$NON-NLS-1$
Lines 125-132 Link Here
125	fShowOverrideIndicator.setSelection(prefs.getBoolean(PREF_OVERRIDE_INDICATOR));	137	fShowOverrideIndicator.setSelection(prefs.getBoolean(PREF_OVERRIDE_INDICATOR));
126	fShowMembersInPackageView.setSelection(prefs.getBoolean(SHOW_CU_CHILDREN));	138	fShowMembersInPackageView.setSelection(prefs.getBoolean(SHOW_CU_CHILDREN));
127	fStackBrowsingViewsVertically.setSelection(prefs.getBoolean(STACK_BROWSING_VIEWS_VERTICALLY));	139	fStackBrowsingViewsVertically.setSelection(prefs.getBoolean(STACK_BROWSING_VIEWS_VERTICALLY));
		140	fPackagePrefixList.setText(prefs.getString(PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW));
128	fPackageNamePattern.setText(prefs.getString(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW));	141	fPackageNamePattern.setText(prefs.getString(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW));
		142	fRemovePackagePrefixes.setSelection(prefs.getBoolean(PREF_REMOVE_PACKAGE_PREFIXES));
129	fCompressPackageNames.setSelection(prefs.getBoolean(PREF_COMPRESS_PACKAGE_NAMES));	143	fCompressPackageNames.setSelection(prefs.getBoolean(PREF_COMPRESS_PACKAGE_NAMES));
		144	fPackagePrefixList.setEnabled(fRemovePackagePrefixes.isSelected());
130	fPackageNamePattern.setEnabled(fCompressPackageNames.isSelected());	145	fPackageNamePattern.setEnabled(fCompressPackageNames.isSelected());
131	fFoldPackagesInPackageExplorer.setSelection(prefs.getBoolean(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER));	146	fFoldPackagesInPackageExplorer.setSelection(prefs.getBoolean(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER));
132	}	147	}
Lines 161-166 Link Here
161		176
162	new Separator().doFillIntoGrid(composite, nColumns);	177	new Separator().doFillIntoGrid(composite, nColumns);
163		178
		179	fRemovePackagePrefixes.doFillIntoGrid(composite, nColumns);
		180	fPackagePrefixList.doFillIntoGrid(composite, 2);
		181	LayoutUtil.setHorizontalGrabbing(fPackagePrefixList.getTextControl(null));
		182	LayoutUtil.setWidthHint(fPackagePrefixList.getLabelControl(null), convertWidthInCharsToPixels(65));
		183
164	fCompressPackageNames.doFillIntoGrid(composite, nColumns);	184	fCompressPackageNames.doFillIntoGrid(composite, nColumns);
165	fPackageNamePattern.doFillIntoGrid(composite, 2);	185	fPackageNamePattern.doFillIntoGrid(composite, 2);
166	LayoutUtil.setHorizontalGrabbing(fPackageNamePattern.getTextControl(null));	186	LayoutUtil.setHorizontalGrabbing(fPackageNamePattern.getTextControl(null));
Lines 182-187 Link Here
182	private void doDialogFieldChanged(DialogField field) {	202	private void doDialogFieldChanged(DialogField field) {
183	if (field == fCompressPackageNames)	203	if (field == fCompressPackageNames)
184	fPackageNamePattern.setEnabled(fCompressPackageNames.isSelected());	204	fPackageNamePattern.setEnabled(fCompressPackageNames.isSelected());
		205	else if (field == fRemovePackagePrefixes)
		206	fPackagePrefixList.setEnabled(fRemovePackagePrefixes.isSelected());
185		207
186	updateStatus(getValidationStatus());	208	updateStatus(getValidationStatus());
187	}	209	}
Lines 189-194 Link Here
189	private IStatus getValidationStatus(){	211	private IStatus getValidationStatus(){
190	if (fCompressPackageNames.isSelected() && fPackageNamePattern.getText().equals("")) //$NON-NLS-1$	212	if (fCompressPackageNames.isSelected() && fPackageNamePattern.getText().equals("")) //$NON-NLS-1$
191	return new StatusInfo(IStatus.ERROR, JavaUIMessages.getString("AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty")); //$NON-NLS-1$	213	return new StatusInfo(IStatus.ERROR, JavaUIMessages.getString("AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty")); //$NON-NLS-1$
		214	else if (fRemovePackagePrefixes.isSelected() && fPackagePrefixList.getText().equals("")) //$NON-NLS-1$
		215	return new StatusInfo(IStatus.ERROR, JavaUIMessages.getString("AppearancePreferencePage.packagePrefixRemovalList.error.isEmpty")); //$NON-NLS-1$
192	else	216	else
193	return new StatusInfo();	217	return new StatusInfo();
194	}	218	}
Lines 213-219 Link Here
213	prefs.setValue(PREF_OVERRIDE_INDICATOR, fShowOverrideIndicator.isSelected());	237	prefs.setValue(PREF_OVERRIDE_INDICATOR, fShowOverrideIndicator.isSelected());
214	prefs.setValue(SHOW_CU_CHILDREN, fShowMembersInPackageView.isSelected());	238	prefs.setValue(SHOW_CU_CHILDREN, fShowMembersInPackageView.isSelected());
215	prefs.setValue(STACK_BROWSING_VIEWS_VERTICALLY, fStackBrowsingViewsVertically.isSelected());	239	prefs.setValue(STACK_BROWSING_VIEWS_VERTICALLY, fStackBrowsingViewsVertically.isSelected());
		240	prefs.setValue(PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW, fPackagePrefixList.getText());
216	prefs.setValue(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW, fPackageNamePattern.getText());	241	prefs.setValue(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW, fPackageNamePattern.getText());
		242	prefs.setValue(PREF_REMOVE_PACKAGE_PREFIXES, fRemovePackagePrefixes.isSelected());
217	prefs.setValue(PREF_COMPRESS_PACKAGE_NAMES, fCompressPackageNames.isSelected());	243	prefs.setValue(PREF_COMPRESS_PACKAGE_NAMES, fCompressPackageNames.isSelected());
218	prefs.setValue(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, fFoldPackagesInPackageExplorer.isSelected());	244	prefs.setValue(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, fFoldPackagesInPackageExplorer.isSelected());
219	JavaPlugin.getDefault().savePluginPreferences();	245	JavaPlugin.getDefault().savePluginPreferences();
Lines 229-235 Link Here
229	fShowOverrideIndicator.setSelection(prefs.getDefaultBoolean(PREF_OVERRIDE_INDICATOR));	255	fShowOverrideIndicator.setSelection(prefs.getDefaultBoolean(PREF_OVERRIDE_INDICATOR));
230	fShowMembersInPackageView.setSelection(prefs.getDefaultBoolean(SHOW_CU_CHILDREN));	256	fShowMembersInPackageView.setSelection(prefs.getDefaultBoolean(SHOW_CU_CHILDREN));
231	fStackBrowsingViewsVertically.setSelection(prefs.getDefaultBoolean(STACK_BROWSING_VIEWS_VERTICALLY));	257	fStackBrowsingViewsVertically.setSelection(prefs.getDefaultBoolean(STACK_BROWSING_VIEWS_VERTICALLY));
		258	fPackagePrefixList.setText(prefs.getDefaultString(PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW));
232	fPackageNamePattern.setText(prefs.getDefaultString(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW));	259	fPackageNamePattern.setText(prefs.getDefaultString(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW));
		260	fRemovePackagePrefixes.setSelection(prefs.getDefaultBoolean(PREF_REMOVE_PACKAGE_PREFIXES));
233	fCompressPackageNames.setSelection(prefs.getDefaultBoolean(PREF_COMPRESS_PACKAGE_NAMES));	261	fCompressPackageNames.setSelection(prefs.getDefaultBoolean(PREF_COMPRESS_PACKAGE_NAMES));
234	fFoldPackagesInPackageExplorer.setSelection(prefs.getDefaultBoolean(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER));	262	fFoldPackagesInPackageExplorer.setSelection(prefs.getDefaultBoolean(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER));
235	super.performDefaults();	263	super.performDefaults();

Lines 45-51 Link Here

(-)ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultLabelProvider.java (-2 / +2 lines)
45	fDecorator= PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();	45	fDecorator= PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
46	fLabelProvider=	46	fLabelProvider=
47	new AppearanceAwareLabelProvider(	47	new AppearanceAwareLabelProvider(
48	AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED,	48	AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED \| JavaElementLabels.P_PREFIX_REMOVE,
49	AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS);	49	AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS);
50	fLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));	50	fLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
51	fLabelProvider.addLabelDecorator(new OverrideIndicatorLabelDecorator(null));	51	fLabelProvider.addLabelDecorator(new OverrideIndicatorLabelDecorator(null));
Lines 99-105 Link Here
99	}	99	}
100		100
101	public void setOrder(int orderFlag) {	101	public void setOrder(int orderFlag) {
102	int flags= AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED;	102	int flags= AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED \| JavaElementLabels.P_PREFIX_REMOVE;
103	if (orderFlag == SHOW_ELEMENT_CONTAINER)	103	if (orderFlag == SHOW_ELEMENT_CONTAINER)
104	flags \|= JavaElementLabels.F_POST_QUALIFIED \| JavaElementLabels.M_POST_QUALIFIED \| JavaElementLabels.I_POST_QUALIFIED \| JavaElementLabels.M_PARAMETER_TYPES	104	flags \|= JavaElementLabels.F_POST_QUALIFIED \| JavaElementLabels.M_POST_QUALIFIED \| JavaElementLabels.I_POST_QUALIFIED \| JavaElementLabels.M_PARAMETER_TYPES
105	\| JavaElementLabels.T_POST_QUALIFIED \| JavaElementLabels.D_POST_QUALIFIED \| JavaElementLabels.CF_POST_QUALIFIED \| JavaElementLabels.CU_POST_QUALIFIED;	105	\| JavaElementLabels.T_POST_QUALIFIED \| JavaElementLabels.D_POST_QUALIFIED \| JavaElementLabels.CF_POST_QUALIFIED \| JavaElementLabels.CU_POST_QUALIFIED;

Lines 44-49 Link Here

(-)ui/org/eclipse/jdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java (-1 / +6 lines)
44	if (!store.getBoolean(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)) {	44	if (!store.getBoolean(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)) {
45	fTextFlagMask ^= JavaElementLabels.P_COMPRESSED;	45	fTextFlagMask ^= JavaElementLabels.P_COMPRESSED;
46	}	46	}
		47	if (!store.getBoolean(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES)) {
		48	fTextFlagMask ^= JavaElementLabels.P_PREFIX_REMOVE;
		49	}
47		50
48	fImageFlagMask= -1;	51	fImageFlagMask= -1;
49	}	52	}
Lines 55-61 Link Here
55	String property= event.getProperty();	58	String property= event.getProperty();
56	if (property.equals(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE)	59	if (property.equals(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE)
57	\|\| property.equals(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW)	60	\|\| property.equals(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW)
58	\|\| property.equals(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)) {	61	\|\| property.equals(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)
		62	\|\| property.equals(PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW)
		63	\|\| property.equals(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES)) {
59	initMasks();	64	initMasks();
60	LabelProviderChangedEvent lpEvent= new LabelProviderChangedEvent(this, null); // refresh all	65	LabelProviderChangedEvent lpEvent= new LabelProviderChangedEvent(this, null); // refresh all
61	fireLabelProviderChanged(lpEvent);	66	fireLabelProviderChanged(lpEvent);

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java (-9 / +79 lines)
1	package org.eclipse.jdt.internal.ui.viewsupport;	1	package org.eclipse.jdt.internal.ui.viewsupport;
2		2
		3	import java.util.ArrayList;
		4
3	import org.eclipse.core.runtime.IAdaptable;	5	import org.eclipse.core.runtime.IAdaptable;
4		6
5	import org.eclipse.jface.preference.IPreferenceStore;	7	import org.eclipse.jface.preference.IPreferenceStore;
Lines 210-215 Link Here
210	public final static int P_COMPRESSED= 1 << 29;	212	public final static int P_COMPRESSED= 1 << 29;
211		213
212	/**	214	/**
		215	* Package prefixes are removed.
		216	* e.g. <code>org.eclipse.jdt</code> becomes <code>jdt</code>
		217	*/
		218	public final static int P_PREFIX_REMOVE= 1 << 30;
		219
		220	/**
213	* Qualify all elements	221	* Qualify all elements
214	*/	222	*/
215	public final static int ALL_FULLY_QUALIFIED= F_FULLY_QUALIFIED \| M_FULLY_QUALIFIED \| I_FULLY_QUALIFIED \| T_FULLY_QUALIFIED \| D_QUALIFIED \| CF_QUALIFIED \| CU_QUALIFIED \| P_QUALIFIED \| ROOT_QUALIFIED;	223	public final static int ALL_FULLY_QUALIFIED= F_FULLY_QUALIFIED \| M_FULLY_QUALIFIED \| I_FULLY_QUALIFIED \| T_FULLY_QUALIFIED \| D_QUALIFIED \| CF_QUALIFIED \| CU_QUALIFIED \| P_QUALIFIED \| ROOT_QUALIFIED;
Lines 247-252 Link Here
247	private static String fgPkgNamePostfix;	255	private static String fgPkgNamePostfix;
248	private static int fgPkgNameChars;	256	private static int fgPkgNameChars;
249	private static int fgPkgNameLength;	257	private static int fgPkgNameLength;
		258
		259	/*
		260	* Package prefix removal
		261	*/
		262	private static String fgPkgPrefixList;
		263	private static String[] fgPkgPrefixes;
		264	private static int fgPkgPrefixLength;
250		265
251	private JavaElementLabels() {	266	private JavaElementLabels() {
252	}	267	}
Lines 347-353 Link Here
347		362
348	// qualification	363	// qualification
349	if (getFlag(flags, M_FULLY_QUALIFIED)) {	364	if (getFlag(flags, M_FULLY_QUALIFIED)) {
350	getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & P_COMPRESSED), buf);	365	getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
351	buf.append('.');	366	buf.append('.');
352	}	367	}
353		368
Lines 399-405 Link Here
399	// post qualification	414	// post qualification
400	if (getFlag(flags, M_POST_QUALIFIED)) {	415	if (getFlag(flags, M_POST_QUALIFIED)) {
401	buf.append(CONCAT_STRING);	416	buf.append(CONCAT_STRING);
402	getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & P_COMPRESSED), buf);	417	getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
403	}	418	}
404		419
405	} catch (JavaModelException e) {	420	} catch (JavaModelException e) {
Lines 419-425 Link Here
419		434
420	// qualification	435	// qualification
421	if (getFlag(flags, F_FULLY_QUALIFIED)) {	436	if (getFlag(flags, F_FULLY_QUALIFIED)) {
422	getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & P_COMPRESSED), buf);	437	getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
423	buf.append('.');	438	buf.append('.');
424	}	439	}
425	buf.append(field.getElementName());	440	buf.append(field.getElementName());
Lines 432-438 Link Here
432	// post qualification	447	// post qualification
433	if (getFlag(flags, F_POST_QUALIFIED)) {	448	if (getFlag(flags, F_POST_QUALIFIED)) {
434	buf.append(CONCAT_STRING);	449	buf.append(CONCAT_STRING);
435	getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & P_COMPRESSED), buf);	450	getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
436	}	451	}
437		452
438	} catch (JavaModelException e) {	453	} catch (JavaModelException e) {
Lines 446-452 Link Here
446	public static void getInitializerLabel(IInitializer initializer, int flags, StringBuffer buf) {	461	public static void getInitializerLabel(IInitializer initializer, int flags, StringBuffer buf) {
447	// qualification	462	// qualification
448	if (getFlag(flags, I_FULLY_QUALIFIED)) {	463	if (getFlag(flags, I_FULLY_QUALIFIED)) {
449	getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED \| (flags ^ P_COMPRESSED), buf);	464	getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED \| (flags ^ (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
450	buf.append('.');	465	buf.append('.');
451	}	466	}
452	buf.append(JavaUIMessages.getString("JavaElementLabels.initializer")); //$NON-NLS-1$	467	buf.append(JavaUIMessages.getString("JavaElementLabels.initializer")); //$NON-NLS-1$
Lines 454-460 Link Here
454	// post qualification	469	// post qualification
455	if (getFlag(flags, I_POST_QUALIFIED)) {	470	if (getFlag(flags, I_POST_QUALIFIED)) {
456	buf.append(CONCAT_STRING);	471	buf.append(CONCAT_STRING);
457	getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & P_COMPRESSED), buf);	472	getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED \| (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
458	}	473	}
459	}	474	}
460		475
Lines 465-471 Link Here
465	if (getFlag(flags, T_FULLY_QUALIFIED)) {	480	if (getFlag(flags, T_FULLY_QUALIFIED)) {
466	IPackageFragment pack= type.getPackageFragment();	481	IPackageFragment pack= type.getPackageFragment();
467	if (!pack.isDefaultPackage()) {	482	if (!pack.isDefaultPackage()) {
468	getPackageFragmentLabel(pack, (flags & P_COMPRESSED), buf);	483	getPackageFragmentLabel(pack, (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
469	buf.append('.');	484	buf.append('.');
470	}	485	}
471	buf.append(JavaModelUtil.getTypeQualifiedName(type));	486	buf.append(JavaModelUtil.getTypeQualifiedName(type));
Lines 479-487 Link Here
479	buf.append(CONCAT_STRING);	494	buf.append(CONCAT_STRING);
480	IType declaringType= type.getDeclaringType();	495	IType declaringType= type.getDeclaringType();
481	if (declaringType != null) {	496	if (declaringType != null) {
482	getTypeLabel(declaringType, T_FULLY_QUALIFIED \| (flags & P_COMPRESSED), buf);	497	getTypeLabel(declaringType, T_FULLY_QUALIFIED \| (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
483	} else {	498	} else {
484	getPackageFragmentLabel(type.getPackageFragment(), (flags & P_COMPRESSED), buf);	499	getPackageFragmentLabel(type.getPackageFragment(), (flags & (P_COMPRESSED \| P_PREFIX_REMOVE)), buf);
485	}	500	}
486	}	501	}
487	}	502	}
Lines 558-566 Link Here
558	getPackageFragmentRootLabel((IPackageFragmentRoot) pack.getParent(), ROOT_QUALIFIED, buf);	573	getPackageFragmentRootLabel((IPackageFragmentRoot) pack.getParent(), ROOT_QUALIFIED, buf);
559	buf.append('/');	574	buf.append('/');
560	}	575	}
		576	refreshPackagePrefixList();
561	refreshPackageNamePattern();	577	refreshPackageNamePattern();
562	if (pack.isDefaultPackage()) {	578	if (pack.isDefaultPackage()) {
563	buf.append(JavaUIMessages.getString("JavaElementLabels.default_package")); //$NON-NLS-1$	579	buf.append(JavaUIMessages.getString("JavaElementLabels.default_package")); //$NON-NLS-1$
		580	} else if (getFlag(flags, P_PREFIX_REMOVE) && fgPkgPrefixLength > 0) {
		581	String name= pack.getElementName();
		582	boolean processed = false;
		583	for (int i= 0; i < fgPkgPrefixLength && !processed; i++) {
		584	if (name.startsWith(fgPkgPrefixes[i])) {
		585	buf.append(name.substring(fgPkgPrefixes[i].length()));
		586	processed= true;
		587	}
		588	}
		589	if (!processed)
		590	buf.append(name);
564	} else if (getFlag(flags, P_COMPRESSED) && fgPkgNameLength >= 0) {	591	} else if (getFlag(flags, P_COMPRESSED) && fgPkgNameLength >= 0) {
565	String name= pack.getElementName();	592	String name= pack.getElementName();
566	int start= 0;	593	int start= 0;
Lines 620-625 Link Here
620	}	647	}
621	}	648	}
622		649
		650	private static void refreshPackagePrefixList() {
		651	String list= getPkgPrefixListForPackagesView();
		652	if (list.equals(fgPkgPrefixList))
		653	return;
		654	else if (list.equals("")) { //$NON-NLS-1$
		655	fgPkgPrefixList = ""; //$NON-NLS-1$
		656	fgPkgPrefixLength = 0;
		657	return;
		658	}
		659
		660	fgPkgPrefixList= list;
		661	ArrayList prefixList= new ArrayList();
		662	int lastPos= 0;
		663	int pos= 0;
		664	while ((pos= list.indexOf(',', lastPos)) != -1) {
		665	String prefix= list.substring(lastPos, pos).trim();
		666	if (!prefix.equals("")) { //$NON-NLS-1$
		667	if (prefix.endsWith(".")) //$NON-NLS-1$
		668	prefixList.add(prefix);
		669	else
		670	prefixList.add(prefix + '.');
		671	}
		672	lastPos= pos + 1;
		673	}
		674	String prefix= list.substring(lastPos).trim();
		675	if (!prefix.equals("")) { //$NON-NLS-1$
		676	if (prefix.endsWith(".")) //$NON-NLS-1$
		677	prefixList.add(prefix);
		678	else
		679	prefixList.add(prefix + '.');
		680	}
		681
		682	fgPkgPrefixLength= prefixList.size();
		683	fgPkgPrefixes= (String[]) prefixList.toArray(new String[fgPkgPrefixLength]);
		684	}
		685
623	private static void refreshPackageNamePattern() {	686	private static void refreshPackageNamePattern() {
624	String pattern= getPkgNamePatternForPackagesView();	687	String pattern= getPkgNamePatternForPackagesView();
625	if (pattern.equals(fgPkgNamePattern))	688	if (pattern.equals(fgPkgNamePattern))
Lines 656-660 Link Here
656	if (!store.getBoolean(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES))	719	if (!store.getBoolean(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES))
657	return ""; //$NON-NLS-1$	720	return ""; //$NON-NLS-1$
658	return store.getString(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW);	721	return store.getString(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW);
		722	}
		723
		724	private static String getPkgPrefixListForPackagesView() {
		725	IPreferenceStore store= PreferenceConstants.getPreferenceStore();
		726	if (!store.getBoolean(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES))
		727	return ""; //$NON-NLS-1$
		728	return store.getString(PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW);
659	}	729	}
660	}	730	}

Lines 134-140 Link Here

(-)ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java (-1 / +1 lines)
134		134
135	AppearanceAwareLabelProvider fJavaElementLabelProvider=	135	AppearanceAwareLabelProvider fJavaElementLabelProvider=
136	new AppearanceAwareLabelProvider(	136	new AppearanceAwareLabelProvider(
137	AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED,	137	AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS \| JavaElementLabels.P_COMPRESSED \| JavaElementLabels.P_PREFIX_REMOVE,
138	AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS \| JavaElementImageProvider.SMALL_ICONS	138	AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS \| JavaElementImageProvider.SMALL_ICONS
139	);	139	);
140		140




	public static final String APPEARANCE_COMPRESS_PACKAGE_NAMES= "org.eclipse.jdt.ui.compresspackagenames";//$NON-NLS-1$

	/**
	 * A named preference that defines a list of package prefixes used for
	 * package prefix removal.
	 * <p>
	 * Value is of type <code>String</code>. For example for the given packahe
	 * name 'org.eclipse.jdt', 'org.eclipse' will result in 'jdt'.
	 * </p>
	 */
	public static final String APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW= "PackagesView.pkgPrefixListForPackagesView";//$NON-NLS-1$
	
	/**
	 * A named preference that controls if package name prefix removal is turned
	 * on or off.
	 * <p>
	 * Value is of type <code>Boolean</code>.
	 * </p>
	 * 
	 * @see #APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW
	 */
	public static final String APPEARANCE_REMOVE_PACKAGE_PREFIXES= "org.eclipse.jdt.ui.removepackageprefixes";//$NON-NLS-1$

	/**
	 * A named preference that controls if empty inner packages are folded in
	 * the hierarchical mode of the package explorer.
	 * <p>

		
		// AppearancePreferencePage
		store.setDefault(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES, false);
		store.setDefault(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES, false);
		store.setDefault(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE, false);
		store.setDefault(PreferenceConstants.SHOW_CU_CHILDREN, true);
		store.setDefault(PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR, true);
		store.setDefault(PreferenceConstants.BROWSING_STACK_VERTICALLY, false);
		store.setDefault(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW, ""); //$NON-NLS-1$
		store.setDefault(PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW, "");//$NON-NLS-1$
		store.setDefault(PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, true);

		// ImportOrganizePreferencePage

Return to bug 26642

Lines 377-388 Link Here

(-)ui/org/eclipse/jdt/internal/ui/JavaUIMessages.properties (+3 lines)
377	AppearancePreferencePage.description= Appearance of Java elements in viewers:	377	AppearancePreferencePage.description= Appearance of Java elements in viewers:
378	AppearancePreferencePage.methodreturntype.label= Show &method return types	378	AppearancePreferencePage.methodreturntype.label= Show &method return types
379	AppearancePreferencePage.overrideindicator.label= Show &override indicators in outline and hierarchy	379	AppearancePreferencePage.overrideindicator.label= Show &override indicators in outline and hierarchy
		380	AppearancePreferencePage.pgkPrefixListEnable.label= &Remove package name prefix segments
		381	AppearancePreferencePage.pgkPrefixList.label= &List of package prefixes (comma separated, e.g. given package name 'org.eclipse.jdt' prefix 'org.eclipse' will result in 'jdt'):
380	AppearancePreferencePage.pkgNamePatternEnable.label= &Compress package name segments (except for the last one)	382	AppearancePreferencePage.pkgNamePatternEnable.label= &Compress package name segments (except for the last one)
381	AppearancePreferencePage.pkgNamePattern.label= Com&pression pattern (e.g. given package name 'org.eclipse.jdt' pattern '.' will compress it to '..jdt', '0' to 'jdt', '1~.' to 'o~.e~.jdt'):	383	AppearancePreferencePage.pkgNamePattern.label= Com&pression pattern (e.g. given package name 'org.eclipse.jdt' pattern '.' will compress it to '..jdt', '0' to 'jdt', '1~.' to 'o~.e~.jdt'):
382	AppearancePreferencePage.showMembersInPackagesView=S&how members in Package Explorer	384	AppearancePreferencePage.showMembersInPackagesView=S&how members in Package Explorer
383	AppearancePreferencePage.stackViewsVerticallyInTheJavaBrowsingPerspective=&Stack views vertically in the Java Browsing perspective	385	AppearancePreferencePage.stackViewsVerticallyInTheJavaBrowsingPerspective=&Stack views vertically in the Java Browsing perspective
384	AppearancePreferencePage.preferenceOnlyEffectiveForNewPerspectives=Note: This preference will only take effect on new perspectives	386	AppearancePreferencePage.preferenceOnlyEffectiveForNewPerspectives=Note: This preference will only take effect on new perspectives
385	AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty=Enter a package name compression pattern	387	AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty=Enter a package name compression pattern
		388	AppearancePreferencePage.packagePrefixRemovalList.error.isEmpty=Enter at least one package prefix
386	AppearancePreferencePage.foldEmptyPackages= &Fold empty packages in hierarchical Package Explorer layout	389	AppearancePreferencePage.foldEmptyPackages= &Fold empty packages in hierarchical Package Explorer layout
387		390
388	CodeFormatterPreferencePage.description=Options for the Java Code Formatter:	391	CodeFormatterPreferencePage.description=Options for the Java Code Formatter:

Lines 79-84 Link Here

(-)ui/org/eclipse/jdt/ui/PreferenceConstants.java (+23 lines)
79	public static final String APPEARANCE_COMPRESS_PACKAGE_NAMES= "org.eclipse.jdt.ui.compresspackagenames";//$NON-NLS-1$	79	public static final String APPEARANCE_COMPRESS_PACKAGE_NAMES= "org.eclipse.jdt.ui.compresspackagenames";//$NON-NLS-1$
80		80
81	/**	81	/**
		82	* A named preference that defines a list of package prefixes used for
		83	* package prefix removal.
		84	* <p>
		85	* Value is of type <code>String</code>. For example for the given packahe
		86	* name 'org.eclipse.jdt', 'org.eclipse' will result in 'jdt'.
		87	* </p>
		88	*/
		89	public static final String APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW= "PackagesView.pkgPrefixListForPackagesView";//$NON-NLS-1$
		90
		91	/**
		92	* A named preference that controls if package name prefix removal is turned
		93	* on or off.
		94	* <p>
		95	* Value is of type <code>Boolean</code>.
		96	* </p>
		97	*
		98	* @see #APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW
		99	*/
		100	public static final String APPEARANCE_REMOVE_PACKAGE_PREFIXES= "org.eclipse.jdt.ui.removepackageprefixes";//$NON-NLS-1$
		101
		102	/**
82	* A named preference that controls if empty inner packages are folded in	103	* A named preference that controls if empty inner packages are folded in
83	* the hierarchical mode of the package explorer.	104	* the hierarchical mode of the package explorer.
84	* <p>	105	* <p>
Lines 1525-1535 Link Here
1525		1546
1526	// AppearancePreferencePage	1547	// AppearancePreferencePage
1527	store.setDefault(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES, false);	1548	store.setDefault(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES, false);
		1549	store.setDefault(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES, false);
1528	store.setDefault(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE, false);	1550	store.setDefault(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE, false);
1529	store.setDefault(PreferenceConstants.SHOW_CU_CHILDREN, true);	1551	store.setDefault(PreferenceConstants.SHOW_CU_CHILDREN, true);
1530	store.setDefault(PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR, true);	1552	store.setDefault(PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR, true);
1531	store.setDefault(PreferenceConstants.BROWSING_STACK_VERTICALLY, false);	1553	store.setDefault(PreferenceConstants.BROWSING_STACK_VERTICALLY, false);
1532	store.setDefault(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW, ""); //$NON-NLS-1$	1554	store.setDefault(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW, ""); //$NON-NLS-1$
		1555	store.setDefault(PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW, "");//$NON-NLS-1$
1533	store.setDefault(PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, true);	1556	store.setDefault(PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, true);
1534		1557
1535	// ImportOrganizePreferencePage	1558	// ImportOrganizePreferencePage