Attachment #147082 for bug #276466

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




	public static String ToggleOrientationAction_single_label;
	public static String ToggleOrientationAction_single_tooltip;
	public static String ToggleOrientationAction_single_description;
	public static String ShowExpandWithConstructorsDialogAction_text;
	public static String ShowFilterDialogAction_text;
	public static String FiltersDialog_filter;
	public static String FiltersDialog_filterOnNames;

	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;

	public static String ExpandWithConstructorsAction_expandWithConstructors_text;
	public static String ExpandWithConstructorsAction_expandWithConstructors_description;
	public static String ExpandWithConstructorsAction_expandWithConstructors_tooltip;
	public static String ExpandWithConstructorsDialogAction_expandWithConstructors_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);
	}




ToggleOrientationAction_single_tooltip=Hierarchy Only
ToggleOrientationAction_single_description=Hierarchy Only

ShowExpandWithConstructorsDialogAction_text=E&xpand with Constructors...
ShowFilterDialogAction_text= &Filters...
FiltersDialog_filter= Filter Calls
FiltersDialog_filterOnNames= &Name filter patterns (matching names will be hidden):

ExpandWithConstructorsAction_expandWithConstructors_text= &Expand with Constructors
ExpandWithConstructorsAction_expandWithConstructors_description= Expand with constructors
ExpandWithConstructorsAction_expandWithConstructors_tooltip= Expand with Constructors
ExpandWithConstructorsDialogAction_expandWithConstructors_label= E&xpand with Constructors...
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





 *******************************************************************************/
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.Dialog;
import org.eclipse.jface.dialogs.StatusDialog;

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.wizards.IStatusChangeListener;

/**
 * Configuration dialog for default "Expand with Constructors" behavior.

 */
class ExpandWithConstructorsDialog extends StatusDialog {

	private Control fConfigurationBlockControl;
	private ExpandWithConstructorsConfigurationBlock fConfigurationBlock;

	private Button fAnonymousButton;
	private StyledText fDefaultTypesText;
	
	protected ExpandWithConstructorsDialog(Shell parentShell) {
		super(parentShell);
	}

	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 composite) {
		fConfigurationBlock= new ExpandWithConstructorsConfigurationBlock(new IStatusChangeListener() {
			public void statusChanged(IStatus status) {
				//Do nothing

		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();
			}
		}, null);
		GridData data= new GridData(GridData.FILL, GridData.FILL, true, true);
		fConfigurationBlockControl= fConfigurationBlock.createContents(composite);
		fConfigurationBlockControl.setLayoutData(data);

		Dialog.applyDialogFont(composite);
		fAnonymousButton.setSelection(anonymousPref);
		fAnonymousButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
		
		return composite;
	}


	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
	 */
	protected void okPressed() {
		fConfigurationBlock.performOk();
		
		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);
		
		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);
	}
}




 *******************************************************************************/
package org.eclipse.jdt.internal.ui.callhierarchy;

import org.eclipse.swt.widgets.Shell;

import org.eclipse.core.runtime.Assert;

import org.eclipse.jface.action.Action;

            openFiltersDialog();
        }
    }
 
    class ShowExpandWithConstructorsDialogAction extends Action {
    	ShowExpandWithConstructorsDialogAction() {
    		setText(CallHierarchyMessages.ShowExpandWithConstructorsDialogAction_text);
    	}
    	
    	public void run() {
    		openExpandWithConstructorsDialog();
    	}
    }
    
    private IViewPart fPart;

    /**

    private void fillViewMenu(IMenuManager viewMenu) {
        viewMenu.add(new Separator("filters")); //$NON-NLS-1$
        viewMenu.add(new ShowFilterDialogAction());
        viewMenu.add(new ShowExpandWithConstructorsDialogAction());
    }

    /* (non-Javadoc)


        dialog.open();
    }
    
    private void openExpandWithConstructorsDialog() {
    	Shell parentShell= fPart.getViewSite().getShell();
		new ExpandWithConstructorsDialog(parentShell).open();
    }
}




    private boolean fShowCallDetails;
	protected Composite fParent;
	private IPartListener2 fPartListener;
	private ExpandWithConstructorsActionGroup fExpandWithConstructorsActionGroup;


    public CallHierarchyViewPart() {

        fSearchScopeActions = new SearchScopeActionGroup(this, fDialogSettings);
        fFiltersActionGroup = new CallHierarchyFiltersActionGroup(this,
                fCallHierarchyViewer);
        fExpandWithConstructorsActionGroup= new ExpandWithConstructorsActionGroup(this);
        fHistoryDropDownAction = new HistoryDropDownAction(this);
        fHistoryDropDownAction.setEnabled(false);
        fCancelSearchAction = new CancelSearchAction(this);

                    new GenerateActionGroup(this),
                    new RefactorActionGroup(this),
                    new JavaSearchActionGroup(this),
                    fSearchScopeActions, fFiltersActionGroup, fExpandWithConstructorsActionGroup
                });
    }





public class CallHierarchyContentProvider implements ITreeContentProvider {

	/**
	 * A named preference that holds the methods or types whose methods are by default expanded with
	 * constructors in the Call Hierarchy.
	 * <p>
	 * Value is of type <code>String</code>: semicolon separated list of fully qualified type or method names.
	 * </p>
	 * 
	 * @since 3.5

						boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
						if (anonymousPref && type.isAnonymous()) {
							withConstructors= true;
						} else if (isInTheDefaultExpandWithConstructorList(wrapper)) {
							withConstructors= true;
						}
					}

	}
	
	/**
	 * Checks if the member or its declaring type matches the pre-defined array of members and types
	 * for default expand with constructors.
	 * 
	 * @param wrapper caller method wrapper
	 * @return <code>true</code> if method or type matches the pre-defined list, <code>false</code> otherwise
	 * @since 3.5
	 */
	static boolean isInTheDefaultExpandWithConstructorList(CallerMethodWrapper wrapper) {
		String serializedTypesAndMembers= PreferenceConstants.getPreferenceStore().getString(PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
		if (serializedTypesAndMembers.length() == 0)
			return false;
		String member= wrapper.getMember().getElementName();
		IType declaringType= wrapper.getMember().getDeclaringType();
		String[] defaultTypesOrMembers= serializedTypesAndMembers.split(";"); //$NON-NLS-1$

		String declaringTypeName= declaringType.getFullyQualifiedName('.').concat(".*"); //$NON-NLS-1$;
		String qualifiedMemberName= declaringType.getFullyQualifiedName('.').concat(".").concat(member); //$NON-NLS-1$
		String superClass;
		String[] superInterfaces;
		try {
			superClass= declaringType.getSuperclassName();
			superInterfaces= declaringType.getSuperInterfaceNames();
		} catch (JavaModelException e) {
			return false;
		}
		for (int i= 0; i < defaultTypesOrMembers.length; i++) {
			String defaultTypeOrMember= defaultTypesOrMembers[i];
			if (qualifiedMemberName.equals(defaultTypeOrMember) || declaringTypeName.equals(defaultTypeOrMember)
					|| (typeNameMatches(member, defaultTypeOrMember) && superClass != null && defaultTypeOrMember.endsWith(superClass.concat(".").concat(member))) //$NON-NLS-1$
							|| checkSuperClassMatch(superClass, defaultTypeOrMember)) {
				return true;
			}
			if (superInterfaces.length > 0) {
				for (int j= 0; j < superInterfaces.length; j++) {
					if (typeNameMatches(superInterfaces[j].concat(".*"), defaultTypeOrMember)) //$NON-NLS-1$
						return true;
				}
			}

	}

	/**
	 * Check whether the given super class name matches the given default type.
	 *
	 * @param superClass the super class name
	 * @param defaultTypeOrMember the default type or member from the default list
	 *
	 * @return <code>true</code> if super class matches with the given type , <code>false></code> otherwise
	 * @since 3.6
	 */
	private static boolean checkSuperClassMatch(String superClass, String defaultTypeOrMember) {
		if (defaultTypeOrMember.endsWith(".*")){ //$NON-NLS-1$
			defaultTypeOrMember= defaultTypeOrMember.substring(0, defaultTypeOrMember.length() - 2);
		}
		return (superClass != null && typeNameMatches(superClass, defaultTypeOrMember));
	}

	/**
	 * 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.
	 * 




/*******************************************************************************
 * 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.ArrayList;
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() {
		PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS, serializeFavorites(fList.getElements()));
		PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_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;

	/**
	 * The array of types for default expand with constructors.
	 */
	String[] defaultTypes= { "java.lang.Runnable.*", "java.util.concurrent.Callable.*", "org.eclipse.swt.widgets.Listener.*" }; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$

	private Button fAnonymousButton;

	protected boolean fIsAnonymous;

	/**
	 * A key that holds the list of methods or types whose methods are by default expanded with constructors.
	 */
	private static Key DEFAULT_EXPAND_WITH_CONSTRUCTORS= getJDTUIKey(PreferenceConstants.getPreferenceStore().getString(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS));

	/**
	 * Returns all the key values.
	 *
	 * @return array of keys
	 */
	public static Key[] getAllKeys() {
		return new Key[] {DEFAULT_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);
		boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
		fAnonymousButton.setSelection(anonymousPref);
		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.BEGINNING;
		gd.heightHint= pixelConverter.convertHeightInCharsToPixels(10);
	}

	/**
	 * Initialize the elements of the list dialog field.
	 */
	public void initialize() {
		initializeFields();
	}

	/**
	 * Initialize the elements of the list dialog field.
	 */
	private void initializeFields() {
		List storedPreference= new ArrayList();
		storedPreference.addAll(Arrays.asList(getExpandWithConstructorsKey()));
		fList.setElements(storedPreference);
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#performDefaults()
	 */
	public void performDefaults() {
		super.performDefaults();
		fList.setElements(Arrays.asList(defaultTypes));
	}

	/*
	 * @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, serializeFavorites(fList.getElements()));
		}
	}

	/**
	 * Returns the key that holds the user preferences for default expand with constructors.
	 *
	 * @return the call hierarchy expand with constructors key
	 */
	private String[] getExpandWithConstructorsKey() {
		setValue(DEFAULT_EXPAND_WITH_CONSTRUCTORS, PreferenceConstants.getPreferenceStore().getString(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS));
		String str= getValue(DEFAULT_EXPAND_WITH_CONSTRUCTORS);
		if (str != null && str.length() > 0)
			return deserializeFavorites(str);
		return new String[0];
	}

	/**
	 * Return the array of types and/or members after splitting the stored preference string.
	 *
	 * @param str the input string
	 * @return the array of types and/or members
	 */
	private static String[] deserializeFavorites(String str) {
		return str.split(";"); //$NON-NLS-1$
	}

	/**
	 * Creates a single output string from the list of strings using a delimiter.
	 *
	 * @param str the input string
	 * @return the single output string from the list of strings using a delimiter
	 */
	private static String serializeFavorites(List str) {
		int size= str.size();
		StringBuffer buf= new StringBuffer();
		for (int i= 0; i < size; i++) {
			buf.append((String)str.get(i));
			if (i < size - 1)
				buf.append(';');
		}
		return buf.toString();
	}

}




/*******************************************************************************
 * 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 org.eclipse.swt.widgets.Shell;

import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;

import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionGroup;

/**
 * Call Hierarchy expand with constructors action group.
 *
 * @since 3.6
 *
 */
public class ExpandWithConstructorsActionGroup extends ActionGroup {
	private CallHierarchyViewPart fPart;

	/**
	 * Creates the expand with constructors action group.
	 *
	 * @param part the call hierarchy view part
	 */
	public ExpandWithConstructorsActionGroup(CallHierarchyViewPart part) {
		fPart= part;
	}

	/**
	 * Call hierarchy expand with constructors action class.
	 *
	 */
	public class ExpandWithConstructorsDialogAction extends Action {

		/**
		 * Creates the call hierarchy expand with constructors action.
		 */
		public ExpandWithConstructorsDialogAction() {
			setText(CallHierarchyMessages.ExpandWithConstructorsDialogAction_expandWithConstructors_label);
		}

		/*
		 * @see org.eclipse.jface.action.Action#run()
		 */
		public void run() {
			Shell shell= fPart.getViewSite().getShell();
			ExpandWithConstructorsDialog dialog= new ExpandWithConstructorsDialog(shell);
			dialog.open();
		}
	}


	/*
	 * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
	 */
	public void fillActionBars(IActionBars actionBars) {
		fillViewMenu(actionBars.getMenuManager());
	}


	/**
	 * Fills the action to the view menu.
	 * @param viewMenu the menu manager
	 */
	private void fillViewMenu(IMenuManager viewMenu) {
		viewMenu.add(new Separator("expandWithConstructors")); //$NON-NLS-1$
		viewMenu.add(new ExpandWithConstructorsDialogAction());
	}


}

Return to bug 276466

Lines 55-61 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.properties (-6 / +24 lines)
55	ToggleOrientationAction_single_tooltip=Hierarchy Only	55	ToggleOrientationAction_single_tooltip=Hierarchy Only
56	ToggleOrientationAction_single_description=Hierarchy Only	56	ToggleOrientationAction_single_description=Hierarchy Only
57		57
58	ShowExpandWithConstructorsDialogAction_text=E&xpand with Constructors...
59	ShowFilterDialogAction_text= &Filters...	58	ShowFilterDialogAction_text= &Filters...
60	FiltersDialog_filter= Filter Calls	59	FiltersDialog_filter= Filter Calls
61	FiltersDialog_filterOnNames= &Name filter patterns (matching names will be hidden):	60	FiltersDialog_filterOnNames= &Name filter patterns (matching names will be hidden):
Lines 146-153 Link Here
146	ExpandWithConstructorsAction_expandWithConstructors_text= &Expand with Constructors	145	ExpandWithConstructorsAction_expandWithConstructors_text= &Expand with Constructors
147	ExpandWithConstructorsAction_expandWithConstructors_description= Expand with constructors	146	ExpandWithConstructorsAction_expandWithConstructors_description= Expand with constructors
148	ExpandWithConstructorsAction_expandWithConstructors_tooltip= Expand with Constructors	147	ExpandWithConstructorsAction_expandWithConstructors_tooltip= Expand with Constructors
149	ExpandWithConstructorsDialog_anonymousTypes_label=&All methods in anonymous types	148	ExpandWithConstructorsDialogAction_expandWithConstructors_label= E&xpand with Constructors...
150	ExpandWithConstructorsDialog_explanation_label=Configure the types whose instance methods are expanded with constructors by default.	149	ExpandWithConstructorsDialog_title= Expand with Constructors
151	ExpandWithConstructorsDialog_not_a_valid_type_name=''{0}'' is not a valid type name	150
152	ExpandWithConstructorsDialog_title=Expand with Constructors	151	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.
153	ExpandWithConstructorsDialog_typeNames_label=Type &names (each on a line):	152	ExpandWithConstructorsConfigurationBlock_newType_button= New &Type...
		153	ExpandWithConstructorsConfigurationBlock_newMember_button= New &Member...
		154	ExpandWithConstructorsConfigurationBlock_edit_button= &Edit...
		155	ExpandWithConstructorsConfigurationBlock_remove_button= &Remove
		156	ExpandWithConstructorsConfigurationBlock_restoreDefaults_button= Restore &Defaults
		157
		158	CallHierarchyTypesOrMembersDialog_member_title= New Member for Expand With Constructors
		159	CallHierarchyTypesOrMembersDialog_member_labelText= Enter a fully qualified non-static, non-constructor member (e.g. \'java.lang.Runnable.run\'):
		160	CallHierarchyTypesOrMembersDialog_type_title= New Type for Expand With Constructors
		161	CallHierarchyTypesOrMembersDialog_type_labelText= Enter a fully qualified type (e.g. \'java.lang.Runnable\'):
		162	CallHierarchyTypesOrMembersDialog_browse_button= &Browse...
		163	CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_title= Type Selection
		164	CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_description= Choose type name:
		165	CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_error_message= A problem occurred while collecting types. See the error Log for details.
		166	CallHierarchyTypesOrMembersDialog_error_enterName=Enter a name or prefix.
		167	CallHierarchyTypesOrMembersDialog_error_invalidTypeName=Not a valid type name.
		168	CallHierarchyTypesOrMembersDialog_error_invalidMemberName=Not a valid member name.
		169	CallHierarchyTypesOrMembersDialog_error_entryExists=Entry already exists in list.
		170	CallHierarchyTypesOrMembersDialog_anonymousTypes_label=&All methods in anonymous types
		171

Lines 10-41 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java (-79 / +16 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.callhierarchy;	11	package org.eclipse.jdt.internal.ui.callhierarchy;
12		12
13	import org.eclipse.swt.SWT;
14	import org.eclipse.swt.custom.StyledText;
15	import org.eclipse.swt.events.ModifyEvent;
16	import org.eclipse.swt.events.ModifyListener;
17	import org.eclipse.swt.layout.GridData;	13	import org.eclipse.swt.layout.GridData;
18	import org.eclipse.swt.widgets.Button;
19	import org.eclipse.swt.widgets.Composite;	14	import org.eclipse.swt.widgets.Composite;
20	import org.eclipse.swt.widgets.Control;	15	import org.eclipse.swt.widgets.Control;
21	import org.eclipse.swt.widgets.Label;
22	import org.eclipse.swt.widgets.Shell;	16	import org.eclipse.swt.widgets.Shell;
23		17
24	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.core.runtime.IStatus;
25		19
		20	import org.eclipse.jface.dialogs.Dialog;
26	import org.eclipse.jface.dialogs.StatusDialog;	21	import org.eclipse.jface.dialogs.StatusDialog;
27		22
28	import org.eclipse.ui.PlatformUI;	23	import org.eclipse.ui.PlatformUI;
29		24
30	import org.eclipse.jdt.core.JavaConventions;
31	import org.eclipse.jdt.core.JavaCore;
32
33	import org.eclipse.jdt.internal.corext.util.Messages;
34
35	import org.eclipse.jdt.ui.PreferenceConstants;
36
37	import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;	25	import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
38	import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;	26	import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
39		27
40	/**	28	/**
41	* Configuration dialog for default "Expand with Constructors" behavior.	29	* Configuration dialog for default "Expand with Constructors" behavior.
Lines 44-54 Link Here
44	*/	32	*/
45	class ExpandWithConstructorsDialog extends StatusDialog {	33	class ExpandWithConstructorsDialog extends StatusDialog {
46		34
47	private static final String LINE_DELIMITER_REGEX= "\\r\\n?\|\\n"; //$NON-NLS-1$	35	private Control fConfigurationBlockControl;
		36	private ExpandWithConstructorsConfigurationBlock fConfigurationBlock;
48		37
49	private Button fAnonymousButton;
50	private StyledText fDefaultTypesText;
51
52	protected ExpandWithConstructorsDialog(Shell parentShell) {	38	protected ExpandWithConstructorsDialog(Shell parentShell) {
53	super(parentShell);	39	super(parentShell);
54	}	40	}
Lines 66-114 Link Here
66	protected void configureShell(Shell newShell) {	52	protected void configureShell(Shell newShell) {
67	super.configureShell(newShell);	53	super.configureShell(newShell);
68	newShell.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_title);	54	newShell.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_title);
69	setHelpAvailable(false);
70	PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IJavaHelpContextIds.CALL_HIERARCHY_EXPAND_WITH_CONSTRUCTORS_DIALOG);	55	PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IJavaHelpContextIds.CALL_HIERARCHY_EXPAND_WITH_CONSTRUCTORS_DIALOG);
71	}	56	}
72		57
73	/*	58	/*
74	* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)	59	* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
75	*/	60	*/
76	protected Control createDialogArea(Composite parent) {	61	protected Control createDialogArea(Composite composite) {
77	Composite composite= (Composite)super.createDialogArea(parent);	62	fConfigurationBlock= new ExpandWithConstructorsConfigurationBlock(new IStatusChangeListener() {
78	((GridData)composite.getLayoutData()).widthHint= convertWidthInCharsToPixels(60);	63	public void statusChanged(IStatus status) {
79		64	//Do nothing
80	Label descriptionLabel= new Label(composite, SWT.WRAP);	65
81	descriptionLabel.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_explanation_label);
82	descriptionLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
83
84
85	Label typesLabel= new Label(composite, SWT.WRAP);
86	typesLabel.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_typeNames_label);
87	typesLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
88
89	fDefaultTypesText= new StyledText(composite, SWT.BORDER \| SWT.WRAP \| SWT.H_SCROLL \| SWT.V_SCROLL);
90	GridData gd= new GridData(SWT.FILL, SWT.FILL, true, true);
91	gd.heightHint= convertHeightInCharsToPixels(10);
92	fDefaultTypesText.setLayoutData(gd);
93
94	String defaultTypesPref= PreferenceConstants.getPreferenceStore().getString(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
95	String defaultTypesText= defaultTypesPref.replace(';', '\n');
96	fDefaultTypesText.setText(defaultTypesText);
97	fDefaultTypesText.setSelection(fDefaultTypesText.getCharCount());
98
99	fDefaultTypesText.addModifyListener(new ModifyListener() {
100	public void modifyText(ModifyEvent e) {
101	validateInput();
102	}	66	}
103	});	67	}, null);
104		68	GridData data= new GridData(GridData.FILL, GridData.FILL, true, true);
105		69	fConfigurationBlockControl= fConfigurationBlock.createContents(composite);
106	fAnonymousButton= new Button(composite, SWT.CHECK);	70	fConfigurationBlockControl.setLayoutData(data);
107	fAnonymousButton.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_anonymousTypes_label);	71
108	boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);	72	Dialog.applyDialogFont(composite);
109	fAnonymousButton.setSelection(anonymousPref);
110	fAnonymousButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
111
112	return composite;	73	return composite;
113	}	74	}
114		75
Lines 116-146 Link Here
116	* @see org.eclipse.jface.dialogs.Dialog#okPressed()	77	* @see org.eclipse.jface.dialogs.Dialog#okPressed()
117	*/	78	*/
118	protected void okPressed() {	79	protected void okPressed() {
119	PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, fAnonymousButton.getSelection());	80	fConfigurationBlock.performOk();
120
121	String defaultTypes= fDefaultTypesText.getText().trim();
122	String defaultTypesPref= defaultTypes.replaceAll(LINE_DELIMITER_REGEX, ";"); //$NON-NLS-1$
123	PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS, defaultTypesPref);
124
125	super.okPressed();	81	super.okPressed();
126	}	82	}
127
128	private void validateInput() {
129	StatusInfo status= new StatusInfo();
130
131	String[] defaultTypes= fDefaultTypesText.getText().split(LINE_DELIMITER_REGEX);
132	for (int i= 0; i < defaultTypes.length; i++) {
133	String type= defaultTypes[i];
134	if (type.length() == 0)
135	continue;
136
137	IStatus typeNameStatus= JavaConventions.validateJavaTypeName(type, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
138	if (typeNameStatus.getSeverity() == IStatus.ERROR) {
139	status.setError(Messages.format(CallHierarchyMessages.ExpandWithConstructorsDialog_not_a_valid_type_name, type));
140	break;
141	}
142	}
143
144	updateStatus(status);
145	}
146	}	83	}

Lines 11-18 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyFiltersActionGroup.java (-19 / +1 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.jdt.internal.ui.callhierarchy;	12	package org.eclipse.jdt.internal.ui.callhierarchy;
13		13
14	import org.eclipse.swt.widgets.Shell;
15
16	import org.eclipse.core.runtime.Assert;	14	import org.eclipse.core.runtime.Assert;
17		15
18	import org.eclipse.jface.action.Action;	16	import org.eclipse.jface.action.Action;
Lines 46-62 Link Here
46	openFiltersDialog();	44	openFiltersDialog();
47	}	45	}
48	}	46	}
49		47
50	class ShowExpandWithConstructorsDialogAction extends Action {
51	ShowExpandWithConstructorsDialogAction() {
52	setText(CallHierarchyMessages.ShowExpandWithConstructorsDialogAction_text);
53	}
54
55	public void run() {
56	openExpandWithConstructorsDialog();
57	}
58	}
59
60	private IViewPart fPart;	48	private IViewPart fPart;
61		49
62	/**	50	/**
Lines 81-87 Link Here
81	private void fillViewMenu(IMenuManager viewMenu) {	69	private void fillViewMenu(IMenuManager viewMenu) {
82	viewMenu.add(new Separator("filters")); //$NON-NLS-1$	70	viewMenu.add(new Separator("filters")); //$NON-NLS-1$
83	viewMenu.add(new ShowFilterDialogAction());	71	viewMenu.add(new ShowFilterDialogAction());
84	viewMenu.add(new ShowExpandWithConstructorsDialogAction());
85	}	72	}
86		73
87	/* (non-Javadoc)	74	/* (non-Javadoc)
Lines 99-107 Link Here
99		86
100	dialog.open();	87	dialog.open();
101	}	88	}
102
103	private void openExpandWithConstructorsDialog() {
104	Shell parentShell= fPart.getViewSite().getShell();
105	new ExpandWithConstructorsDialog(parentShell).open();
106	}
107	}	89	}

Lines 45-54 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java (-20 / +40 lines)
45	public class CallHierarchyContentProvider implements ITreeContentProvider {	45	public class CallHierarchyContentProvider implements ITreeContentProvider {
46		46
47	/**	47	/**
48	* A named preference that holds the types whose methods are by default expanded with	48	* A named preference that holds the methods or types whose methods are by default expanded with
49	* constructors in the Call Hierarchy.	49	* constructors in the Call Hierarchy.
50	* <p>	50	* <p>
51	* Value is of type <code>String</code>: semicolon separated list of fully qualified type names.	51	* Value is of type <code>String</code>: semicolon separated list of fully qualified type or method names.
52	* </p>	52	* </p>
53	*	53	*
54	* @since 3.5	54	* @since 3.5
Lines 182-188 Link Here
182	boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);	182	boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
183	if (anonymousPref && type.isAnonymous()) {	183	if (anonymousPref && type.isAnonymous()) {
184	withConstructors= true;	184	withConstructors= true;
185	} else if (isInTheDefaultExpandWithConstructorList(type)) {	185	} else if (isInTheDefaultExpandWithConstructorList(wrapper)) {
186	withConstructors= true;	186	withConstructors= true;
187	}	187	}
188	}	188	}
Lines 217-253 Link Here
217	}	217	}
218		218
219	/**	219	/**
220	* Checks if declaring type matches the pre-defined array of types for default expand with	220	* Checks if the member or its declaring type matches the pre-defined array of members and types
221	* constructors.	221	* for default expand with constructors.
222	*	222	*
223	* @param type the declaring type of the caller method wrapper	223	* @param wrapper caller method wrapper
224	* @return <code>true</code> if type matches the pre-defined list, <code>false</code> otherwise	224	* @return <code>true</code> if method or type matches the pre-defined list, <code>false</code> otherwise
225	* @since 3.5	225	* @since 3.5
226	*/	226	*/
227	static boolean isInTheDefaultExpandWithConstructorList(IType type) {	227	static boolean isInTheDefaultExpandWithConstructorList(CallerMethodWrapper wrapper) {
228	String serializedTypes= PreferenceConstants.getPreferenceStore().getString(PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);	228	String serializedTypesAndMembers= PreferenceConstants.getPreferenceStore().getString(PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS);
229	if (serializedTypes.length() == 0)	229	if (serializedTypesAndMembers.length() == 0)
230	return false;	230	return false;
231		231	String member= wrapper.getMember().getElementName();
232	String[] defaultTypes= serializedTypes.split(";"); //$NON-NLS-1$	232	IType declaringType= wrapper.getMember().getDeclaringType();
233		233	String[] defaultTypesOrMembers= serializedTypesAndMembers.split(";"); //$NON-NLS-1$
234	String typeName= type.getFullyQualifiedName('.');	234
		235	String declaringTypeName= declaringType.getFullyQualifiedName('.').concat(".*"); //$NON-NLS-1$;
		236	String qualifiedMemberName= declaringType.getFullyQualifiedName('.').concat(".").concat(member); //$NON-NLS-1$
235	String superClass;	237	String superClass;
236	String[] superInterfaces;	238	String[] superInterfaces;
237	try {	239	try {
238	superClass= type.getSuperclassName();	240	superClass= declaringType.getSuperclassName();
239	superInterfaces= type.getSuperInterfaceNames();	241	superInterfaces= declaringType.getSuperInterfaceNames();
240	} catch (JavaModelException e) {	242	} catch (JavaModelException e) {
241	return false;	243	return false;
242	}	244	}
243	for (int i= 0; i < defaultTypes.length; i++) {	245	for (int i= 0; i < defaultTypesOrMembers.length; i++) {
244	String defaultType= defaultTypes[i];	246	String defaultTypeOrMember= defaultTypesOrMembers[i];
245	if (typeName.equals(defaultType) \|\| (superClass != null && typeNameMatches(superClass, defaultType))) {	247	if (qualifiedMemberName.equals(defaultTypeOrMember) \|\| declaringTypeName.equals(defaultTypeOrMember)
		248	\|\| (typeNameMatches(member, defaultTypeOrMember) && superClass != null && defaultTypeOrMember.endsWith(superClass.concat(".").concat(member))) //$NON-NLS-1$
		249	\|\| checkSuperClassMatch(superClass, defaultTypeOrMember)) {
246	return true;	250	return true;
247	}	251	}
248	if (superInterfaces.length > 0) {	252	if (superInterfaces.length > 0) {
249	for (int j= 0; j < superInterfaces.length; j++) {	253	for (int j= 0; j < superInterfaces.length; j++) {
250	if (typeNameMatches(superInterfaces[j], defaultType))	254	if (typeNameMatches(superInterfaces[j].concat(".*"), defaultTypeOrMember)) //$NON-NLS-1$
251	return true;	255	return true;
252	}	256	}
253	}	257	}
Lines 256-261 Link Here
256	}	260	}
257		261
258	/**	262	/**
		263	* Check whether the given super class name matches the given default type.
		264	*
		265	* @param superClass the super class name
		266	* @param defaultTypeOrMember the default type or member from the default list
		267	*
		268	* @return <code>true</code> if super class matches with the given type , <code>false></code> otherwise
		269	* @since 3.6
		270	*/
		271	private static boolean checkSuperClassMatch(String superClass, String defaultTypeOrMember) {
		272	if (defaultTypeOrMember.endsWith(".*")){ //$NON-NLS-1$
		273	defaultTypeOrMember= defaultTypeOrMember.substring(0, defaultTypeOrMember.length() - 2);
		274	}
		275	return (superClass != null && typeNameMatches(superClass, defaultTypeOrMember));
		276	}
		277
		278	/**
259	* Checks whether the two type names match. They match if they	279	* Checks whether the two type names match. They match if they
260	* are equal, or if could be the same type but one is missing the package.	280	* are equal, or if could be the same type but one is missing the package.
261	*	281	*

Lines 58-64 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.java (-5 / +20 lines)
58	public static String ToggleOrientationAction_single_label;	58	public static String ToggleOrientationAction_single_label;
59	public static String ToggleOrientationAction_single_tooltip;	59	public static String ToggleOrientationAction_single_tooltip;
60	public static String ToggleOrientationAction_single_description;	60	public static String ToggleOrientationAction_single_description;
61	public static String ShowExpandWithConstructorsDialogAction_text;
62	public static String ShowFilterDialogAction_text;	61	public static String ShowFilterDialogAction_text;
63	public static String FiltersDialog_filter;	62	public static String FiltersDialog_filter;
64	public static String FiltersDialog_filterOnNames;	63	public static String FiltersDialog_filterOnNames;
Lines 88-93 Link Here
88	public static String CallHierarchyViewPart_callsFromMembers_3;	87	public static String CallHierarchyViewPart_callsFromMembers_3;
89	public static String CallHierarchyViewPart_callsFromMembers_more;	88	public static String CallHierarchyViewPart_callsFromMembers_more;
90	public static String CallHierarchyViewPart_callsFromMethod;	89	public static String CallHierarchyViewPart_callsFromMethod;
		90	public static String ExpandWithConstructorsConfigurationBlock_description;
		91	public static String ExpandWithConstructorsConfigurationBlock_newType_button;
		92	public static String ExpandWithConstructorsConfigurationBlock_newMember_button;
		93	public static String ExpandWithConstructorsConfigurationBlock_edit_button;
		94	public static String ExpandWithConstructorsConfigurationBlock_remove_button;
		95	public static String ExpandWithConstructorsConfigurationBlock_restoreDefaults_button;
		96	public static String CallHierarchyTypesOrMembersDialog_member_title;
		97	public static String CallHierarchyTypesOrMembersDialog_member_labelText;
		98	public static String CallHierarchyTypesOrMembersDialog_type_title;
		99	public static String CallHierarchyTypesOrMembersDialog_type_labelText;
		100	public static String CallHierarchyTypesOrMembersDialog_browse_button;
		101	public static String CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_title;
		102	public static String CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_description;
		103	public static String CallHierarchyTypesOrMembersDialog_ChooseTypeDialog_error_message;
		104	public static String CallHierarchyTypesOrMembersDialog_error_enterName;
		105	public static String CallHierarchyTypesOrMembersDialog_error_invalidMemberName;
		106	public static String CallHierarchyTypesOrMembersDialog_error_invalidTypeName;
		107	public static String CallHierarchyTypesOrMembersDialog_error_entryExists;
		108	public static String CallHierarchyTypesOrMembersDialog_anonymousTypes_label;
91	public static String FocusOnSelectionAction_focusOnSelection_text;	109	public static String FocusOnSelectionAction_focusOnSelection_text;
92	public static String FocusOnSelectionAction_focusOnSelection_description;	110	public static String FocusOnSelectionAction_focusOnSelection_description;
93	public static String FocusOnSelectionAction_focusOnSelection_tooltip;	111	public static String FocusOnSelectionAction_focusOnSelection_tooltip;
Lines 139-149 Link Here
139	public static String ExpandWithConstructorsAction_expandWithConstructors_text;	157	public static String ExpandWithConstructorsAction_expandWithConstructors_text;
140	public static String ExpandWithConstructorsAction_expandWithConstructors_description;	158	public static String ExpandWithConstructorsAction_expandWithConstructors_description;
141	public static String ExpandWithConstructorsAction_expandWithConstructors_tooltip;	159	public static String ExpandWithConstructorsAction_expandWithConstructors_tooltip;
142	public static String ExpandWithConstructorsDialog_anonymousTypes_label;	160	public static String ExpandWithConstructorsDialogAction_expandWithConstructors_label;
143	public static String ExpandWithConstructorsDialog_explanation_label;
144	public static String ExpandWithConstructorsDialog_not_a_valid_type_name;
145	public static String ExpandWithConstructorsDialog_title;	161	public static String ExpandWithConstructorsDialog_title;
146	public static String ExpandWithConstructorsDialog_typeNames_label;
147	static {	162	static {
148	NLS.initializeMessages(BUNDLE_NAME, CallHierarchyMessages.class);	163	NLS.initializeMessages(BUNDLE_NAME, CallHierarchyMessages.class);
149	}	164	}

Lines 237-242 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java (-1 / +3 lines)
237	private boolean fShowCallDetails;	237	private boolean fShowCallDetails;
238	protected Composite fParent;	238	protected Composite fParent;
239	private IPartListener2 fPartListener;	239	private IPartListener2 fPartListener;
		240	private ExpandWithConstructorsActionGroup fExpandWithConstructorsActionGroup;
240		241
241		242
242	public CallHierarchyViewPart() {	243	public CallHierarchyViewPart() {
Lines 1007-1012 Link Here
1007	fSearchScopeActions = new SearchScopeActionGroup(this, fDialogSettings);	1008	fSearchScopeActions = new SearchScopeActionGroup(this, fDialogSettings);
1008	fFiltersActionGroup = new CallHierarchyFiltersActionGroup(this,	1009	fFiltersActionGroup = new CallHierarchyFiltersActionGroup(this,
1009	fCallHierarchyViewer);	1010	fCallHierarchyViewer);
		1011	fExpandWithConstructorsActionGroup= new ExpandWithConstructorsActionGroup(this);
1010	fHistoryDropDownAction = new HistoryDropDownAction(this);	1012	fHistoryDropDownAction = new HistoryDropDownAction(this);
1011	fHistoryDropDownAction.setEnabled(false);	1013	fHistoryDropDownAction.setEnabled(false);
1012	fCancelSearchAction = new CancelSearchAction(this);	1014	fCancelSearchAction = new CancelSearchAction(this);
Lines 1035-1041 Link Here
1035	new GenerateActionGroup(this),	1037	new GenerateActionGroup(this),
1036	new RefactorActionGroup(this),	1038	new RefactorActionGroup(this),
1037	new JavaSearchActionGroup(this),	1039	new JavaSearchActionGroup(this),
1038	fSearchScopeActions, fFiltersActionGroup	1040	fSearchScopeActions, fFiltersActionGroup, fExpandWithConstructorsActionGroup
1039	});	1041	});
1040	}	1042	}
1041		1043

Added Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsActionGroup.java (+81 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	*******************************************************************************/
9
10	package org.eclipse.jdt.internal.ui.callhierarchy;
11
12	import org.eclipse.swt.widgets.Shell;
13
14	import org.eclipse.jface.action.Action;
15	import org.eclipse.jface.action.IMenuManager;
16	import org.eclipse.jface.action.Separator;
17
18	import org.eclipse.ui.IActionBars;
19	import org.eclipse.ui.actions.ActionGroup;
20
21	/**
22	* Call Hierarchy expand with constructors action group.
23	*
24	* @since 3.6
25	*
26	*/
27	public class ExpandWithConstructorsActionGroup extends ActionGroup {
28	private CallHierarchyViewPart fPart;
29
30	/**
31	* Creates the expand with constructors action group.
32	*
33	* @param part the call hierarchy view part
34	*/
35	public ExpandWithConstructorsActionGroup(CallHierarchyViewPart part) {
36	fPart= part;
37	}
38
39	/**
40	* Call hierarchy expand with constructors action class.
41	*
42	*/
43	public class ExpandWithConstructorsDialogAction extends Action {
44
45	/**
46	* Creates the call hierarchy expand with constructors action.
47	*/
48	public ExpandWithConstructorsDialogAction() {
49	setText(CallHierarchyMessages.ExpandWithConstructorsDialogAction_expandWithConstructors_label);
50	}
51
52	/*
53	* @see org.eclipse.jface.action.Action#run()
54	*/
55	public void run() {
56	Shell shell= fPart.getViewSite().getShell();
57	ExpandWithConstructorsDialog dialog= new ExpandWithConstructorsDialog(shell);
58	dialog.open();
59	}
60	}
61
62
63	/*
64	* @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
65	*/
66	public void fillActionBars(IActionBars actionBars) {
67	fillViewMenu(actionBars.getMenuManager());
68	}
69
70
71	/**
72	* Fills the action to the view menu.
73	* @param viewMenu the menu manager
74	*/
75	private void fillViewMenu(IMenuManager viewMenu) {
76	viewMenu.add(new Separator("expandWithConstructors")); //$NON-NLS-1$
77	viewMenu.add(new ExpandWithConstructorsDialogAction());
78	}
79
80
81	}