Attachment 151933 Details for Bug 276466 – Updated Patch

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

[patch] Updated Patch

patch10_276466.txt (text/plain), 46.97 KB, created by Raksha Vasisht

on 2009-11-11 06:07:01 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Raksha Vasisht

Created: 2009-11-11 06:07:01 EST

Size: 46.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java,v
>retrieving revision 1.32
>diff -u -r1.32 CallHierarchyContentProvider.java
>--- ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java	14 May 2009 20:05:18 -0000	1.32
>+++ ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java	11 Nov 2009 10:44:35 -0000
>@@ -49,22 +49,13 @@
> 	 * constructors in the Call Hierarchy.
> 	 * 
> 	 * Value is of type <code>String</code>: semicolon separated list of fully qualified type names.
>+	 * It has been replaced in 3.6 by API:
>+	 * {@link PreferenceConstants#PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS}
> 	 * 
> 	 * 
> 	 * @since 3.5
> 	 */
>-	public static final String PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.defaultExpandWithConstructors"; //$NON-NLS-1$
>-
>-	/**
>-	 * A named preference that controls whether methods from anonymous types are by default expanded
>-	 * with constructors in the Call Hierarchy.
>-	 * 
>-	 * Value is of type <code>Boolean</code>.
>-	 * 
>-	 * 
>-	 * @since 3.5
>-	 */
>-	public static final String PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.anonymousExpandWithConstructors"; //$NON-NLS-1$
>+	public static final String OLD_PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.defaultExpandWithConstructors"; //$NON-NLS-1$
> 
> 	private final static Object[] EMPTY_ARRAY= new Object[0];
> 
>@@ -175,14 +166,15 @@
> 
> 		if (!wrapper.isExpandWithConstructorsSet()) {
> 			if (CallHierarchyContentProvider.canExpandWithConstructors(wrapper)) {
>-				IType type= wrapper.getMember().getDeclaringType();
>+				IMethod method= (IMethod)wrapper.getMember();
>+				IType type= method.getDeclaringType();
> 				try {
> 					boolean withConstructors= false;
> 					if (type != null) {
>-						boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
>+						boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
> 						if (anonymousPref && type.isAnonymous()) {
> 							withConstructors= true;
>-						} else if (isInTheDefaultExpandWithConstructorList(type)) {
>+						} else if (isInTheDefaultExpandWithConstructorList(method)) {
> 							withConstructors= true;
> 						}
> 					}
>@@ -217,37 +209,50 @@
> 	}
> 	
> 	/**
>-	 * Checks if declaring type matches the pre-defined array of types for default expand with
>-	 * constructors.
>+	 * Checks if the method or its declaring type matches the pre-defined array of methods and types
>+	 * for default expand with constructors.
>+	 * 
>+	 * @param method the wrapped method
>+	 * @return <code>true</code> if method or type matches the pre-defined list, <code>false</code>
>+	 * otherwise
> 	 * 
>-	 * @param type the declaring type of the caller method wrapper
>-	 * @return <code>true</code> if type matches the pre-defined list, <code>false</code> otherwise
> 	 * @since 3.5
> 	 */
>-	static boolean isInTheDefaultExpandWithConstructorList(IType type) {
>-		String serializedTypes= PreferenceConstants.getPreferenceStore().getString(PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
>-		if (serializedTypes.length() == 0)
>+	static boolean isInTheDefaultExpandWithConstructorList(IMethod method) {
>+		String serializedMembers= PreferenceConstants.getPreferenceStore().getString(PreferenceConstants.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS);
>+		if (serializedMembers.length() == 0)
> 			return false;
>-		
>-		String[] defaultTypes= serializedTypes.split(";"); //$NON-NLS-1$
>-		
>-		String typeName= type.getFullyQualifiedName('.');
>-		String superClass;
>-		String[] superInterfaces;
>+		String methodName= method.getElementName();
>+		IType declaringType= method.getDeclaringType();
>+		String[] defaultMemberNames= serializedMembers.split(";"); //$NON-NLS-1$
>+
>+		String declaringTypeName= declaringType.getFullyQualifiedName('.') + ".*"; //$NON-NLS-1$;
>+		String qualifiedMethodName= declaringType.getFullyQualifiedName('.') + '.' + methodName;
>+		String superClassName;
>+		String[] superInterfaceNames;
> 		try {
>-			superClass= type.getSuperclassName();
>-			superInterfaces= type.getSuperInterfaceNames();
>+			superClassName= declaringType.getSuperclassName();
>+			if (superClassName != null) {
>+				if (superClassName.contains("<")) { //$NON-NLS-1$
>+					superClassName= stripParametersFromSuperType(superClassName);
>+				}
>+			}
>+			superInterfaceNames= declaringType.getSuperInterfaceNames();
> 		} catch (JavaModelException e) {
> 			return false;
> 		}
>-		for (int i= 0; i < defaultTypes.length; i++) {
>-			String defaultType= defaultTypes[i];
>-			if (typeName.equals(defaultType) || (superClass != null && typeNameMatches(superClass, defaultType))) {
>+		for (int i= 0; i < defaultMemberNames.length; i++) {
>+			String defaultMemberName= defaultMemberNames[i];
>+			if (qualifiedMethodName.equals(defaultMemberName) || declaringTypeName.equals(defaultMemberName) || checkSuperTypeMatch(superClassName, defaultMemberName)
>+					|| (checkMethodInSuperType(methodName, superClassName, defaultMemberName))) {
> 				return true;
> 			}
>-			if (superInterfaces.length > 0) {
>-				for (int j= 0; j < superInterfaces.length; j++) {
>-					if (typeNameMatches(superInterfaces[j], defaultType))
>+			if (superInterfaceNames.length > 0) {
>+				for (int j= 0; j < superInterfaceNames.length; j++) {
>+					if (superInterfaceNames[j].contains("<")) { //$NON-NLS-1$
>+						superInterfaceNames[j]= stripParametersFromSuperType(superInterfaceNames[j]);
>+					}
>+					if (checkSuperTypeMatch(superInterfaceNames[j], defaultMemberName) || checkMethodInSuperType(methodName, superInterfaceNames[j], defaultMemberName))
> 						return true;
> 				}
> 			}
>@@ -256,6 +261,59 @@
> 	}
> 
> 	/**
>+	 * Strips parameters from the given super type name and returns the substring containing only
>+	 * the type name.
>+	 * 
>+	 * @param superTypeName the super type name
>+	 * @return the substring containing only the type name without the parameters
>+	 * 
>+	 * @since 3.6
>+	 */
>+	private static String stripParametersFromSuperType(String superTypeName) {
>+		int pos= superTypeName.indexOf('<');//strip the parameters
>+		return superTypeName.substring(0, pos);
>+	}
>+
>+	/**
>+	 * Check if the method in the super type matches the default member.
>+	 * 
>+	 * @param methodName the method name
>+	 * @param superTypeName the super type name
>+	 * @param defaultMemberName the member in the default list
>+	 * 
>+	 * @return <code>true</code> if the method in the super type matches the default member,
>+	 * <code>false</code> otherwise
>+	 * 
>+	 * @since 3.6
>+	 */
>+	private static boolean checkMethodInSuperType(String methodName, String superTypeName, String defaultMemberName) {
>+		if (superTypeName != null && typeNameMatches(methodName, defaultMemberName)) {
>+			int pos= defaultMemberName.lastIndexOf('.');
>+			String defaultTypeName= defaultMemberName.substring(0, pos);
>+			return typeNameMatches(superTypeName, defaultTypeName);
>+		}
>+		return false;
>+	}
>+
>+	/**
>+	 * Check whether the given super type name matches the given default type.
>+	 * 
>+	 * @param superType the super type name
>+	 * @param defaultMemberName the default member from the default list
>+	 * 
>+	 * @return <code>true</code> if super type matches with the given type in the default list,
>+	 * <code>false></code> otherwise
>+	 * 
>+	 * @since 3.6
>+	 */
>+	private static boolean checkSuperTypeMatch(String superType, String defaultMemberName) {
>+		if (defaultMemberName.endsWith(".*")) { //$NON-NLS-1$
>+			defaultMemberName= defaultMemberName.substring(0, defaultMemberName.length() - 2);
>+		}
>+		return (superType != null && typeNameMatches(superType, defaultMemberName));
>+	}
>+
>+	/**
> 	 * Checks whether the two type names match. They match if they
> 	 * are equal, or if could be the same type but one is missing the package.
> 	 * 
>Index: ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.java,v
>retrieving revision 1.16
>diff -u -r1.16 CallHierarchyMessages.java
>--- ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.java	14 Oct 2009 10:48:49 -0000	1.16
>+++ ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.java	11 Nov 2009 10:44:35 -0000
>@@ -88,6 +88,25 @@
> 	public static String CallHierarchyViewPart_callsFromMembers_3;
> 	public static String CallHierarchyViewPart_callsFromMembers_more;
> 	public static String CallHierarchyViewPart_callsFromMethod;
>+	public static String ExpandWithConstructorsConfigurationBlock_description;
>+	public static String ExpandWithConstructorsConfigurationBlock_newType_button;
>+	public static String ExpandWithConstructorsConfigurationBlock_newMember_button;
>+	public static String ExpandWithConstructorsConfigurationBlock_edit_button;
>+	public static String ExpandWithConstructorsConfigurationBlock_remove_button;
>+	public static String ExpandWithConstructorsConfigurationBlock_restoreDefaults_button;
>+	public static String CallHierarchyTypesOrMembersDialog_member_title;
>+	public static String CallHierarchyTypesOrMembersDialog_member_labelText;
>+	public static String CallHierarchyTypesOrMembersDialog_type_title;
>+	public static String CallHierarchyTypesOrMembersDialog_type_labelText;
>+	public static String CallHierarchyTypesOrMembersDialog_browse_button;
>+	public static String CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_title;
>+	public static String CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_description;
>+	public static String CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_error_message;
>+	public static String CallHierarchyTypesOrMembersDialog_error_enterName;
>+	public static String CallHierarchyTypesOrMembersDialog_error_invalidMemberName;
>+	public static String CallHierarchyTypesOrMembersDialog_error_invalidTypeName;
>+	public static String CallHierarchyTypesOrMembersDialog_error_entryExists;
>+	public static String CallHierarchyTypesOrMembersDialog_anonymousTypes_label;
> 	public static String FocusOnSelectionAction_focusOnSelection_text;
> 	public static String FocusOnSelectionAction_focusOnSelection_description;
> 	public static String FocusOnSelectionAction_focusOnSelection_tooltip;
>@@ -142,11 +161,7 @@
> 	public static String ExpandWithConstructorsAction_expandWithConstructors_text;
> 	public static String ExpandWithConstructorsAction_expandWithConstructors_description;
> 	public static String ExpandWithConstructorsAction_expandWithConstructors_tooltip;
>-	public static String ExpandWithConstructorsDialog_anonymousTypes_label;
>-	public static String ExpandWithConstructorsDialog_explanation_label;
>-	public static String ExpandWithConstructorsDialog_not_a_valid_type_name;
> 	public static String ExpandWithConstructorsDialog_title;
>-	public static String ExpandWithConstructorsDialog_typeNames_label;
> 	static {
> 		NLS.initializeMessages(BUNDLE_NAME, CallHierarchyMessages.class);
> 	}
>Index: ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.properties,v
>retrieving revision 1.48
>diff -u -r1.48 CallHierarchyMessages.properties
>--- ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.properties	14 Oct 2009 10:48:49 -0000	1.48
>+++ ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.properties	11 Nov 2009 10:44:35 -0000
>@@ -149,8 +149,26 @@
> ExpandWithConstructorsAction_expandWithConstructors_text= &Expand with Constructors
> ExpandWithConstructorsAction_expandWithConstructors_description= Expand with constructors
> ExpandWithConstructorsAction_expandWithConstructors_tooltip= Expand with Constructors
>-ExpandWithConstructorsDialog_anonymousTypes_label=&All methods in anonymous types
>-ExpandWithConstructorsDialog_explanation_label=Configure the types whose instance methods are expanded with constructors by default.
>-ExpandWithConstructorsDialog_not_a_valid_type_name=''{0}'' is not a valid type name
>-ExpandWithConstructorsDialog_title=Expand with Constructors
>-ExpandWithConstructorsDialog_typeNames_label=Type &names (each on a line):
>+ExpandWithConstructorsDialog_title= Expand with Constructors
>+
>+ExpandWithConstructorsConfigurationBlock_description= De&fine a list of members or types with their fully qualified names. The call hierarchy for these members or members of the types will be expanded with constructors by default.
>+ExpandWithConstructorsConfigurationBlock_newType_button= New &Type...
>+ExpandWithConstructorsConfigurationBlock_newMember_button= New &Member...
>+ExpandWithConstructorsConfigurationBlock_edit_button= &Edit...
>+ExpandWithConstructorsConfigurationBlock_remove_button= &Remove 
>+ExpandWithConstructorsConfigurationBlock_restoreDefaults_button= Restore &Defaults
>+
>+CallHierarchyTypesOrMembersDialog_member_title= New Member for Expand With Constructors
>+CallHierarchyTypesOrMembersDialog_member_labelText= Enter a fully qualified non-static, non-constructor member (e.g. \'java.lang.Runnable.run\'): 
>+CallHierarchyTypesOrMembersDialog_type_title= New Type for Expand With Constructors
>+CallHierarchyTypesOrMembersDialog_type_labelText= Enter a fully qualified type (e.g. \'java.lang.Runnable\'):
>+CallHierarchyTypesOrMembersDialog_browse_button= &Browse...
>+CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_title= Type Selection
>+CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_description= Choose type name:
>+CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_error_message= A problem occurred while collecting types. See the error Log for details.
>+CallHierarchyTypesOrMembersDialog_error_enterName=Enter a name or prefix.
>+CallHierarchyTypesOrMembersDialog_error_invalidTypeName=Not a valid type name.
>+CallHierarchyTypesOrMembersDialog_error_invalidMemberName=Not a valid member name.
>+CallHierarchyTypesOrMembersDialog_error_entryExists=Entry already exists in list.
>+CallHierarchyTypesOrMembersDialog_anonymousTypes_label=&All methods in anonymous types
>+
>Index: ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java
>===================================================================
>RCS file: ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java
>diff -N ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,619 @@
>+/*******************************************************************************
>+ * Copyright (c) 2009 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ *******************************************************************************/
>+
>+package org.eclipse.jdt.internal.ui.callhierarchy;
>+
>+import java.util.Arrays;
>+import java.util.List;
>+
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.Text;
>+
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.core.runtime.IStatus;
>+
>+import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jface.dialogs.StatusDialog;
>+import org.eclipse.jface.layout.PixelConverter;
>+import org.eclipse.jface.operation.IRunnableContext;
>+import org.eclipse.jface.viewers.LabelProvider;
>+import org.eclipse.jface.viewers.ViewerComparator;
>+import org.eclipse.jface.window.Window;
>+
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.dialogs.SelectionDialog;
>+import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
>+
>+import org.eclipse.jdt.core.IType;
>+import org.eclipse.jdt.core.JavaConventions;
>+import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.JavaModelException;
>+import org.eclipse.jdt.core.search.IJavaSearchScope;
>+import org.eclipse.jdt.core.search.SearchEngine;
>+
>+import org.eclipse.jdt.ui.IJavaElementSearchConstants;
>+import org.eclipse.jdt.ui.JavaUI;
>+import org.eclipse.jdt.ui.PreferenceConstants;
>+
>+import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
>+import org.eclipse.jdt.internal.ui.JavaPluginImages;
>+import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
>+import org.eclipse.jdt.internal.ui.dialogs.TextFieldNavigationHandler;
>+import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock;
>+import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
>+import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
>+import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels;
>+import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
>+import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
>+import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
>+
>+/**
>+ * Call hierarchy expand with constructors configuration block.
>+ *
>+ * @since 3.6
>+ */
>+public class ExpandWithConstructorsConfigurationBlock extends OptionsConfigurationBlock {
>+
>+	/**
>+	 * Call hierarchy expand with constructors dialog for types and members.
>+	 */
>+	private static class CallHierarchyTypesOrMembersDialog extends StatusDialog {
>+
>+		/**
>+		 * The change listener class for the dialog field and the string button dialog field.
>+		 *
>+		 */
>+		private class StringButtonAdapter implements IDialogFieldListener, IStringButtonAdapter {
>+			/*
>+			 * @see IDialogFieldListener#dialogFieldChanged(DialogField)
>+			 */
>+			public void dialogFieldChanged(DialogField field) {
>+				doValidation();
>+			}
>+
>+			/*
>+			 * @see IStringButtonAdapter#changeControlPressed(DialogField)
>+			 */
>+			public void changeControlPressed(DialogField field) {
>+				doBrowseTypes();
>+			}
>+		}
>+
>+		/**
>+		 * The name dialog field to hold the default expand with constructors list.
>+		 */
>+		private StringButtonDialogField fNameDialogField;
>+
>+		/**
>+		 * The list of previously existing entries.
>+		 */
>+		private List fExistingEntries;
>+
>+		/**
>+		 * Tells whether it is an member or type.
>+		 */
>+		private final boolean fIsEditingMember;
>+
>+		/**
>+		 * Creates a call hierarchy preference dialog for members or types.
>+		 *
>+		 * @param parent the parent shell
>+		 * @param existingEntries the existing list of types and members
>+		 * @param isEditingMember <code>true</code if its a member, <code>false</code> otherwise
>+		 */
>+		public CallHierarchyTypesOrMembersDialog(Shell parent, List existingEntries, boolean isEditingMember) {
>+			super(parent);
>+			fIsEditingMember= isEditingMember;
>+			fExistingEntries= existingEntries;
>+
>+			String label, title;
>+			if (isEditingMember) {
>+				title= CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_member_title;
>+				label= CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_member_labelText;
>+			} else {
>+				title= CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_type_title;
>+				label= CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_type_labelText;
>+			}
>+			setTitle(title);
>+
>+			StringButtonAdapter adapter= new StringButtonAdapter();
>+
>+			fNameDialogField= new StringButtonDialogField(adapter);
>+			fNameDialogField.setLabelText(label);
>+			fNameDialogField.setButtonLabel(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_browse_button);
>+			fNameDialogField.setDialogFieldListener(adapter);
>+			fNameDialogField.setText(""); //$NON-NLS-1$
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jface.dialogs.Dialog#isResizable()		 *
>+		 */
>+		protected boolean isResizable() {
>+			return true;
>+		}
>+
>+		/**
>+		 * Sets the initial selection in the name dialog field.
>+		 *
>+		 * @param editedEntry the edited entry
>+		 */
>+		public void setInitialSelection(String editedEntry) {
>+			Assert.isNotNull(editedEntry);
>+			if (editedEntry.length() == 0)
>+				fNameDialogField.setText(""); //$NON-NLS-1$
>+			else
>+				fNameDialogField.setText(editedEntry);
>+		}
>+
>+		/**
>+		 * Returns the resulting text from the name dialog field.
>+		 *
>+		 * @return the resulting text from the name dialog field
>+		 */
>+		public String getResult() {
>+			String val= fNameDialogField.getText();
>+			if (!fIsEditingMember)
>+				val= val + WILDCARD;
>+			return val;
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
>+		 */
>+		protected Control createDialogArea(Composite parent) {
>+			Composite composite= (Composite)super.createDialogArea(parent);
>+			initializeDialogUnits(composite);
>+
>+			GridLayout layout= (GridLayout)composite.getLayout();
>+			layout.numColumns= 2;
>+
>+			fNameDialogField.doFillIntoGrid(composite, 3);
>+
>+			fNameDialogField.getChangeControl(null).setVisible(!fIsEditingMember);
>+
>+			LayoutUtil.setHorizontalSpan(fNameDialogField.getLabelControl(null), 2);
>+
>+			int fieldWidthHint= convertWidthInCharsToPixels(60);
>+			Text text= fNameDialogField.getTextControl(null);
>+			LayoutUtil.setWidthHint(text, fieldWidthHint);
>+			LayoutUtil.setHorizontalGrabbing(text);
>+			LayoutUtil.setHorizontalSpan(text, fIsEditingMember ? 2 : 1);
>+			TextFieldNavigationHandler.install(text);
>+
>+			DialogField.createEmptySpace(composite, 1);
>+
>+			fNameDialogField.postSetFocusOnDialogField(parent.getDisplay());
>+
>+			applyDialogFont(composite);
>+			return composite;
>+		}
>+
>+		/**
>+		 * Creates the type hierarchy for type selection.
>+		 */
>+		private void doBrowseTypes() {
>+			IRunnableContext context= new BusyIndicatorRunnableContext();
>+			IJavaSearchScope scope= SearchEngine.createWorkspaceScope();
>+			int style= IJavaElementSearchConstants.CONSIDER_ALL_TYPES;
>+			try {
>+				SelectionDialog dialog= JavaUI.createTypeDialog(getShell(), context, scope, style, false, fNameDialogField.getText());
>+				dialog.setTitle(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_title);
>+				dialog.setMessage(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_description);
>+				if (dialog.open() == Window.OK) {
>+					IType res= (IType)dialog.getResult()[0];
>+					fNameDialogField.setText(res.getFullyQualifiedName('.'));
>+				}
>+			} catch (JavaModelException e) {
>+				ExceptionHandler.handle(e, getShell(), CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_title,
>+						CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_error_message);
>+			}
>+		}
>+
>+		/**
>+		 * Validates the entered type or member and updates the status.
>+		 */
>+		private void doValidation() {
>+			StatusInfo status= new StatusInfo();
>+			String newText= fNameDialogField.getText();
>+			if (newText.length() == 0) {
>+				status.setError(""); //$NON-NLS-1$
>+			} else {
>+				IStatus val= JavaConventions.validateJavaTypeName(newText, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
>+				if (val.matches(IStatus.ERROR)) {
>+					if (fIsEditingMember)
>+						status.setError(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_error_invalidMemberName);
>+					else
>+						status.setError(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_error_invalidTypeName);
>+				} else {
>+					if (doesExist(newText)) {
>+						status.setError(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_error_entryExists);
>+					}
>+				}
>+			}
>+			updateStatus(status);
>+		}
>+
>+		/**
>+		 * Checks if the entry already exists.
>+		 *
>+		 * @param name the type or member name
>+		 * @return <code>true</code> if it already exists in the list of types and members,
>+		 * <code>false</code> otherwise
>+		 */
>+		private boolean doesExist(String name) {
>+			for (int i= 0; i < fExistingEntries.size(); i++) {
>+				String entry= (String)fExistingEntries.get(i);
>+				if (name.equals(entry)) {
>+					return true;
>+				}
>+			}
>+			return false;
>+		}
>+
>+
>+		/*
>+		 * @see org.eclipse.jface.window.Window#configureShell(Shell)
>+		 */
>+		protected void configureShell(Shell newShell) {
>+			super.configureShell(newShell);
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IJavaHelpContextIds.CALL_HIERARCHY_EXPAND_WITH_CONSTRUCTORS_DIALOG);
>+		}
>+
>+	}
>+
>+	/*
>+	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#performOk()
>+	 */
>+	public boolean performOk() {
>+		setValue(ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, fIsAnonymous);
>+		return super.performOk();
>+	}
>+
>+	/**
>+	 * The list label provider class.
>+	 */
>+	private static class ListLabelProvider extends LabelProvider {
>+
>+		public final Image MEMBER_ICON;
>+
>+		private final Image CLASS_ICON;
>+
>+		/**
>+		 * Create the member and class icons.
>+		 */
>+		public ListLabelProvider() {
>+			MEMBER_ICON= JavaElementImageProvider.getDecoratedImage(JavaPluginImages.DESC_MISC_PUBLIC, 0, JavaElementImageProvider.SMALL_SIZE);
>+			CLASS_ICON= JavaElementImageProvider.getDecoratedImage(JavaPluginImages.DESC_OBJS_CLASS, 0, JavaElementImageProvider.SMALL_SIZE);
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
>+		 */
>+		public Image getImage(Object element) {
>+			return ((String)element).endsWith(WILDCARD) ? CLASS_ICON : MEMBER_ICON;
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
>+		 */
>+		public String getText(Object element) {
>+			return BasicElementLabels.getJavaElementName((String)element);
>+		}
>+	}
>+
>+
>+	/**
>+	 * The change listener for <code>ListDialogField</code>.
>+	 */
>+	private class ListAdapter implements IListAdapter, IDialogFieldListener {
>+
>+		/**
>+		 * Checks if field can be edited.
>+		 *
>+		 * @param field the list dialog field
>+		 * @return <code>true</code> if it can be edited, <code>false</code> otherwise
>+		 */
>+		private boolean canEdit(ListDialogField field) {
>+			List selected= field.getSelectedElements();
>+			return selected.size() == 1;
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#customButtonPressed(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField, int)
>+		 */
>+		public void customButtonPressed(ListDialogField field, int index) {
>+			doButtonPressed(index);
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#selectionChanged(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField)
>+		 */
>+		public void selectionChanged(ListDialogField field) {
>+			fList.enableButton(IDX_EDIT, canEdit(field));
>+			fList.enableButton(IDX_REMOVE, canRemove(field));
>+		}
>+
>+		/**
>+		 * Checks if the field can be removed.
>+		 *
>+		 * @param field the list dialog field
>+		 * @return <code>true</code> if it can be removed, <code>false</code> otherwise
>+		 */
>+		private boolean canRemove(ListDialogField field) {
>+			List selected= field.getSelectedElements();
>+			return selected.size() != 0;
>+		}
>+
>+		/* )
>+		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener#dialogFieldChanged(org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField)
>+		 */
>+		public void dialogFieldChanged(DialogField field) {
>+			doDialogFieldChanged(field);
>+		}
>+
>+		/*
>+		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField)
>+		 */
>+		public void doubleClicked(ListDialogField field) {
>+			if (canEdit(field)) {
>+				doButtonPressed(IDX_EDIT);
>+			}
>+		}
>+	}
>+
>+	private static final String WILDCARD= ".*"; //$NON-NLS-1$
>+
>+	private static final int IDX_NEW_TYPE= 0;
>+	private static final int IDX_NEW_MEMBER= 1;
>+	private static final int IDX_EDIT= 2;
>+	private static final int IDX_REMOVE= 3;
>+	private static final int IDX_RESTORE_DEFAULTS= 4;
>+
>+	private ListDialogField fList;
>+
>+	private Button fAnonymousButton;
>+
>+	protected boolean fIsAnonymous;
>+
>+	/**
>+	 * A key that holds the list of methods or types whose methods are by default expanded with constructors in the Call Hierarchy.
>+	 */
>+	private static Key DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS= getJDTUIKey(PreferenceConstants.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS);
>+
>+	/**
>+	 * A key that controls whether the methods from anonymous types are by default expanded with constructors in the Call Hierarchy.
>+	 */
>+	private static Key ANONYMOUS_EXPAND_WITH_CONSTRUCTORS= getJDTUIKey(PreferenceConstants.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
>+
>+	/**
>+	 * Returns all the key values.
>+	 *
>+	 * @return array of keys
>+	 */
>+	public static Key[] getAllKeys() {
>+		return new Key[] { DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS, ANONYMOUS_EXPAND_WITH_CONSTRUCTORS };
>+	}
>+
>+
>+	/**
>+	 * Creates the call hierarchy preferences configuration block.
>+	 *
>+	 * @param context the status
>+	 * @param container the preference container
>+	 */
>+	public ExpandWithConstructorsConfigurationBlock(IStatusChangeListener context, IWorkbenchPreferenceContainer container) {
>+		super(context, null, getAllKeys(), container);
>+	}
>+
>+	/*
>+	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite)
>+	 */
>+	protected Control createContents(Composite parent) {
>+		Composite control= new Composite(parent, SWT.NONE);
>+		GridLayout layout= new GridLayout();
>+		layout.numColumns= 2;
>+		layout.marginWidth= 10;
>+		layout.marginHeight= 10;
>+		control.setLayout(layout);
>+
>+		createPreferenceList(control);
>+
>+		fAnonymousButton= new Button(control, SWT.CHECK);
>+		fAnonymousButton.setText(CallHierarchyMessages.CallHierarchyTypesOrMembersDialog_anonymousTypes_label);
>+		fIsAnonymous= getBooleanValue(ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
>+		fAnonymousButton.setSelection(fIsAnonymous);
>+		fAnonymousButton.setLayoutData(new GridData(SWT.LEAD, SWT.TOP, false, false));
>+		fAnonymousButton.addSelectionListener(new SelectionAdapter() {
>+			public void widgetSelected(SelectionEvent e) {
>+				fIsAnonymous= fAnonymousButton.getSelection();
>+			}
>+
>+		});
>+
>+		initialize();
>+
>+		Dialog.applyDialogFont(control);
>+
>+		return control;
>+	}
>+
>+	/**
>+	 * Create a list dialog field.
>+	 *
>+	 * @param parent the composite
>+	 */
>+	private void createPreferenceList(Composite parent) {
>+		String[] buttonLabels= new String[] {
>+				CallHierarchyMessages.ExpandWithConstructorsConfigurationBlock_newType_button,
>+				CallHierarchyMessages.ExpandWithConstructorsConfigurationBlock_newMember_button,
>+				CallHierarchyMessages.ExpandWithConstructorsConfigurationBlock_edit_button,
>+				CallHierarchyMessages.ExpandWithConstructorsConfigurationBlock_remove_button,
>+				CallHierarchyMessages.ExpandWithConstructorsConfigurationBlock_restoreDefaults_button
>+		};
>+
>+		ListAdapter adapter= new ListAdapter();
>+
>+		fList= new ListDialogField(adapter, buttonLabels, new ListLabelProvider());
>+		fList.setDialogFieldListener(adapter);
>+		fList.setLabelText(CallHierarchyMessages.ExpandWithConstructorsConfigurationBlock_description);
>+		fList.setRemoveButtonIndex(IDX_REMOVE);
>+		fList.enableButton(IDX_EDIT, false);
>+		fList.setViewerComparator(new ViewerComparator());
>+
>+		PixelConverter pixelConverter= new PixelConverter(parent);
>+
>+		fList.doFillIntoGrid(parent, 3);
>+		LayoutUtil.setHorizontalSpan(fList.getLabelControl(null), 2);
>+		LayoutUtil.setWidthHint(fList.getLabelControl(null), pixelConverter.convertWidthInCharsToPixels(60));
>+		LayoutUtil.setHorizontalGrabbing(fList.getListControl(null));
>+
>+		Control listControl= fList.getListControl(null);
>+		GridData gd= (GridData)listControl.getLayoutData();
>+		gd.verticalAlignment= GridData.FILL;
>+		gd.grabExcessVerticalSpace= true;
>+		gd.heightHint= pixelConverter.convertHeightInCharsToPixels(10);
>+	}
>+
>+	/**
>+	 * Initialize the elements of the list dialog field.
>+	 */
>+	public void initialize() {
>+		fList.setElements(Arrays.asList(getDefaultExpandWithConstructorsMembers()));
>+	}
>+
>+	/*
>+	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#performDefaults()
>+	 */
>+	public void performDefaults() {
>+		String str= PreferenceConstants.getPreferenceStore().getDefaultString(PreferenceConstants.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS);
>+		fList.setElements(Arrays.asList(deserializeMembers(str)));
>+		fIsAnonymous= PreferenceConstants.getPreferenceStore().getDefaultBoolean(PreferenceConstants.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
>+		fAnonymousButton.setSelection(fIsAnonymous);
>+		super.performDefaults();
>+	}
>+
>+	/*
>+	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getFullBuildDialogStrings(boolean)
>+	 */
>+	protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {
>+		return null;
>+	}
>+
>+	/*
>+	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key, java.lang.String, java.lang.String)
>+	 */
>+	protected void validateSettings(Key changedKey, String oldValue, String newValue) {
>+
>+	}
>+
>+	/**
>+	 * Perform the 'New' and 'Edit' button operations by opening the respective call hierarchy
>+	 * preferences dialog, and 'Restore Defaults' button by restoring to default values for the list dialog.
>+	 *
>+	 * @param index the index of the button
>+	 */
>+	private void doButtonPressed(int index) {
>+		if (index == IDX_NEW_TYPE || index == IDX_NEW_MEMBER) { // add new
>+			List existing= fList.getElements();
>+			CallHierarchyTypesOrMembersDialog dialog= new CallHierarchyTypesOrMembersDialog(getShell(), existing, index == IDX_NEW_MEMBER);
>+			if (dialog.open() == Window.OK) {
>+				fList.addElement(dialog.getResult());
>+			}
>+		} else if (index == IDX_EDIT) { // edit
>+			List selected= fList.getSelectedElements();
>+			if (selected.isEmpty())
>+				return;
>+
>+			String editedEntry= (String)selected.get(0);
>+
>+			List existing= fList.getElements();
>+			existing.remove(editedEntry);
>+			boolean isType= editedEntry.endsWith(WILDCARD);
>+			CallHierarchyTypesOrMembersDialog dialog= new CallHierarchyTypesOrMembersDialog(getShell(), existing, !isType);
>+			if (isType)
>+				dialog.setInitialSelection(editedEntry.substring(0, editedEntry.length() - 2));
>+			else
>+				dialog.setInitialSelection(editedEntry);
>+
>+			if (dialog.open() == Window.OK) {
>+				fList.replaceElement(editedEntry, dialog.getResult());
>+			}
>+		} else if (index == IDX_RESTORE_DEFAULTS){
>+			performDefaults();
>+		}
>+	}
>+
>+	/**
>+	 * Update the key on dialog field change.
>+	 *
>+	 * @param field the dialog field
>+	 */
>+	protected final void doDialogFieldChanged(DialogField field) {
>+		// set values in working copy
>+		if (field == fList) {
>+			setValue(DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS, serializeMembers(fList.getElements()));
>+		}
>+	}
>+
>+	/**
>+	 * Returns the array of strings containing the types or methods for default expand with constructors.
>+	 *
>+	 * @return the array of strings containing the types or methods for default expand with constructors
>+	 */
>+	private String[] getDefaultExpandWithConstructorsMembers() {
>+		String str= getValue(DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS);
>+		if (str != null && str.length() > 0) {
>+			return deserializeMembers(str);
>+		}
>+		return new String[0];
>+	}
>+
>+	/**
>+	 * Return the array of types and/or methods after splitting the stored preference string.
>+	 *
>+	 * @param str the input string
>+	 * @return the array of types and/or methods
>+	 */
>+	private static String[] deserializeMembers(String str) {
>+		return str.split(";"); //$NON-NLS-1$
>+	}
>+
>+	/**
>+	 * Creates a single output string from the list of strings using a delimiter.
>+	 * 
>+	 * @param list the input list of types and/or methods
>+	 * @return the single output string from the list of strings using a delimiter
>+	 */
>+	public static String serializeMembers(List list) {
>+		int size= list.size();
>+		StringBuffer buf= new StringBuffer();
>+		for (int i= 0; i < size; i++) {
>+			buf.append((String)list.get(i));
>+			if (i < size - 1)
>+				buf.append(';');
>+		}
>+		return buf.toString();
>+	}
>+
>+}
>Index: ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java,v
>retrieving revision 1.2
>diff -u -r1.2 ExpandWithConstructorsDialog.java
>--- ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java	28 May 2009 13:05:43 -0000	1.2
>+++ ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java	11 Nov 2009 10:44:59 -0000
>@@ -10,45 +10,31 @@
> *******************************************************************************/
> package org.eclipse.jdt.internal.ui.callhierarchy;
> 
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.custom.StyledText;
>-import org.eclipse.swt.events.ModifyEvent;
>-import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.layout.GridData;
>-import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>-import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Shell;
> 
> import org.eclipse.core.runtime.IStatus;
> 
>-import org.eclipse.jface.dialogs.StatusDialog;
>+import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jface.dialogs.TrayDialog;
> 
> import org.eclipse.ui.PlatformUI;
> 
>-import org.eclipse.jdt.core.JavaConventions;
>-import org.eclipse.jdt.core.JavaCore;
>-
>-import org.eclipse.jdt.internal.corext.util.Messages;
>-
>-import org.eclipse.jdt.ui.PreferenceConstants;
>-
> import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
>-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
>+import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
> 
> /**
> * Configuration dialog for default "Expand with Constructors" behavior.
> * 
> * @since 3.5
> */
>-class ExpandWithConstructorsDialog extends StatusDialog {
>+class ExpandWithConstructorsDialog extends TrayDialog {
> 
>-	private static final String LINE_DELIMITER_REGEX= "\\r\\n?|\\n"; //$NON-NLS-1$
>+	private Control fConfigurationBlockControl;
>+	private ExpandWithConstructorsConfigurationBlock fConfigurationBlock;
> 
>-	private Button fAnonymousButton;
>-	private StyledText fDefaultTypesText;
>-	
> 	protected ExpandWithConstructorsDialog(Shell parentShell) {
> 		super(parentShell);
> 	}
>@@ -66,49 +52,24 @@
> 	protected void configureShell(Shell newShell) {
> 		super.configureShell(newShell);
> 		newShell.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_title);
>-		setHelpAvailable(false);
> 		PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IJavaHelpContextIds.CALL_HIERARCHY_EXPAND_WITH_CONSTRUCTORS_DIALOG);
> 	}
> 
> 	/*
> 	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
> 	 */
>-	protected Control createDialogArea(Composite parent) {
>-		Composite composite= (Composite)super.createDialogArea(parent);
>-		((GridData)composite.getLayoutData()).widthHint= convertWidthInCharsToPixels(60);
>-		
>-		Label descriptionLabel= new Label(composite, SWT.WRAP);
>-		descriptionLabel.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_explanation_label);
>-		descriptionLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
>-		
>-		
>-		Label typesLabel= new Label(composite, SWT.WRAP);
>-		typesLabel.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_typeNames_label);
>-		typesLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
>-		
>-		fDefaultTypesText= new StyledText(composite, SWT.BORDER | SWT.WRAP | SWT.H_SCROLL | SWT.V_SCROLL);
>-		GridData gd= new GridData(SWT.FILL, SWT.FILL, true, true);
>-		gd.heightHint= convertHeightInCharsToPixels(10);
>-		fDefaultTypesText.setLayoutData(gd);
>-		
>-		String defaultTypesPref= PreferenceConstants.getPreferenceStore().getString(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
>-		String defaultTypesText= defaultTypesPref.replace(';', '\n');
>-		fDefaultTypesText.setText(defaultTypesText);
>-		fDefaultTypesText.setSelection(fDefaultTypesText.getCharCount());
>-		
>-		fDefaultTypesText.addModifyListener(new ModifyListener() {
>-			public void modifyText(ModifyEvent e) {
>-				validateInput();
>+	protected Control createDialogArea(Composite composite) {
>+		fConfigurationBlock= new ExpandWithConstructorsConfigurationBlock(new IStatusChangeListener() {
>+			public void statusChanged(IStatus status) {
>+				//Do nothing
>+
> 			}
>-		});
>-		
>-		
>-		fAnonymousButton= new Button(composite, SWT.CHECK);
>-		fAnonymousButton.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_anonymousTypes_label);
>-		boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
>-		fAnonymousButton.setSelection(anonymousPref);
>-		fAnonymousButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
>-		
>+		}, null);
>+		GridData data= new GridData(GridData.FILL, GridData.FILL, true, true);
>+		fConfigurationBlockControl= fConfigurationBlock.createContents(composite);
>+		fConfigurationBlockControl.setLayoutData(data);
>+
>+		Dialog.applyDialogFont(composite);
> 		return composite;
> 	}
> 
>@@ -116,31 +77,7 @@
> 	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
> 	 */
> 	protected void okPressed() {
>-		PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, fAnonymousButton.getSelection());
>-		
>-		String defaultTypes= fDefaultTypesText.getText().trim();
>-		String defaultTypesPref= defaultTypes.replaceAll(LINE_DELIMITER_REGEX, ";"); //$NON-NLS-1$
>-		PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS, defaultTypesPref);
>-		
>+		fConfigurationBlock.performOk();
> 		super.okPressed();
> 	}
>-
>-	private void validateInput() {
>-		StatusInfo status= new StatusInfo();
>-		
>-		String[] defaultTypes= fDefaultTypesText.getText().split(LINE_DELIMITER_REGEX);
>-		for (int i= 0; i < defaultTypes.length; i++) {
>-			String type= defaultTypes[i];
>-			if (type.length() == 0)
>-				continue;
>-			
>-			IStatus typeNameStatus= JavaConventions.validateJavaTypeName(type, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
>-			if (typeNameStatus.getSeverity() == IStatus.ERROR) {
>-				status.setError(Messages.format(CallHierarchyMessages.ExpandWithConstructorsDialog_not_a_valid_type_name, type));
>-				break;
>-			}
>-		}
>-		
>-		updateStatus(status);
>-	}
> }
>Index: ui/org/eclipse/jdt/ui/PreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/PreferenceConstants.java,v
>retrieving revision 1.246
>diff -u -r1.246 PreferenceConstants.java
>--- ui/org/eclipse/jdt/ui/PreferenceConstants.java	14 May 2009 20:05:18 -0000	1.246
>+++ ui/org/eclipse/jdt/ui/PreferenceConstants.java	11 Nov 2009 10:45:13 -0000
>@@ -10,6 +10,7 @@
> *******************************************************************************/
> package org.eclipse.jdt.ui;
> 
>+import java.util.Arrays;
> import java.util.Locale;
> import java.util.StringTokenizer;
> 
>@@ -44,6 +45,7 @@
> import org.eclipse.jdt.internal.ui.JavaPlugin;
> import org.eclipse.jdt.internal.ui.JavaUIPreferenceInitializer;
> import org.eclipse.jdt.internal.ui.callhierarchy.CallHierarchyContentProvider;
>+import org.eclipse.jdt.internal.ui.callhierarchy.ExpandWithConstructorsConfigurationBlock;
> import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
> import org.eclipse.jdt.internal.ui.preferences.NewJavaProjectPreferencePage;
> import org.eclipse.jdt.internal.ui.preferences.formatter.FormatterProfileManager;
>@@ -3233,6 +3235,29 @@
> 	 */
> 	public static final String EDITOR_FOLDING_HEADERS= "editor_folding_default_headers"; //$NON-NLS-1$
> 
>+	/**
>+	 * A named preference that holds the methods or types whose methods are by default expanded with
>+	 * constructors in the Call Hierarchy.
>+	 * 
>+	 * Value is of type <code>String</code>: semicolon separated list of fully qualified type names
>+	 * appended with ".*" or "." + method name.
>+	 * 
>+	 * 
>+	 * @since 3.6
>+	 */
>+	public static final String PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS= "CallHierarchy.defaultExpandWithConstructorsMembers"; //$NON-NLS-1$
>+
>+	/**
>+	 * A named preference that controls whether methods from anonymous types are by default expanded
>+	 * with constructors in the Call Hierarchy.
>+	 * 
>+	 * Value is of type <code>Boolean</code>.
>+	 * 
>+	 * 
>+	 * @since 3.6
>+	 */
>+	public static final String PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.anonymousExpandWithConstructors"; //$NON-NLS-1$
>+
> 
> 	//---------- Properties File Editor ----------
> 
>@@ -3875,9 +3900,19 @@
> 
> 		// Colors that are set by the current theme
> 		JavaUIPreferenceInitializer.setThemeBasedPreferences(store, false);
>-		
>-		store.setDefault(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, true);
>-		store.setDefault(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS, "java.lang.Runnable;java.util.concurrent.Callable;org.eclipse.swt.widgets.Listener"); //$NON-NLS-1$
>+
>+		store.setDefault(PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, true);
>+		store.setDefault(PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS, "java.lang.Runnable.run;java.util.concurrent.Callable.call;org.eclipse.swt.widgets.Listener.handleEvent"); //$NON-NLS-1$
>+		// compatibility code
>+		String str= store.getString(CallHierarchyContentProvider.OLD_PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
>+		if (str.length() > 0) {
>+			String[] oldPrefStr= str.split(";"); //$NON-NLS-1$
>+			for (int i= 0; i < oldPrefStr.length; i++) {
>+				oldPrefStr[i]= oldPrefStr[i] + (".*"); //$NON-NLS-1$				
>+			}
>+			store.setValue(PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS_MEMBERS, ExpandWithConstructorsConfigurationBlock.serializeMembers(Arrays.asList(oldPrefStr)));
>+			store.setToDefault(CallHierarchyContentProvider.OLD_PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
>+		}
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 276466: 135958 | 144529 | 146514 | 147082 | 149404 | 151152 | 151933