Attachment #144529 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 CallHierarchyLabelProvider_noMethodSelected;
	public static String CallHierarchyLabelProvider_updatePending;
	public static String CallHierarchyLabelProvider_matches;
	public static String CallHierarchyPreferencePage_expand_with_constructors_title;
	public static String CallHierarchyPreferenceDialog_anonymousTypes_label;
	public static String CallHierarchyViewPart_empty;
	public static String CallHierarchyViewPart_callsToConstructors;
	public static String CallHierarchyViewPart_callsToField;

	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);
	}

	public static String CallHierarchyViewPart_layout_menu;
	public static String CallHierarchyViewPart_field_menu;
	public static String CallHierarchyViewPart_preferences_label;

}




/*******************************************************************************
 * 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
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
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.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;

/**
 * Configuration dialog for default "Expand with Constructors" behavior.
 * 
 * @since 3.5
 */
class ExpandWithConstructorsDialog extends StatusDialog {

	private static final String LINE_DELIMITER_REGEX= "\\r\\n?|\\n"; //$NON-NLS-1$

	private Button fAnonymousButton;
	private StyledText fDefaultTypesText;
	
	protected ExpandWithConstructorsDialog(Shell parentShell) {
		super(parentShell);
	}
	
	/*
	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
	 */
	protected boolean isResizable() {
		return true;
	}
	
	/*
	 * @see org.eclipse.jface.dialogs.StatusDialog#configureShell(org.eclipse.swt.widgets.Shell)
	 */
	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();
			}
		});
		
		
		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));
		
		return composite;
	}

	/*
	 * @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);
		
		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);
	}
}




	 * Value is of type <code>String</code>: semicolon separated list of fully qualified type names.
	 * </p>
	 * 
	 * @since 3.6
	 */
	public static final String CALL_HIERARCHY_PREFERENCES= "CallHierarchy.defaultExpandWithConstructors"; //$NON-NLS-1$

	/**
	 * A named preference that controls whether methods from anonymous types are by default expanded

	 * Value is of type <code>Boolean</code>.
	 * </p>
	 * 
	 * @since 3.6
	 */
	public static final String PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.anonymousExpandWithConstructors"; //$NON-NLS-1$


						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.6
	 */
	static boolean isInTheDefaultExpandWithConstructorList(CallerMethodWrapper wrapper) {
		String serializedTypes= PreferenceConstants.getPreferenceStore().getString(CALL_HIERARCHY_PREFERENCES);
		if (serializedTypes.length() == 0)
			return false;
		String member= wrapper.getMember().getElementName();
		IType type= wrapper.getMember().getDeclaringType();
		String[] defaultTypes= serializedTypes.split(";"); //$NON-NLS-1$

		String typeName= type.getFullyQualifiedName('.').concat(".*"); //$NON-NLS-1$;
		String superClass;
		String[] superInterfaces;
		try {

		}
		for (int i= 0; i < defaultTypes.length; i++) {
			String defaultType= defaultTypes[i];
			if (typeNameMatches(member, defaultType) || typeName.equals(defaultType) || (superClass != null && typeNameMatches(superClass.concat(".*"), defaultType))) { //$NON-NLS-1$
				return true;
			}
			if (superInterfaces.length > 0) {
				for (int j= 0; j < superInterfaces.length; j++) {
					if (typeNameMatches(superInterfaces[j].concat(".*"), defaultType)) //$NON-NLS-1$
						return true;
				}
			}




 *******************************************************************************/
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 PreferencesActionGroup fPreferences;


    public CallHierarchyViewPart() {

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

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





CodeAssistStaticMembersConfigurationBlock_edit_button= &Edit...
CodeAssistStaticMembersConfigurationBlock_remove_button= &Remove

CallHierarchyPreferencesConfigurationBlock_description= De&fine a list of members or types with their fully qualified names.Call Hierarchy for these types/members will "Expand With Constructors" by default.
CallHierarchyPreferencesConfigurationBlock_newType_button= New &Type...
CallHierarchyPreferencesConfigurationBlock_newMember_button= New &Member...
CallHierarchyPreferencesConfigurationBlock_edit_button= &Edit
CallHierarchyPreferencesConfigurationBlock_remove_button= &Remove 

CallHierarchyPreferencesDialog_member_title= New Member for Expand With Constructors
CallHierarchyPreferencesDialog_member_labelText= Enter a fully qualified static member (e.g. \'java.lang.Math.sqrt\'): 
CallHierarchyPreferencesDialog_type_title= New Type for Expand With Constructors
CallHierarchyPreferencesDialog_type_labelText= Enter a fully qualified type (e.g. \'java.lang.Math\'):
CallHierarchyPreferencesDialog_browse_button= &Browse...
CallHierarchyPreferencesDialog_ChooseTypeDialog_title= Type Selection
CallHierarchyPreferencesDialog_ChooseTypeDialog_description= Choose type name:
CallHierarchyPreferencesDialog_ChooseTypeDialog_error_message= A problem occurred while collecting types. See the error Log for details.
CallHierarchyPreferencesDialog_error_enterName=Enter a name or prefix.
CallHierarchyPreferencesDialog_error_invalidTypeName=Not a valid type name.
CallHierarchyPreferencesDialog_error_invalidMemberName=Not a valid member name.
CallHierarchyPreferencesDialog_error_entryExists=Entry already exists in list.

FavoriteStaticMemberInputDialog_member_title= New Member Favorite
FavoriteStaticMemberInputDialog_member_labelText= Enter a fully qualified static member (e.g. \'java.lang.Math.sqrt\'): 
FavoriteStaticMemberInputDialog_type_title= New Type Favorite 

Lines 808-813 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java (+19 lines)
808	public static String CodeAssistStaticMembersConfigurationBlock_edit_button;	808	public static String CodeAssistStaticMembersConfigurationBlock_edit_button;
809	public static String CodeAssistStaticMembersConfigurationBlock_remove_button;	809	public static String CodeAssistStaticMembersConfigurationBlock_remove_button;
810		810
		811	public static String CallHierarchyPreferencesConfigurationBlock_description;
		812	public static String CallHierarchyPreferencesConfigurationBlock_newType_button;
		813	public static String CallHierarchyPreferencesConfigurationBlock_newMember_button;
		814	public static String CallHierarchyPreferencesConfigurationBlock_edit_button;
		815	public static String CallHierarchyPreferencesConfigurationBlock_remove_button;
		816
811	public static String FavoriteStaticMemberInputDialog_member_title;	817	public static String FavoriteStaticMemberInputDialog_member_title;
812	public static String FavoriteStaticMemberInputDialog_member_labelText;	818	public static String FavoriteStaticMemberInputDialog_member_labelText;
813	public static String FavoriteStaticMemberInputDialog_type_title;	819	public static String FavoriteStaticMemberInputDialog_type_title;
Lines 821-824 Link Here
821	public static String FavoriteStaticMemberInputDialog_error_invalidTypeName;	827	public static String FavoriteStaticMemberInputDialog_error_invalidTypeName;
822	public static String FavoriteStaticMemberInputDialog_error_entryExists;	828	public static String FavoriteStaticMemberInputDialog_error_entryExists;
823		829
		830	public static String CallHierarchyPreferencesDialog_member_title;
		831	public static String CallHierarchyPreferencesDialog_member_labelText;
		832	public static String CallHierarchyPreferencesDialog_type_title;
		833	public static String CallHierarchyPreferencesDialog_type_labelText;
		834	public static String CallHierarchyPreferencesDialog_browse_button;
		835	public static String CallHierarchyPreferencesDialog_ChooseTypeDialog_title;
		836	public static String CallHierarchyPreferencesDialog_ChooseTypeDialog_description;
		837	public static String CallHierarchyPreferencesDialog_ChooseTypeDialog_error_message;
		838	public static String CallHierarchyPreferencesDialog_error_enterName;
		839	public static String CallHierarchyPreferencesDialog_error_invalidMemberName;
		840	public static String CallHierarchyPreferencesDialog_error_invalidTypeName;
		841	public static String CallHierarchyPreferencesDialog_error_entryExists;
		842
824	}	843	}

Lines 64-70 Link Here

(-)ui/org/eclipse/jdt/ui/PreferenceConstants.java (-3 / +10 lines)
64	*	64	*
65	* @noinstantiate This class is not intended to be instantiated by clients.	65	* @noinstantiate This class is not intended to be instantiated by clients.
66	* @noextend This class is not intended to be subclassed by clients.	66	* @noextend This class is not intended to be subclassed by clients.
67	*/	67	*/
68	public class PreferenceConstants {	68	public class PreferenceConstants {
69		69
70	private PreferenceConstants() {	70	private PreferenceConstants() {
Lines 2977-2982 Link Here
2977	*/	2977	*/
2978	public final static String CODEASSIST_FAVORITE_STATIC_MEMBERS= "content_assist_favorite_static_members"; //$NON-NLS-1$	2978	public final static String CODEASSIST_FAVORITE_STATIC_MEMBERS= "content_assist_favorite_static_members"; //$NON-NLS-1$
2979		2979
		2980	/**
		2981	* A named preference that holds the types/members which expand with
		2982	* constructors by default.
		2983	*
		2984	* @since 3.6
		2985	*/
		2986	public static final String CALL_HIERARCHY_PREFERENCES= "call_hierarchy_preferences_page"; //$NON-NLS-1$
2980		2987
2981	/**	2988	/**
2982	* A named preference that controls the behavior of the refactoring wizard for showing the error page.	2989	* A named preference that controls the behavior of the refactoring wizard for showing the error page.
Lines 3833-3838 Link Here
3833		3840
3834	store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_BOLD, false);	3841	store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_BOLD, false);
3835	store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_ITALIC, false);	3842	store.setDefault(PreferenceConstants.PROPERTIES_FILE_COLORING_COMMENT_ITALIC, false);
		3843	store.setDefault(CallHierarchyContentProvider.CALL_HIERARCHY_PREFERENCES, "java.lang.Runnable;java.util.concurrent.Callable;org.eclipse.swt.widgets.Listener"); //$NON-NLS-1$
3836		3844
3837	// semantic highlighting	3845	// semantic highlighting
3838	SemanticHighlightings.initDefaults(store);	3846	SemanticHighlightings.initDefaults(store);
Lines 3876-3883 Link Here
3876	// Colors that are set by the current theme	3884	// Colors that are set by the current theme
3877	JavaUIPreferenceInitializer.setThemeBasedPreferences(store, false);	3885	JavaUIPreferenceInitializer.setThemeBasedPreferences(store, false);
3878		3886
3879	store.setDefault(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, true);	3887	store.setDefault(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, true);
3880	store.setDefault(CallHierarchyContentProvider.PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS, "java.lang.Runnable;java.util.concurrent.Callable;org.eclipse.swt.widgets.Listener"); //$NON-NLS-1$
3881	}	3888	}
3882		3889
3883	/**	3890	/**




/*******************************************************************************
 * 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.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.jface.preference.PreferenceNode;

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

/**
 * Call Hierarchy preferences action group.
 * 
 * @since 3.6
 * 
 */
public class PreferencesActionGroup extends ActionGroup {
	private CallHierarchyViewPart fPart;

	public PreferencesActionGroup(CallHierarchyViewPart part) {
		fPart= part;
	}

	/**
	 * Call hierarchy preferences action class.
	 * 
	 * @since 3.6
	 * 
	 */
	public class CallHierarchyPreferencesAction extends Action {

		/**
		 * Creates the call hierarchy preference action.
		 */
		public CallHierarchyPreferencesAction() {
			setText(CallHierarchyMessages.CallHierarchyViewPart_preferences_label);
		}

		/* (non-Javadoc)
		 * @see org.eclipse.jface.action.Action#run()
		 */
		public void run() {
			CallHierarchyPreferencePage page= new CallHierarchyPreferencePage();
			IPreferenceNode targetNode= new PreferenceNode("org.eclipse.jdt.ui.preferences.CallHierarchyPreferencePage", page); //$NON-NLS-1$
			PreferenceManager manager= new PreferenceManager();
			manager.addToRoot(targetNode);
			PreferenceDialog dialog= new PreferenceDialog(fPart.getSite().getShell(), manager);
			dialog.create();
			dialog.open();
		}
	}


	/* (non-Javadoc)
	 * Method declared on ActionGroup.
	 */
	public void fillActionBars(IActionBars actionBars) {
		fillViewMenu(actionBars.getMenuManager());
	}

	/* (non-Javadoc)
	 * Method declared on ActionGroup.
	 */
	private void fillViewMenu(IMenuManager viewMenu) {
		viewMenu.add(new Separator("preferences")); //$NON-NLS-1$
		viewMenu.add(new CallHierarchyPreferencesAction());
	}


}




/*******************************************************************************
 * 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.graphics.Point;
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.preferences.PreferencesMessages;
import org.eclipse.jdt.internal.ui.preferences.ScrolledPageContent;
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 preferences page configuration block.
 * 
 * @since 3.6
 */
public class CallHierarchyPreferencesConfigurationBlock extends OptionsConfigurationBlock {

	/**
	 * Call hierarchy preferences dialog for types and members.
	 */
	private static class CallHierarchyPreferencesDialog extends StatusDialog {

		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();
			}
		}

		private StringButtonDialogField fNameDialogField;

		private List fExistingEntries;

		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 CallHierarchyPreferencesDialog(Shell parent, List existingEntries, boolean isEditingMember) {
			super(parent);
			fIsEditingMember= isEditingMember;
			fExistingEntries= existingEntries;

			String label, title;
			if (isEditingMember) {
				title= PreferencesMessages.CallHierarchyPreferencesDialog_member_title;
				label= PreferencesMessages.CallHierarchyPreferencesDialog_member_labelText;
			} else {
				title= PreferencesMessages.CallHierarchyPreferencesDialog_type_title;
				label= PreferencesMessages.CallHierarchyPreferencesDialog_type_labelText;
			}
			setTitle(title);

			StringButtonAdapter adapter= new StringButtonAdapter();

			fNameDialogField= new StringButtonDialogField(adapter);
			fNameDialogField.setLabelText(label);
			fNameDialogField.setButtonLabel(PreferencesMessages.CallHierarchyPreferencesDialog_browse_button);
			fNameDialogField.setDialogFieldListener(adapter);
			fNameDialogField.setText(""); //$NON-NLS-1$
		}

		/*
		 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
		 * @since 3.4
		 */
		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);
		}

		public String getResult() {
			String val= fNameDialogField.getText();
			if (!fIsEditingMember)
				val= val + WILDCARD;
			return val;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
		 */
		protected Control createDialogArea(Composite parent) {
			Composite composite= (Composite)super.createDialogArea(parent);
			initializeDialogUnits(parent);

			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(PreferencesMessages.CallHierarchyPreferencesDialog_ChooseTypeDialog_title);
				dialog.setMessage(PreferencesMessages.CallHierarchyPreferencesDialog_ChooseTypeDialog_description);
				if (dialog.open() == Window.OK) {
					IType res= (IType)dialog.getResult()[0];
					fNameDialogField.setText(res.getFullyQualifiedName('.'));
				}
			} catch (JavaModelException e) {
				ExceptionHandler.handle(e, getShell(), PreferencesMessages.CallHierarchyPreferencesDialog_ChooseTypeDialog_title,
						PreferencesMessages.CallHierarchyPreferencesDialog_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(PreferencesMessages.CallHierarchyPreferencesDialog_error_invalidMemberName);
					else
						status.setError(PreferencesMessages.CallHierarchyPreferencesDialog_error_invalidTypeName);
				} else {
					if (doesExist(newText)) {
						status.setError(PreferencesMessages.CallHierarchyPreferencesDialog_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.JAVA_EDITOR_PREFERENCE_PAGE);
		}

	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#performOk()
	 */
	public boolean performOk() {
		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;

		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);
		}

		/* (non-Javadoc)
		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
		 */
		public Image getImage(Object element) {
			return ((String)element).endsWith(WILDCARD) ? CLASS_ICON : MEMBER_ICON;
		}

		/* (non-Javadoc)
		 * @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 && canRemove(field);
		}

		/* (non-Javadoc)
		 * @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);
		}

		/* (non-Javadoc)
		 * @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();
			for (int j= 0; j < defaultTypes.length; j++) {
				if (selected.contains(defaultTypes[j]))
					return false;
			}
			return true;
		}

		/* (non-Javadoc)
		 * @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);
		}

		/* (non-Javadoc)
		 * @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);
			}
		}
	}

	/**
	 * A named preference key that holds the types whose methods are by default expanded with
	 * constructors in the Call Hierarchy.
	 * 
	 * @since 3.6
	 */
	public static final Key CALL_HIERARCHY_PREFERENCES= getJDTUIKey(PreferenceConstants.CALL_HIERARCHY_PREFERENCES);

	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 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;

	/**
	 * Returns all the key values.
	 * 
	 * @return array of keys
	 */
	public static Key[] getAllKeys() {
		return new Key[] { CALL_HIERARCHY_PREFERENCES };
	}


	/**
	 * Creates the call hierarchy preferences configuration block.
	 * 
	 * @param context the status
	 * @param container the preference container
	 */
	public CallHierarchyPreferencesConfigurationBlock(IStatusChangeListener context, IWorkbenchPreferenceContainer container) {
		super(context, null, getAllKeys(), container);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createContents(Composite parent) {
		ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL);
		scrolled.setExpandHorizontal(true);
		scrolled.setExpandVertical(true);

		Composite control= new Composite(scrolled, SWT.NONE);
		GridLayout layout= new GridLayout();
		layout.numColumns= 2;
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		control.setLayout(layout);

		createPreferenceList(control);

		fAnonymousButton= new Button(parent, SWT.CHECK);
		fAnonymousButton.setText(CallHierarchyMessages.CallHierarchyPreferenceDialog_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));
		fAnonymousButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				fIsAnonymous= fAnonymousButton.getSelection();

			}

		});

		initialize();

		scrolled.setContent(control);
		final Point size= control.computeSize(SWT.DEFAULT, SWT.DEFAULT);
		scrolled.setMinSize(size.x, size.y);

		Dialog.applyDialogFont(scrolled);

		return scrolled;
	}

	/**
	 * Create a list dialog field.
	 * 
	 * @param parent the composite
	 */
	private void createPreferenceList(Composite parent) {
		String[] buttonLabels= new String[] {
				PreferencesMessages.CallHierarchyPreferencesConfigurationBlock_newType_button,
				PreferencesMessages.CallHierarchyPreferencesConfigurationBlock_newMember_button,
				PreferencesMessages.CallHierarchyPreferencesConfigurationBlock_edit_button,
				PreferencesMessages.CallHierarchyPreferencesConfigurationBlock_remove_button
		};

		ListAdapter adapter= new ListAdapter();

		fList= new ListDialogField(adapter, buttonLabels, new ListLabelProvider());
		fList.setDialogFieldListener(adapter);
		fList.setLabelText(PreferencesMessages.CallHierarchyPreferencesConfigurationBlock_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(7);

	}

	/**
	 * 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(getCallHierarchyPreferences()));
		if (!storedPreference.contains(defaultTypes[0])) {
			storedPreference.addAll(Arrays.asList(defaultTypes));
		}
		fList.setElements(storedPreference);
	}

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

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getFullBuildDialogStrings(boolean)
	 */
	protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {
		return null;
	}

	/* (non-Javadoc)
	 * @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.
	 * 
	 * @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();
			CallHierarchyPreferencesDialog dialog= new CallHierarchyPreferencesDialog(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);
			CallHierarchyPreferencesDialog dialog= new CallHierarchyPreferencesDialog(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());
			}
		}
	}

	/**
	 * Update the preference keys and constants.
	 * 
	 * @param field the dialog field
	 */
	protected final void doDialogFieldChanged(DialogField field) {
		// set values in working copy
		if (field == fList) {
			setValue(CALL_HIERARCHY_PREFERENCES, serializeFavorites(fList.getElements()));
			PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.CALL_HIERARCHY_PREFERENCES, serializeFavorites(fList.getElements()));
		}
	}

	/**
	 * Returns the call hierarchy preferences.
	 * 
	 * @return the call hierarchy preferences
	 */
	private String[] getCallHierarchyPreferences() {
		String str= getValue(CALL_HIERARCHY_PREFERENCES);
		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.Composite;
import org.eclipse.swt.widgets.Control;

import org.eclipse.core.resources.IProject;

import org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage;

/**
 * Call Hierarchy view menu preference page.
 * 
 * @since 3.6
 * 
 */
public class CallHierarchyPreferencePage extends PropertyAndPreferencePage {

	private CallHierarchyPreferencesConfigurationBlock fConfigurationBlock;

	/**
	 * Creates a call hierarchy preference page and sets the title.
	 */
	public CallHierarchyPreferencePage() {
		super();
		setTitle(CallHierarchyMessages.CallHierarchyPreferencePage_expand_with_constructors_title);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createControl(Composite parent) {
		//IWorkbenchPreferenceContainer container= (IWorkbenchPreferenceContainer)getContainer();
		fConfigurationBlock= new CallHierarchyPreferencesConfigurationBlock(getNewStatusChangedListener(), null);
		super.createControl(parent);
		//PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IJavaHelpContextIds.JAVA_EDITOR_PREFERENCE_PAGE);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createPreferenceContent(Composite composite) {
		return fConfigurationBlock.createContents(composite);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
	 */
	protected String getPreferencePageID() {
		return "org.eclipse.jdt.ui.preferences.CallHierarchyPreferencePage"; //$NON-NLS-1$
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
	 */
	protected String getPropertyPageID() {
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject)
	 */
	protected boolean hasProjectSpecificOptions(IProject project) {
		return false;
	}


	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
	 */
	public void dispose() {
		if (fConfigurationBlock != null) {
			fConfigurationBlock.dispose();
		}
		super.dispose();
	}


	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#performDefaults()
	 */
	protected void performDefaults() {
		super.performDefaults();
		if (fConfigurationBlock != null) {
			fConfigurationBlock.performDefaults();
		}
	}


	/* (non-Javadoc)
	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
	 */
	public boolean performOk() {
		if (fConfigurationBlock != null && !fConfigurationBlock.performOk()) {
			return false;
		}
		return super.performOk();
	}


	/* (non-Javadoc)
	 * @see org.eclipse.jface.preference.PreferencePage#performApply()
	 */
	public void performApply() {
		if (fConfigurationBlock != null) {
			fConfigurationBlock.performApply();
		}
	}


}

Return to bug 276466

Lines 51-59 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java (-16 / +17 lines)
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 names.
52	* </p>	52	* </p>
53	*	53	*
54	* @since 3.5	54	* @since 3.6
55	*/	55	*/
56	public static final String PREF_DEFAULT_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.defaultExpandWithConstructors"; //$NON-NLS-1$	56	public static final String CALL_HIERARCHY_PREFERENCES= "CallHierarchy.defaultExpandWithConstructors"; //$NON-NLS-1$
57		57
58	/**	58	/**
59	* A named preference that controls whether methods from anonymous types are by default expanded	59	* A named preference that controls whether methods from anonymous types are by default expanded
Lines 62-68 Link Here
62	* Value is of type <code>Boolean</code>.	62	* Value is of type <code>Boolean</code>.
63	* </p>	63	* </p>
64	*	64	*
65	* @since 3.5	65	* @since 3.6
66	*/	66	*/
67	public static final String PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.anonymousExpandWithConstructors"; //$NON-NLS-1$	67	public static final String PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS= "CallHierarchy.anonymousExpandWithConstructors"; //$NON-NLS-1$
68		68
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-237 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.6
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 serializedTypes= PreferenceConstants.getPreferenceStore().getString(CALL_HIERARCHY_PREFERENCES);
229	if (serializedTypes.length() == 0)	229	if (serializedTypes.length() == 0)
230	return false;	230	return false;
231		231	String member= wrapper.getMember().getElementName();
		232	IType type= wrapper.getMember().getDeclaringType();
232	String[] defaultTypes= serializedTypes.split(";"); //$NON-NLS-1$	233	String[] defaultTypes= serializedTypes.split(";"); //$NON-NLS-1$
233		234
234	String typeName= type.getFullyQualifiedName('.');	235	String typeName= type.getFullyQualifiedName('.').concat(".*"); //$NON-NLS-1$;
235	String superClass;	236	String superClass;
236	String[] superInterfaces;	237	String[] superInterfaces;
237	try {	238	try {
Lines 242-253 Link Here
242	}	243	}
243	for (int i= 0; i < defaultTypes.length; i++) {	244	for (int i= 0; i < defaultTypes.length; i++) {
244	String defaultType= defaultTypes[i];	245	String defaultType= defaultTypes[i];
245	if (typeName.equals(defaultType) \|\| (superClass != null && typeNameMatches(superClass, defaultType))) {	246	if (typeNameMatches(member, defaultType) \|\| typeName.equals(defaultType) \|\| (superClass != null && typeNameMatches(superClass.concat(".*"), defaultType))) { //$NON-NLS-1$
246	return true;	247	return true;
247	}	248	}
248	if (superInterfaces.length > 0) {	249	if (superInterfaces.length > 0) {
249	for (int j= 0; j < superInterfaces.length; j++) {	250	for (int j= 0; j < superInterfaces.length; j++) {
250	if (typeNameMatches(superInterfaces[j], defaultType))	251	if (typeNameMatches(superInterfaces[j].concat(".*"), defaultType)) //$NON-NLS-1$
251	return true;	252	return true;
252	}	253	}
253	}	254	}

Lines 923-928 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties (+19 lines)
923	CodeAssistStaticMembersConfigurationBlock_edit_button= &Edit...	923	CodeAssistStaticMembersConfigurationBlock_edit_button= &Edit...
924	CodeAssistStaticMembersConfigurationBlock_remove_button= &Remove	924	CodeAssistStaticMembersConfigurationBlock_remove_button= &Remove
925		925
		926	CallHierarchyPreferencesConfigurationBlock_description= De&fine a list of members or types with their fully qualified names.Call Hierarchy for these types/members will "Expand With Constructors" by default.
		927	CallHierarchyPreferencesConfigurationBlock_newType_button= New &Type...
		928	CallHierarchyPreferencesConfigurationBlock_newMember_button= New &Member...
		929	CallHierarchyPreferencesConfigurationBlock_edit_button= &Edit
		930	CallHierarchyPreferencesConfigurationBlock_remove_button= &Remove
		931
		932	CallHierarchyPreferencesDialog_member_title= New Member for Expand With Constructors
		933	CallHierarchyPreferencesDialog_member_labelText= Enter a fully qualified static member (e.g. \'java.lang.Math.sqrt\'):
		934	CallHierarchyPreferencesDialog_type_title= New Type for Expand With Constructors
		935	CallHierarchyPreferencesDialog_type_labelText= Enter a fully qualified type (e.g. \'java.lang.Math\'):
		936	CallHierarchyPreferencesDialog_browse_button= &Browse...
		937	CallHierarchyPreferencesDialog_ChooseTypeDialog_title= Type Selection
		938	CallHierarchyPreferencesDialog_ChooseTypeDialog_description= Choose type name:
		939	CallHierarchyPreferencesDialog_ChooseTypeDialog_error_message= A problem occurred while collecting types. See the error Log for details.
		940	CallHierarchyPreferencesDialog_error_enterName=Enter a name or prefix.
		941	CallHierarchyPreferencesDialog_error_invalidTypeName=Not a valid type name.
		942	CallHierarchyPreferencesDialog_error_invalidMemberName=Not a valid member name.
		943	CallHierarchyPreferencesDialog_error_entryExists=Entry already exists in list.
		944
926	FavoriteStaticMemberInputDialog_member_title= New Member Favorite	945	FavoriteStaticMemberInputDialog_member_title= New Member Favorite
927	FavoriteStaticMemberInputDialog_member_labelText= Enter a fully qualified static member (e.g. \'java.lang.Math.sqrt\'):	946	FavoriteStaticMemberInputDialog_member_labelText= Enter a fully qualified static member (e.g. \'java.lang.Math.sqrt\'):
928	FavoriteStaticMemberInputDialog_type_title= New Type Favorite	947	FavoriteStaticMemberInputDialog_type_title= New Type Favorite

Lines 58-64 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.java (-6 / +4 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 74-79 Link Here
74	public static String CallHierarchyLabelProvider_noMethodSelected;	73	public static String CallHierarchyLabelProvider_noMethodSelected;
75	public static String CallHierarchyLabelProvider_updatePending;	74	public static String CallHierarchyLabelProvider_updatePending;
76	public static String CallHierarchyLabelProvider_matches;	75	public static String CallHierarchyLabelProvider_matches;
		76	public static String CallHierarchyPreferencePage_expand_with_constructors_title;
		77	public static String CallHierarchyPreferenceDialog_anonymousTypes_label;
77	public static String CallHierarchyViewPart_empty;	78	public static String CallHierarchyViewPart_empty;
78	public static String CallHierarchyViewPart_callsToConstructors;	79	public static String CallHierarchyViewPart_callsToConstructors;
79	public static String CallHierarchyViewPart_callsToField;	80	public static String CallHierarchyViewPart_callsToField;
Lines 139-153 Link Here
139	public static String ExpandWithConstructorsAction_expandWithConstructors_text;	140	public static String ExpandWithConstructorsAction_expandWithConstructors_text;
140	public static String ExpandWithConstructorsAction_expandWithConstructors_description;	141	public static String ExpandWithConstructorsAction_expandWithConstructors_description;
141	public static String ExpandWithConstructorsAction_expandWithConstructors_tooltip;	142	public static String ExpandWithConstructorsAction_expandWithConstructors_tooltip;
142	public static String ExpandWithConstructorsDialog_anonymousTypes_label;
143	public static String ExpandWithConstructorsDialog_explanation_label;
144	public static String ExpandWithConstructorsDialog_not_a_valid_type_name;
145	public static String ExpandWithConstructorsDialog_title;
146	public static String ExpandWithConstructorsDialog_typeNames_label;
147	static {	143	static {
148	NLS.initializeMessages(BUNDLE_NAME, CallHierarchyMessages.class);	144	NLS.initializeMessages(BUNDLE_NAME, CallHierarchyMessages.class);
149	}	145	}
150		146
151	public static String CallHierarchyViewPart_layout_menu;	147	public static String CallHierarchyViewPart_layout_menu;
152	public static String CallHierarchyViewPart_field_menu;	148	public static String CallHierarchyViewPart_field_menu;
		149	public static String CallHierarchyViewPart_preferences_label;
		150
153	}	151	}

Removed Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java (-146 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	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.callhierarchy;
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;
18	import org.eclipse.swt.widgets.Button;
19	import org.eclipse.swt.widgets.Composite;
20	import org.eclipse.swt.widgets.Control;
21	import org.eclipse.swt.widgets.Label;
22	import org.eclipse.swt.widgets.Shell;
23
24	import org.eclipse.core.runtime.IStatus;
25
26	import org.eclipse.jface.dialogs.StatusDialog;
27
28	import org.eclipse.ui.PlatformUI;
29
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;
38	import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
39
40	/**
41	* Configuration dialog for default "Expand with Constructors" behavior.
42	*
43	* @since 3.5
44	*/
45	class ExpandWithConstructorsDialog extends StatusDialog {
46
47	private static final String LINE_DELIMITER_REGEX= "\\r\\n?\|\\n"; //$NON-NLS-1$
48
49	private Button fAnonymousButton;
50	private StyledText fDefaultTypesText;
51
52	protected ExpandWithConstructorsDialog(Shell parentShell) {
53	super(parentShell);
54	}
55
56	/*
57	* @see org.eclipse.jface.dialogs.Dialog#isResizable()
58	*/
59	protected boolean isResizable() {
60	return true;
61	}
62
63	/*
64	* @see org.eclipse.jface.dialogs.StatusDialog#configureShell(org.eclipse.swt.widgets.Shell)
65	*/
66	protected void configureShell(Shell newShell) {
67	super.configureShell(newShell);
68	newShell.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_title);
69	setHelpAvailable(false);
70	PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IJavaHelpContextIds.CALL_HIERARCHY_EXPAND_WITH_CONSTRUCTORS_DIALOG);
71	}
72
73	/*
74	* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
75	*/
76	protected Control createDialogArea(Composite parent) {
77	Composite composite= (Composite)super.createDialogArea(parent);
78	((GridData)composite.getLayoutData()).widthHint= convertWidthInCharsToPixels(60);
79
80	Label descriptionLabel= new Label(composite, SWT.WRAP);
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	}
103	});
104
105
106	fAnonymousButton= new Button(composite, SWT.CHECK);
107	fAnonymousButton.setText(CallHierarchyMessages.ExpandWithConstructorsDialog_anonymousTypes_label);
108	boolean anonymousPref= PreferenceConstants.getPreferenceStore().getBoolean(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS);
109	fAnonymousButton.setSelection(anonymousPref);
110	fAnonymousButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
111
112	return composite;
113	}
114
115	/*
116	* @see org.eclipse.jface.dialogs.Dialog#okPressed()
117	*/
118	protected void okPressed() {
119	PreferenceConstants.getPreferenceStore().setValue(CallHierarchyContentProvider.PREF_ANONYMOUS_EXPAND_WITH_CONSTRUCTORS, fAnonymousButton.getSelection());
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();
126	}
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	}

Lines 55-61 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyMessages.properties (-7 / +5 lines)
55	ToggleOrientationAction_single_tooltip=Hierarchy View Only	55	ToggleOrientationAction_single_tooltip=Hierarchy View Only
56	ToggleOrientationAction_single_description=Hierarchy View Only	56	ToggleOrientationAction_single_description=Hierarchy View 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 71-76 Link Here
71	CallHierarchyLabelProvider_noMethodSelected=- no method selected -	70	CallHierarchyLabelProvider_noMethodSelected=- no method selected -
72	CallHierarchyLabelProvider_updatePending=...	71	CallHierarchyLabelProvider_updatePending=...
73	CallHierarchyLabelProvider_matches={0} ({1} matches)	72	CallHierarchyLabelProvider_matches={0} ({1} matches)
		73	CallHierarchyPreferencePage_expand_with_constructors_title=Expand With Constructors
		74	CallHierarchyPreferenceDialog_anonymousTypes_label=&All methods in anonymous types
74	CallHierarchyViewPart_empty=To display the call hierarchy, select one or more methods, classes, fields, or initializers, and select the \'Open Call Hierarchy\' menu option. Alternatively, you can drag and drop the member or members onto this view.	75	CallHierarchyViewPart_empty=To display the call hierarchy, select one or more methods, classes, fields, or initializers, and select the \'Open Call Hierarchy\' menu option. Alternatively, you can drag and drop the member or members onto this view.
75	CallHierarchyViewPart_callsToConstructors=Members calling constructors of ''{0}'' - in {1}	76	CallHierarchyViewPart_callsToConstructors=Members calling constructors of ''{0}'' - in {1}
76	CallHierarchyViewPart_callsToField=Members accessing ''{0}'' - in {1}	77	CallHierarchyViewPart_callsToField=Members accessing ''{0}'' - in {1}
Lines 86-91 Link Here
86	CallHierarchyViewPart_callsFromMembers_3=Calls from ''{0}'', ''{1}'', ''{2}'' - in {3}	87	CallHierarchyViewPart_callsFromMembers_3=Calls from ''{0}'', ''{1}'', ''{2}'' - in {3}
87	CallHierarchyViewPart_callsFromMembers_more=Calls from ''{0}'', ''{1}'', ''{2}'', ... - in {3}	88	CallHierarchyViewPart_callsFromMembers_more=Calls from ''{0}'', ''{1}'', ''{2}'', ... - in {3}
88	CallHierarchyViewPart_callsFromMethod=Calls from ''{0}'' - in {1}	89	CallHierarchyViewPart_callsFromMethod=Calls from ''{0}'' - in {1}
		90	CallHierarchyViewPart_preferences_label= Preferences...
		91
89	FocusOnSelectionAction_focusOnSelection_text=Fo&cus On Selection	92	FocusOnSelectionAction_focusOnSelection_text=Fo&cus On Selection
90	FocusOnSelectionAction_focusOnSelection_description=Focus On Selection	93	FocusOnSelectionAction_focusOnSelection_description=Focus On Selection
91	FocusOnSelectionAction_focusOnSelection_tooltip=Focus On Selection	94	FocusOnSelectionAction_focusOnSelection_tooltip=Focus On Selection
Lines 145-153 Link Here
145	RemoveFromViewAction_removeFromView_tooltip= Remove from View	148	RemoveFromViewAction_removeFromView_tooltip= Remove from View
146	ExpandWithConstructorsAction_expandWithConstructors_text= &Expand with Constructors	149	ExpandWithConstructorsAction_expandWithConstructors_text= &Expand with Constructors
147	ExpandWithConstructorsAction_expandWithConstructors_description= Expand with constructors	150	ExpandWithConstructorsAction_expandWithConstructors_description= Expand with constructors
148	ExpandWithConstructorsAction_expandWithConstructors_tooltip= Expand with Constructors	151	ExpandWithConstructorsAction_expandWithConstructors_tooltip= Expand with Constructors
149	ExpandWithConstructorsDialog_anonymousTypes_label=&All methods in anonymous types
150	ExpandWithConstructorsDialog_explanation_label=Configure the types whose instance methods are expanded with constructors by default.
151	ExpandWithConstructorsDialog_not_a_valid_type_name=''{0}'' is not a valid type name
152	ExpandWithConstructorsDialog_title=Expand with Constructors
153	ExpandWithConstructorsDialog_typeNames_label=Type &names (each on a line):

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 PreferencesActionGroup fPreferences;
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	fPreferences= new PreferencesActionGroup(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, fPreferences
1039	});	1041	});
1040	}	1042	}
1041		1043