Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 2865 Details for
Bug 26642
Improvement of "Compress package name segments" [package explorer]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch based on today's CVS
jdt-ui.patch (text/plain), 25.12 KB, created by
Boris Pruessmann
on 2002-12-22 07:31:48 EST
(
hide
)
Description:
Patch based on today's CVS
Filename:
MIME Type:
Creator:
Boris Pruessmann
Created:
2002-12-22 07:31:48 EST
Size:
25.12 KB
patch
obsolete
>jdt-ui.patchc»º+ryº+rmBINbXIndex: ui/org/eclipse/jdt/internal/ui/JavaUIMessages.properties >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaUIMessages.properties,v >retrieving revision 1.179 >diff -u -r1.179 JavaUIMessages.properties >--- ui/org/eclipse/jdt/internal/ui/JavaUIMessages.properties 16 Dec 2002 10:35:23 -0000 1.179 >+++ ui/org/eclipse/jdt/internal/ui/JavaUIMessages.properties 22 Dec 2002 12:25:20 -0000 >@@ -377,12 +377,15 @@ > AppearancePreferencePage.description= Appearance of Java elements in viewers: > AppearancePreferencePage.methodreturntype.label= Show &method return types > AppearancePreferencePage.overrideindicator.label= Show &override indicators in outline and hierarchy >+AppearancePreferencePage.pgkPrefixListEnable.label= &Remove package name prefix segments >+AppearancePreferencePage.pgkPrefixList.label= &List of package prefixes (comma separated, e.g. given package name 'org.eclipse.jdt' prefix 'org.eclipse' will result in 'jdt'): > AppearancePreferencePage.pkgNamePatternEnable.label= &Compress package name segments (except for the last one) > 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'): > AppearancePreferencePage.showMembersInPackagesView=S&how members in Package Explorer > AppearancePreferencePage.stackViewsVerticallyInTheJavaBrowsingPerspective=&Stack views vertically in the Java Browsing perspective > AppearancePreferencePage.preferenceOnlyEffectiveForNewPerspectives=Note: This preference will only take effect on new perspectives > AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty=Enter a package name compression pattern >+AppearancePreferencePage.packagePrefixRemovalList.error.isEmpty=Enter at least one package prefix > AppearancePreferencePage.foldEmptyPackages= &Fold empty packages in hierarchical Package Explorer layout > > CodeFormatterPreferencePage.description=Options for the Java Code Formatter: >Index: ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewLabelProvider.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewLabelProvider.java,v >retrieving revision 1.12 >diff -u -r1.12 PackagesViewLabelProvider.java >--- ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewLabelProvider.java 17 Dec 2002 14:53:31 -0000 1.12 >+++ ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewLabelProvider.java 22 Dec 2002 12:25:25 -0000 >@@ -45,7 +45,7 @@ > private TreeHierarchyLayoutProblemsDecorator fDecorator; > > PackagesViewLabelProvider(int state) { >- this(state, AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED, AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | JavaElementImageProvider.SMALL_ICONS); >+ this(state, AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED | JavaElementLabels.P_PREFIX_REMOVE, AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | JavaElementImageProvider.SMALL_ICONS); > } > > PackagesViewLabelProvider(int state, int textFlags, int imageFlags) { >Index: ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java,v >retrieving revision 1.159 >diff -u -r1.159 PackageExplorerPart.java >--- ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java 13 Dec 2002 12:25:59 -0000 1.159 >+++ ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java 22 Dec 2002 12:25:23 -0000 >@@ -417,7 +417,7 @@ > } > > private PackageExplorerLabelProvider createLabelProvider() { >- return new PackageExplorerLabelProvider(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED, >+ return new PackageExplorerLabelProvider(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED | JavaElementLabels.P_PREFIX_REMOVE, > AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | JavaElementImageProvider.SMALL_ICONS, > fContentProvider); > } >Index: ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java,v >retrieving revision 1.24 >diff -u -r1.24 AppearancePreferencePage.java >--- ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java 13 Dec 2002 12:25:59 -0000 1.24 >+++ ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java 22 Dec 2002 12:25:21 -0000 >@@ -35,6 +35,8 @@ > private static final String PREF_OVERRIDE_INDICATOR= PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR; > private static final String PREF_COMPRESS_PACKAGE_NAMES= PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES; > private static final String PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW= PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW; >+ private static final String PREF_REMOVE_PACKAGE_PREFIXES= PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES; >+ private static final String PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW= PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW; > private static final String STACK_BROWSING_VIEWS_VERTICALLY= PreferenceConstants.BROWSING_STACK_VERTICALLY; > private static final String PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER= PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER; > >@@ -73,8 +75,10 @@ > private SelectionButtonDialogField fShowMethodReturnType; > private SelectionButtonDialogField fShowOverrideIndicator; > private SelectionButtonDialogField fCompressPackageNames; >+ private SelectionButtonDialogField fRemovePackagePrefixes; > private SelectionButtonDialogField fStackBrowsingViewsVertically; > private SelectionButtonDialogField fShowMembersInPackageView; >+ private StringDialogField fPackagePrefixList; > private StringDialogField fPackageNamePattern; > private SelectionButtonDialogField fFoldPackagesInPackageExplorer; > >@@ -110,10 +114,18 @@ > fFoldPackagesInPackageExplorer.setDialogFieldListener(listener); > fFoldPackagesInPackageExplorer.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.foldEmptyPackages")); //$NON-NLS-1$ > >+ fRemovePackagePrefixes= new SelectionButtonDialogField(SWT.CHECK); >+ fRemovePackagePrefixes.setDialogFieldListener(listener); >+ fRemovePackagePrefixes.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pgkPrefixListEnable.label")); //$NON-NLS-1$ >+ > fCompressPackageNames= new SelectionButtonDialogField(SWT.CHECK); > fCompressPackageNames.setDialogFieldListener(listener); > fCompressPackageNames.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pkgNamePatternEnable.label")); //$NON-NLS-1$ > >+ fPackagePrefixList= new StringDialogField(); >+ fPackagePrefixList.setDialogFieldListener(listener); >+ fPackagePrefixList.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pgkPrefixList.label")); //$NON-NLS-1$ >+ > fPackageNamePattern= new StringDialogField(); > fPackageNamePattern.setDialogFieldListener(listener); > fPackageNamePattern.setLabelText(JavaUIMessages.getString("AppearancePreferencePage.pkgNamePattern.label")); //$NON-NLS-1$ >@@ -125,8 +137,11 @@ > fShowOverrideIndicator.setSelection(prefs.getBoolean(PREF_OVERRIDE_INDICATOR)); > fShowMembersInPackageView.setSelection(prefs.getBoolean(SHOW_CU_CHILDREN)); > fStackBrowsingViewsVertically.setSelection(prefs.getBoolean(STACK_BROWSING_VIEWS_VERTICALLY)); >+ fPackagePrefixList.setText(prefs.getString(PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW)); > fPackageNamePattern.setText(prefs.getString(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW)); >+ fRemovePackagePrefixes.setSelection(prefs.getBoolean(PREF_REMOVE_PACKAGE_PREFIXES)); > fCompressPackageNames.setSelection(prefs.getBoolean(PREF_COMPRESS_PACKAGE_NAMES)); >+ fPackagePrefixList.setEnabled(fRemovePackagePrefixes.isSelected()); > fPackageNamePattern.setEnabled(fCompressPackageNames.isSelected()); > fFoldPackagesInPackageExplorer.setSelection(prefs.getBoolean(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER)); > } >@@ -161,6 +176,11 @@ > > new Separator().doFillIntoGrid(composite, nColumns); > >+ fRemovePackagePrefixes.doFillIntoGrid(composite, nColumns); >+ fPackagePrefixList.doFillIntoGrid(composite, 2); >+ LayoutUtil.setHorizontalGrabbing(fPackagePrefixList.getTextControl(null)); >+ LayoutUtil.setWidthHint(fPackagePrefixList.getLabelControl(null), convertWidthInCharsToPixels(65)); >+ > fCompressPackageNames.doFillIntoGrid(composite, nColumns); > fPackageNamePattern.doFillIntoGrid(composite, 2); > LayoutUtil.setHorizontalGrabbing(fPackageNamePattern.getTextControl(null)); >@@ -182,6 +202,8 @@ > private void doDialogFieldChanged(DialogField field) { > if (field == fCompressPackageNames) > fPackageNamePattern.setEnabled(fCompressPackageNames.isSelected()); >+ else if (field == fRemovePackagePrefixes) >+ fPackagePrefixList.setEnabled(fRemovePackagePrefixes.isSelected()); > > updateStatus(getValidationStatus()); > } >@@ -189,6 +211,8 @@ > private IStatus getValidationStatus(){ > if (fCompressPackageNames.isSelected() && fPackageNamePattern.getText().equals("")) //$NON-NLS-1$ > return new StatusInfo(IStatus.ERROR, JavaUIMessages.getString("AppearancePreferencePage.packageNameCompressionPattern.error.isEmpty")); //$NON-NLS-1$ >+ else if (fRemovePackagePrefixes.isSelected() && fPackagePrefixList.getText().equals("")) //$NON-NLS-1$ >+ return new StatusInfo(IStatus.ERROR, JavaUIMessages.getString("AppearancePreferencePage.packagePrefixRemovalList.error.isEmpty")); //$NON-NLS-1$ > else > return new StatusInfo(); > } >@@ -213,7 +237,9 @@ > prefs.setValue(PREF_OVERRIDE_INDICATOR, fShowOverrideIndicator.isSelected()); > prefs.setValue(SHOW_CU_CHILDREN, fShowMembersInPackageView.isSelected()); > prefs.setValue(STACK_BROWSING_VIEWS_VERTICALLY, fStackBrowsingViewsVertically.isSelected()); >+ prefs.setValue(PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW, fPackagePrefixList.getText()); > prefs.setValue(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW, fPackageNamePattern.getText()); >+ prefs.setValue(PREF_REMOVE_PACKAGE_PREFIXES, fRemovePackagePrefixes.isSelected()); > prefs.setValue(PREF_COMPRESS_PACKAGE_NAMES, fCompressPackageNames.isSelected()); > prefs.setValue(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, fFoldPackagesInPackageExplorer.isSelected()); > JavaPlugin.getDefault().savePluginPreferences(); >@@ -229,7 +255,9 @@ > fShowOverrideIndicator.setSelection(prefs.getDefaultBoolean(PREF_OVERRIDE_INDICATOR)); > fShowMembersInPackageView.setSelection(prefs.getDefaultBoolean(SHOW_CU_CHILDREN)); > fStackBrowsingViewsVertically.setSelection(prefs.getDefaultBoolean(STACK_BROWSING_VIEWS_VERTICALLY)); >+ fPackagePrefixList.setText(prefs.getDefaultString(PREF_PKG_PREFIX_LIST_FOR_PKG_VIEW)); > fPackageNamePattern.setText(prefs.getDefaultString(PREF_PKG_NAME_PATTERN_FOR_PKG_VIEW)); >+ fRemovePackagePrefixes.setSelection(prefs.getDefaultBoolean(PREF_REMOVE_PACKAGE_PREFIXES)); > fCompressPackageNames.setSelection(prefs.getDefaultBoolean(PREF_COMPRESS_PACKAGE_NAMES)); > fFoldPackagesInPackageExplorer.setSelection(prefs.getDefaultBoolean(PREF_FOLD_PACKAGES_IN_PACKAGE_EXPLORER)); > super.performDefaults(); >Index: ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultLabelProvider.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultLabelProvider.java,v >retrieving revision 1.34 >diff -u -r1.34 JavaSearchResultLabelProvider.java >--- ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultLabelProvider.java 20 Dec 2002 15:49:37 -0000 1.34 >+++ ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultLabelProvider.java 22 Dec 2002 12:25:22 -0000 >@@ -45,7 +45,7 @@ > fDecorator= PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(); > fLabelProvider= > new AppearanceAwareLabelProvider( >- AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED, >+ AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED | JavaElementLabels.P_PREFIX_REMOVE, > AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS); > fLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null)); > fLabelProvider.addLabelDecorator(new OverrideIndicatorLabelDecorator(null)); >@@ -99,7 +99,7 @@ > } > > public void setOrder(int orderFlag) { >- int flags= AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED; >+ int flags= AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED | JavaElementLabels.P_PREFIX_REMOVE; > if (orderFlag == SHOW_ELEMENT_CONTAINER) > flags |= JavaElementLabels.F_POST_QUALIFIED | JavaElementLabels.M_POST_QUALIFIED | JavaElementLabels.I_POST_QUALIFIED | JavaElementLabels.M_PARAMETER_TYPES > | JavaElementLabels.T_POST_QUALIFIED | JavaElementLabels.D_POST_QUALIFIED | JavaElementLabels.CF_POST_QUALIFIED | JavaElementLabels.CU_POST_QUALIFIED; >Index: ui/org/eclipse/jdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java,v >retrieving revision 1.7 >diff -u -r1.7 AppearanceAwareLabelProvider.java >--- ui/org/eclipse/jdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java 12 Dec 2002 12:41:25 -0000 1.7 >+++ ui/org/eclipse/jdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java 22 Dec 2002 12:25:23 -0000 >@@ -44,6 +44,9 @@ > if (!store.getBoolean(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)) { > fTextFlagMask ^= JavaElementLabels.P_COMPRESSED; > } >+ if (!store.getBoolean(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES)) { >+ fTextFlagMask ^= JavaElementLabels.P_PREFIX_REMOVE; >+ } > > fImageFlagMask= -1; > } >@@ -55,7 +58,9 @@ > String property= event.getProperty(); > if (property.equals(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE) > || property.equals(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW) >- || property.equals(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)) { >+ || property.equals(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES) >+ || property.equals(PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW) >+ || property.equals(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES)) { > initMasks(); > LabelProviderChangedEvent lpEvent= new LabelProviderChangedEvent(this, null); // refresh all > fireLabelProviderChanged(lpEvent); >Index: ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java,v >retrieving revision 1.24 >diff -u -r1.24 JavaElementLabels.java >--- ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java 13 Dec 2002 18:39:19 -0000 1.24 >+++ ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLabels.java 22 Dec 2002 12:25:23 -0000 >@@ -1,5 +1,7 @@ > package org.eclipse.jdt.internal.ui.viewsupport; > >+import java.util.ArrayList; >+ > import org.eclipse.core.runtime.IAdaptable; > > import org.eclipse.jface.preference.IPreferenceStore; >@@ -210,6 +212,12 @@ > public final static int P_COMPRESSED= 1 << 29; > > /** >+ * Package prefixes are removed. >+ * e.g. <code>org.eclipse.jdt</code> becomes <code>jdt</code> >+ */ >+ public final static int P_PREFIX_REMOVE= 1 << 30; >+ >+ /** > * Qualify all elements > */ > 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; >@@ -247,6 +255,13 @@ > private static String fgPkgNamePostfix; > private static int fgPkgNameChars; > private static int fgPkgNameLength; >+ >+ /* >+ * Package prefix removal >+ */ >+ private static String fgPkgPrefixList; >+ private static String[] fgPkgPrefixes; >+ private static int fgPkgPrefixLength; > > private JavaElementLabels() { > } >@@ -347,7 +362,7 @@ > > // qualification > if (getFlag(flags, M_FULLY_QUALIFIED)) { >- getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf); >+ getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED | (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > buf.append('.'); > } > >@@ -399,7 +414,7 @@ > // post qualification > if (getFlag(flags, M_POST_QUALIFIED)) { > buf.append(CONCAT_STRING); >- getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf); >+ getTypeLabel(method.getDeclaringType(), T_FULLY_QUALIFIED | (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > } > > } catch (JavaModelException e) { >@@ -419,7 +434,7 @@ > > // qualification > if (getFlag(flags, F_FULLY_QUALIFIED)) { >- getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf); >+ getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED | (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > buf.append('.'); > } > buf.append(field.getElementName()); >@@ -432,7 +447,7 @@ > // post qualification > if (getFlag(flags, F_POST_QUALIFIED)) { > buf.append(CONCAT_STRING); >- getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf); >+ getTypeLabel(field.getDeclaringType(), T_FULLY_QUALIFIED | (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > } > > } catch (JavaModelException e) { >@@ -446,7 +461,7 @@ > public static void getInitializerLabel(IInitializer initializer, int flags, StringBuffer buf) { > // qualification > if (getFlag(flags, I_FULLY_QUALIFIED)) { >- getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED | (flags ^ P_COMPRESSED), buf); >+ getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED | (flags ^ (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > buf.append('.'); > } > buf.append(JavaUIMessages.getString("JavaElementLabels.initializer")); //$NON-NLS-1$ >@@ -454,7 +469,7 @@ > // post qualification > if (getFlag(flags, I_POST_QUALIFIED)) { > buf.append(CONCAT_STRING); >- getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf); >+ getTypeLabel(initializer.getDeclaringType(), T_FULLY_QUALIFIED | (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > } > } > >@@ -465,7 +480,7 @@ > if (getFlag(flags, T_FULLY_QUALIFIED)) { > IPackageFragment pack= type.getPackageFragment(); > if (!pack.isDefaultPackage()) { >- getPackageFragmentLabel(pack, (flags & P_COMPRESSED), buf); >+ getPackageFragmentLabel(pack, (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > buf.append('.'); > } > buf.append(JavaModelUtil.getTypeQualifiedName(type)); >@@ -479,9 +494,9 @@ > buf.append(CONCAT_STRING); > IType declaringType= type.getDeclaringType(); > if (declaringType != null) { >- getTypeLabel(declaringType, T_FULLY_QUALIFIED | (flags & P_COMPRESSED), buf); >+ getTypeLabel(declaringType, T_FULLY_QUALIFIED | (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > } else { >- getPackageFragmentLabel(type.getPackageFragment(), (flags & P_COMPRESSED), buf); >+ getPackageFragmentLabel(type.getPackageFragment(), (flags & (P_COMPRESSED | P_PREFIX_REMOVE)), buf); > } > } > } >@@ -558,9 +573,21 @@ > getPackageFragmentRootLabel((IPackageFragmentRoot) pack.getParent(), ROOT_QUALIFIED, buf); > buf.append('/'); > } >+ refreshPackagePrefixList(); > refreshPackageNamePattern(); > if (pack.isDefaultPackage()) { > buf.append(JavaUIMessages.getString("JavaElementLabels.default_package")); //$NON-NLS-1$ >+ } else if (getFlag(flags, P_PREFIX_REMOVE) && fgPkgPrefixLength > 0) { >+ String name= pack.getElementName(); >+ boolean processed = false; >+ for (int i= 0; i < fgPkgPrefixLength && !processed; i++) { >+ if (name.startsWith(fgPkgPrefixes[i])) { >+ buf.append(name.substring(fgPkgPrefixes[i].length())); >+ processed= true; >+ } >+ } >+ if (!processed) >+ buf.append(name); > } else if (getFlag(flags, P_COMPRESSED) && fgPkgNameLength >= 0) { > String name= pack.getElementName(); > int start= 0; >@@ -620,6 +647,42 @@ > } > } > >+ private static void refreshPackagePrefixList() { >+ String list= getPkgPrefixListForPackagesView(); >+ if (list.equals(fgPkgPrefixList)) >+ return; >+ else if (list.equals("")) { //$NON-NLS-1$ >+ fgPkgPrefixList = ""; //$NON-NLS-1$ >+ fgPkgPrefixLength = 0; >+ return; >+ } >+ >+ fgPkgPrefixList= list; >+ ArrayList prefixList= new ArrayList(); >+ int lastPos= 0; >+ int pos= 0; >+ while ((pos= list.indexOf(',', lastPos)) != -1) { >+ String prefix= list.substring(lastPos, pos).trim(); >+ if (!prefix.equals("")) { //$NON-NLS-1$ >+ if (prefix.endsWith(".")) //$NON-NLS-1$ >+ prefixList.add(prefix); >+ else >+ prefixList.add(prefix + '.'); >+ } >+ lastPos= pos + 1; >+ } >+ String prefix= list.substring(lastPos).trim(); >+ if (!prefix.equals("")) { //$NON-NLS-1$ >+ if (prefix.endsWith(".")) //$NON-NLS-1$ >+ prefixList.add(prefix); >+ else >+ prefixList.add(prefix + '.'); >+ } >+ >+ fgPkgPrefixLength= prefixList.size(); >+ fgPkgPrefixes= (String[]) prefixList.toArray(new String[fgPkgPrefixLength]); >+ } >+ > private static void refreshPackageNamePattern() { > String pattern= getPkgNamePatternForPackagesView(); > if (pattern.equals(fgPkgNamePattern)) >@@ -656,5 +719,12 @@ > if (!store.getBoolean(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES)) > return ""; //$NON-NLS-1$ > return store.getString(PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW); >+ } >+ >+ private static String getPkgPrefixListForPackagesView() { >+ IPreferenceStore store= PreferenceConstants.getPreferenceStore(); >+ if (!store.getBoolean(PreferenceConstants.APPEARANCE_REMOVE_PACKAGE_PREFIXES)) >+ return ""; //$NON-NLS-1$ >+ return store.getString(PreferenceConstants.APPEARANCE_PKG_PREFIX_LIST_FOR_PKG_VIEW); > } > } >Index: ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java,v >retrieving revision 1.20 >diff -u -r1.20 JavaWorkingSetPage.java >--- ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java 13 Dec 2002 10:30:41 -0000 1.20 >+++ ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java 22 Dec 2002 12:25:21 -0000 >@@ -134,7 +134,7 @@ > > AppearanceAwareLabelProvider fJavaElementLabelProvider= > new AppearanceAwareLabelProvider( >- AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED, >+ AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS | JavaElementLabels.P_COMPRESSED | JavaElementLabels.P_PREFIX_REMOVE, > AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | JavaElementImageProvider.SMALL_ICONS > ); > >Index: ui/org/eclipse/jdt/ui/PreferenceConstants.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/PreferenceConstants.java,v >retrieving revision 1.35 >diff -u -r1.35 PreferenceConstants.java >--- ui/org/eclipse/jdt/ui/PreferenceConstants.java 20 Dec 2002 13:15:14 -0000 1.35 >+++ ui/org/eclipse/jdt/ui/PreferenceConstants.java 22 Dec 2002 12:25:19 -0000 >@@ -79,6 +79,27 @@ > 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> >@@ -1525,11 +1546,13 @@ > > // 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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 26642
: 2865