Attachment #4793 for bug #35870

Lines 18-24 Link Here

(-)core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddGetterSetterOperation.java (-14 / +107 lines)
18	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
19	import org.eclipse.core.runtime.NullProgressMonitor;	19	import org.eclipse.core.runtime.NullProgressMonitor;
20	import org.eclipse.core.runtime.OperationCanceledException;	20	import org.eclipse.core.runtime.OperationCanceledException;
21
22	import org.eclipse.jdt.core.Flags;	21	import org.eclipse.jdt.core.Flags;
23	import org.eclipse.jdt.core.IField;	22	import org.eclipse.jdt.core.IField;
24	import org.eclipse.jdt.core.IJavaElement;	23	import org.eclipse.jdt.core.IJavaElement;
Lines 27-46 Link Here
27	import org.eclipse.jdt.core.IType;	26	import org.eclipse.jdt.core.IType;
28	import org.eclipse.jdt.core.NamingConventions;	27	import org.eclipse.jdt.core.NamingConventions;
29	import org.eclipse.jdt.core.Signature;	28	import org.eclipse.jdt.core.Signature;
30
31	import org.eclipse.jdt.ui.CodeGeneration;
32
33	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;	29	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
		30	import org.eclipse.jdt.internal.corext.util.JdtFlags;
		31	import org.eclipse.jdt.ui.CodeGeneration;
34		32
35	/**	33	/**
36	* For given fields, method stubs for getters and setters are created.	34	* For given fields, method stubs for getters and setters are created.
37	*/	35	*/
38	public class AddGetterSetterOperation implements IWorkspaceRunnable {	36	public class AddGetterSetterOperation implements IWorkspaceRunnable {
39		37
		38	private IJavaElement fInsertPosition;
		39	private int fVisibility;
		40	private boolean fSort;
		41	private boolean fSynchronized;
		42	private boolean fNative;
		43	private boolean fFinal;
		44
40	private final String[] EMPTY= new String[0];	45	private final String[] EMPTY= new String[0];
41		46
42	private IField[] fGetterFields;	47	private IField[] fGetterFields;
43	private IField[] fSetterFields;	48	private IField[] fSetterFields;
		49	private IField[] fGetterSetterFields;
44	private List fCreatedAccessors;	50	private List fCreatedAccessors;
45		51
46	private IRequestQuery fSkipExistingQuery;	52	private IRequestQuery fSkipExistingQuery;
Lines 59-76 Link Here
59	* @param skipExistingQuery Callback to ask if setter / getters that already exist can be skipped.	65	* @param skipExistingQuery Callback to ask if setter / getters that already exist can be skipped.
60	* Argument of the query is the existing method. <code>null</code> is a valid input and stands for skip all.	66	* Argument of the query is the existing method. <code>null</code> is a valid input and stands for skip all.
61	*/	67	*/
62	public AddGetterSetterOperation(IField[] fields, CodeGenerationSettings settings, IRequestQuery skipFinalSettersQuery, IRequestQuery skipExistingQuery) {	68	public AddGetterSetterOperation(IField[] fields, CodeGenerationSettings settings, IRequestQuery skipFinalSettersQuery, IRequestQuery skipExistingQuery, IJavaElement elementPosition) {
63	this(fields, fields, settings, skipFinalSettersQuery, skipExistingQuery);	69	this(fields, fields, fields, settings, skipFinalSettersQuery, skipExistingQuery, elementPosition);
64	}	70	}
65		71
66	public AddGetterSetterOperation(IField[] getterFields, IField[] setterFields, CodeGenerationSettings settings, IRequestQuery skipFinalSettersQuery, IRequestQuery skipExistingQuery) {	72	public AddGetterSetterOperation(IField[] getterFields, IField[] setterFields, IField[] getterSetterFields, CodeGenerationSettings settings, IRequestQuery skipFinalSettersQuery, IRequestQuery skipExistingQuery, IJavaElement elementPosition) {
67	super();	73	super();
68	fGetterFields= getterFields;	74	fGetterFields= getterFields;
69	fSetterFields= setterFields;	75	fSetterFields= setterFields;
		76	fGetterSetterFields= getterSetterFields;
70	fSkipExistingQuery= skipExistingQuery;	77	fSkipExistingQuery= skipExistingQuery;
71	fSkipFinalSettersQuery= skipFinalSettersQuery;	78	fSkipFinalSettersQuery= skipFinalSettersQuery;
72	fSettings= settings;	79	fSettings= settings;
73	fCreatedAccessors= new ArrayList();	80	fCreatedAccessors= new ArrayList();
		81	fInsertPosition= elementPosition;
74	}	82	}
75		83
76	/**	84	/**
Lines 88-93 Link Here
88	fSkipAllFinalSetters= (fSkipFinalSettersQuery == null);	96	fSkipAllFinalSetters= (fSkipFinalSettersQuery == null);
89	fSkipAllExisting= (fSkipExistingQuery == null);	97	fSkipAllExisting= (fSkipExistingQuery == null);
90		98
		99	// create pairs first: http://bugs.eclipse.org/bugs/show_bug.cgi?id=35870
		100	if (!fSort) {
		101	for (int i= 0; i < fGetterSetterFields.length; i++) {
		102	generateGetter(fGetterSetterFields[i]);
		103	generateSetter(fGetterSetterFields[i]);
		104	monitor.worked(1);
		105	if (monitor.isCanceled()){
		106	throw new OperationCanceledException();
		107	}
		108	}
		109	}
91	for (int i= 0; i < fGetterFields.length; i++) {	110	for (int i= 0; i < fGetterFields.length; i++) {
92	generateGetter(fGetterFields[i]);	111	generateGetter(fGetterFields[i]);
93	monitor.worked(1);	112	monitor.worked(1);
Lines 101-113 Link Here
101	if (monitor.isCanceled()){	120	if (monitor.isCanceled()){
102	throw new OperationCanceledException();	121	throw new OperationCanceledException();
103	}	122	}
104	}	123	}
105
106	} finally {	124	} finally {
107	monitor.done();	125	monitor.done();
108	}	126	}
109	}	127	}
110		128
		129	private IField[] getValidElementForSort() {
		130	if (fGetterSetterFields.length > 0)
		131	return fGetterSetterFields;
		132	if (fGetterFields.length > 0)
		133	return fGetterFields;
		134	if (fSetterFields.length > 0)
		135	return fSetterFields;
		136	else
		137	return null;
		138
		139	}
		140
111	private boolean querySkipFinalSetters(IField field) throws OperationCanceledException {	141	private boolean querySkipFinalSetters(IField field) throws OperationCanceledException {
112	if (!fSkipAllFinalSetters) {	142	if (!fSkipAllFinalSetters) {
113	switch (fSkipFinalSettersQuery.doQuery(field)) {	143	switch (fSkipFinalSettersQuery.doQuery(field)) {
Lines 163-172 Link Here
163	buf.append('\n');	193	buf.append('\n');
164	}	194	}
165	}	195	}
166	buf.append("public "); //$NON-NLS-1$	196
		197	buf.append(JdtFlags.getVisibilityString(fVisibility));
		198	buf.append(' ');
167	if (isStatic) {	199	if (isStatic) {
168	buf.append("static "); //$NON-NLS-1$	200	buf.append("static "); //$NON-NLS-1$
169	}	201	}
		202	if (fSynchronized)
		203	buf.append("synchronized "); //$NON-NLS-1$
		204	if (fFinal)
		205	buf.append("final "); //$NON-NLS-1$
		206	if (fNative)
		207	buf.append("native "); //$NON-NLS-1$
		208
170	buf.append(typeName);	209	buf.append(typeName);
171	buf.append(' '); buf.append(getterName);	210	buf.append(' '); buf.append(getterName);
172	buf.append("() {\nreturn "); buf.append(fieldName); buf.append(";\n}\n"); //$NON-NLS-2$ //$NON-NLS-1$	211	buf.append("() {\nreturn "); buf.append(fieldName); buf.append(";\n}\n"); //$NON-NLS-2$ //$NON-NLS-1$
Lines 175-187 Link Here
175	if (existingGetter != null) {	214	if (existingGetter != null) {
176	sibling= StubUtility.findNextSibling(existingGetter);	215	sibling= StubUtility.findNextSibling(existingGetter);
177	existingGetter.delete(false, null);	216	existingGetter.delete(false, null);
178	}	217	}
179		218	else
		219	sibling= getInsertPosition();
		220
180	String formattedContent= StubUtility.codeFormat(buf.toString(), indent, lineDelim) + lineDelim;	221	String formattedContent= StubUtility.codeFormat(buf.toString(), indent, lineDelim) + lineDelim;
181	fCreatedAccessors.add(parentType.createMethod(formattedContent, sibling, true, null));	222	fCreatedAccessors.add(parentType.createMethod(formattedContent, sibling, true, null));
182	}	223	}
183	}	224	}
184		225
185	private void generateSetter(IField field) throws CoreException, OperationCanceledException {	226	private void generateSetter(IField field) throws CoreException, OperationCanceledException {
186	String fieldName= field.getElementName();	227	String fieldName= field.getElementName();
187	IJavaProject project= field.getJavaProject();	228	IJavaProject project= field.getJavaProject();
Lines 219-228 Link Here
219	buf.append('\n');	260	buf.append('\n');
220	}	261	}
221	}	262	}
222	buf.append("public "); //$NON-NLS-1$	263	buf.append(JdtFlags.getVisibilityString(fVisibility));
		264	buf.append(' ');
223	if (isStatic) {	265	if (isStatic) {
224	buf.append("static "); //$NON-NLS-1$	266	buf.append("static "); //$NON-NLS-1$
225	}	267	}
		268	if (fSynchronized)
		269	buf.append("synchronized "); //$NON-NLS-1$
		270	if (fFinal)
		271	buf.append("final "); //$NON-NLS-1$
		272	if (fNative)
		273	buf.append("native "); //$NON-NLS-1$
		274
226	buf.append("void "); buf.append(setterName); //$NON-NLS-1$	275	buf.append("void "); buf.append(setterName); //$NON-NLS-1$
227	buf.append('('); buf.append(typeName); buf.append(' ');	276	buf.append('('); buf.append(typeName); buf.append(' ');
228	buf.append(argname); buf.append(") {\n"); //$NON-NLS-1$	277	buf.append(argname); buf.append(") {\n"); //$NON-NLS-1$
Lines 241-246 Link Here
241	sibling= StubUtility.findNextSibling(existingSetter);	290	sibling= StubUtility.findNextSibling(existingSetter);
242	existingSetter.delete(false, null);	291	existingSetter.delete(false, null);
243	}	292	}
		293	else
		294	sibling= getInsertPosition();
244		295
245	String formattedContent= StubUtility.codeFormat(buf.toString(), indent, lineDelim) + lineDelim;	296	String formattedContent= StubUtility.codeFormat(buf.toString(), indent, lineDelim) + lineDelim;
246	fCreatedAccessors.add(parentType.createMethod(formattedContent, sibling, true, null));	297	fCreatedAccessors.add(parentType.createMethod(formattedContent, sibling, true, null));
Lines 253-256 Link Here
253	public IMethod[] getCreatedAccessors() {	304	public IMethod[] getCreatedAccessors() {
254	return (IMethod[]) fCreatedAccessors.toArray(new IMethod[fCreatedAccessors.size()]);	305	return (IMethod[]) fCreatedAccessors.toArray(new IMethod[fCreatedAccessors.size()]);
255	}	306	}
		307
		308	/**
		309	* @param fSort
		310	*/
		311	public void setSort(boolean sort) {
		312	fSort = sort;
		313	}
		314
		315	/**
		316	* @param fVisibility
		317	*/
		318	public void setVisibility(int visibility) {
		319	fVisibility = visibility;
		320	}
		321
		322	/**
		323	* @param syncSet
		324	*/
		325	public void setSynchronized(boolean syncSet) {
		326	fSynchronized = syncSet;
		327	}
		328
		329	/**
		330	* @param finalSet
		331	*/
		332	public void setFinal(boolean finalSet) {
		333	fFinal = finalSet;
		334	}
		335	/**
		336	* @return
		337	*/
		338	public IJavaElement getInsertPosition() {
		339	return fInsertPosition;
		340	}
		341
		342	/**
		343	* @param nativeSet
		344	*/
		345	public void setNative(boolean nativeSet) {
		346	fNative= nativeSet;
		347	}
		348
256	}	349	}




OverrideMethodsAction.error.type_removed_in_editor=Input type has been removed in editor.
OverrideMethodsAction.not_applicable=Operation not applicable to current text selection. Please position the cursor inside a type.

AddGetterSetterAction.label=Gene&rate Getters and Setters...
AddGetterSetterAction.description=Generate Getter and Setter methods for type's fields
AddGetterSetterAction.tooltip=Generate Getter and Setter methods for the type's Fields

AddGetterSetterAction.error.title=Generate Getters and Setters
AddGetterSetterAction.error.actionfailed=Generating Getters and Setters Failed.
AddGetterSetterAction.error.fieldNotExisting=The field ''{0}'' has been removed in the editor.
AddGetterSetterAction.not_applicable=Operation not applicable to current text selection. A field has to be selected or a type that declares fields.
AddGetterSetterAction.read_only=The compilation unit in which the field ''{0}'' is declared is read only.

AddGetterSetterAction.QueryDialog.title=Generate Getters and Setters
AddGetterSetterAction.SkipSetterForFinalDialog.message=Field ''{0}'' is final.\nOK to skip creation of the setter method?
AddGetterSetterAction.SkipExistingDialog.message=Method ''{0}'' already exists.\nSkip creation?
AddGetterSetterAction.SkipExistingDialog.skip.label=&Skip

AddGetterSetterAction.methods_selected={0} methods selected.
AddGettSetterAction.typeContainsNoFields.message=The type contains no fields or all fields have getters/setters already.

GetterSetterTreeSelectionDialog.select_getters=Select &Getters
GetterSetterTreeSelectionDialog.select_setters=Select &Setters
GetterSetterTreeSelectionDialog.alpha_pair_sort=Fields in getter/setter pairs
GetterSetterTreeSelectionDialog.alpha_method_sort=Method names alphabetically
GetterSetterTreeSelectionDialog.modifier_label=&Modfiers:
GetterSetterTreeSelectionDialog.sort_label=S&ort by:
GetterSetterTreeSelectionDialog.enterAt_label=&Insert point:
GetterSetterTreeSelectionDialog.cursor_position=Current cursor position
GetterSetterTreeSelectionDialog.first_method=First method

AddUnimplementedConstructorsAction.label=Add &Constructors from Superclass
AddUnimplementedConstructorsAction.description=Evaluate and add constructors from superclass

PullUpAction.problem.message=Operation not possible.

OverrideMethodQuery.groupMethodsByTypes=Group methods by &types
OverrideMethodQuery.createComment=Generate method &comment
OverrideMethodQuery.dialog.title=Override/Implement Methods
OverrideMethodQuery.dialog.description=&Select methods to override or implement:
OverrideMethodQuery.selectioninfo.one={0} method selected.

Lines 217-223 Link Here

(-)ui/org/eclipse/jdt/internal/ui/actions/SelectionConverter.java (-1 / +1 lines)
217	return EMPTY_RESULT;	217	return EMPTY_RESULT;
218	}	218	}
219		219
220	private static IJavaElement getElementAtOffset(IJavaElement input, ITextSelection selection) throws JavaModelException {	220	public static IJavaElement getElementAtOffset(IJavaElement input, ITextSelection selection) throws JavaModelException {
221	if (input instanceof ICompilationUnit) {	221	if (input instanceof ICompilationUnit) {
222	ICompilationUnit cunit= (ICompilationUnit)input;	222	ICompilationUnit cunit= (ICompilationUnit)input;
223	if (cunit.isWorkingCopy()) {	223	if (cunit.isWorkingCopy()) {





import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;

import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Shell;

import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IRewriteTarget;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;

import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
import org.eclipse.ui.dialogs.ISelectionStatusValidator;
import org.eclipse.ui.help.WorkbenchHelp;

import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
import org.eclipse.jdt.core.dom.Modifier;
import org.eclipse.jdt.internal.corext.SourceRange;
import org.eclipse.jdt.ui.JavaElementLabelProvider;
import org.eclipse.jdt.ui.JavaElementSorter;

import org.eclipse.jdt.internal.corext.codemanipulation.AddGetterSetterOperation;
import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil;

import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.selectionactions.GoToNextPreviousMemberAction;
import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
import org.eclipse.jdt.internal.ui.refactoring.IVisibilityChangeListener;
import org.eclipse.jdt.internal.ui.refactoring.VisibilityControlUtil;
import org.eclipse.jdt.internal.ui.util.ElementValidator;
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementLabels;
import org.eclipse.jdt.ui.JavaElementImageDescriptor;
import org.eclipse.jdt.ui.JavaElementLabelProvider;
import org.eclipse.jdt.ui.JavaElementSorter;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IRewriteTarget;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
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.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
import org.eclipse.ui.dialogs.ISelectionStatusValidator;
import org.eclipse.ui.help.WorkbenchHelp;

/**
 * Creates getter and setter methods for a type's fields. Opens a dialog

 */
public class AddGetterSetterAction extends SelectionDispatchAction {
	
	private int fVisibility;
	private boolean fSort;
	private boolean fSynchronized;
	private boolean fFinal;	
	private boolean fNative;
	private CompilationUnitEditor fEditor;
	private static final String dialogTitle= ActionMessages.getString("AddGetterSetterAction.error.title"); //$NON-NLS-1$


		this(editor.getEditorSite());
		fEditor= editor;
		setEnabled(SelectionConverter.getInputAsCompilationUnit(editor) != null);
		fEditor.getEditorSite();
	}
	
	//---- Structured Viewer -----------------------------------------------------------

				return;
			}	
			Object firstElement= selection.getFirstElement();

			if (firstElement instanceof IType)
				run((IType)firstElement, new IField[0], false);
			else if (firstElement instanceof ICompilationUnit)	

		return fields != null && fields.length > 0;
	}
	
	private void run(IType type, IField[] preselected, boolean editor) throws CoreException {		
		if (!ElementValidator.check(type, getShell(), dialogTitle, editor))
			return;
		if (!ActionUtil.isProcessable(getShell(), type))
			return;			
		
		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
		ILabelProvider lp= new AddGetterSetterLabelProvider();
		Map entries= createGetterSetterMapping(type);
		if (entries.isEmpty()){
			MessageDialog.openInformation(getShell(), dialogTitle, ActionMessages.getString("AddGettSetterAction.typeContainsNoFields.message")); //$NON-NLS-1$
			return;
		}	
		ITreeContentProvider cp= new AddGetterSetterContentProvider(entries);
		GetterSetterTreeSelectionDialog dialog= new GetterSetterTreeSelectionDialog(getShell(), lp, cp, fEditor);
		dialog.setSorter(new JavaElementSorter());
		dialog.setTitle(dialogTitle);
		String message= ActionMessages.getString("AddGetterSetterAction.dialog.title");//$NON-NLS-1$

		Object[] result= dialog.getResult();
		if (result == null)
			return;
		fSort= dialog.getSort();
		fVisibility= dialog.getVisibility();
		fSynchronized= dialog.getSynchronized();
		fNative= dialog.getNative();
		fFinal= dialog.getFinal();
		IField[] getterFields, setterFields, getterSetterFields;
		if (fSort) {
			getterFields= getGetterFields(result);
			setterFields= getSetterFields(result);
			getterSetterFields= new IField[0];
		}
		else {
			getterFields= getGetterOnlyFields(result);
			setterFields= getSetterOnlyFields(result);
			getterSetterFields= getGetterSetterFields(result);			
		}
		IField[][] allFields= new IField[][] {preselected, getterFields, setterFields, getterSetterFields};
		
		IJavaElement elementPosition= calculateElementPosition(dialog.getInsertionIndex(), allFields);
		
		generate(getterFields, setterFields, getterSetterFields, elementPosition);
	}

	private boolean isEditorAvailable() {
		return fEditor != null;
	}	
	
	private IMethod asFirstMethod(IField[][] allFields) {
		try {
			for (int i=0; i < allFields.length; i++) {
				if (allFields[i].length  > 0) {
					IMethod methods[]= allFields[i][0].getDeclaringType().getMethods();
					return methods[0];				
				}
			}
		} catch (JavaModelException e) {
		}
		return null;
	}
	
	private IMethod atMethodPosition(IField[][] allFields, int index) {
		try {
			for (int i=0; i < allFields.length; i++) {
				if (allFields[i].length  > 0) {
					IMethod methods[]= allFields[i][0].getDeclaringType().getMethods();
					return methods[index-1];				
				}
			}
		} catch (JavaModelException e) {
		}
		return null;
	}
	/*
	 * Determine where in the file to enter the newly created methods. Result depends
	 * on whether to enter at the current cursor position or to enter at a chosen
	 * method.
	 */
	private IJavaElement calculateElementPosition(int comboBoxIndex, IField[][] allFields) {		
		try {
			if (isEditorAvailable()) {
				if (comboBoxIndex == 0) {			// at cursor position
					return setElementPosition(SelectionConverter.getElementAtOffset(fEditor));		
				}
				else if (comboBoxIndex == 1)	 	// as first method
					return asFirstMethod(allFields);
				else								// method position
					return atMethodPosition(allFields, comboBoxIndex-1);
			}
			else {									// run from a view part
				if (comboBoxIndex == 0)				// as first method
					return asFirstMethod(allFields);
				else {								// method position
					return atMethodPosition(allFields, comboBoxIndex);			
				}
			}
		}
		catch (JavaModelException e) {
		}
		return null;
	}
	
	private static ISelectionStatusValidator createValidator() {
		return new ISelectionStatusValidator(){
			public IStatus validate(Object[] selection) {

		};
	}

	//	returns a list of fields with setter entries checked
	private static IField[] getSetterFields(Object[] result){
		Collection list= new ArrayList(0);
		Object each= null;
		GetterSetterEntry entry= null;
		for (int i = 0; i < result.length; i++) {
			each= result[i];
			if ((each instanceof GetterSetterEntry)){ 
				entry= (GetterSetterEntry)each;
				if (! entry.isGetterEntry) {
					list.add(entry.field);
				}
			}
		}
		return (IField[]) list.toArray(new IField[list.size()]);			
	}
	
	//	returns a list of fields with getter entries checked
	private static IField[] getGetterFields(Object[] result){
		Collection list= new ArrayList(0);
		Object each= null;
		GetterSetterEntry entry= null;
		for (int i = 0; i < result.length; i++) {
			each= result[i];
			if ((each instanceof GetterSetterEntry)){ 
				entry= (GetterSetterEntry)each;
				if (entry.isGetterEntry) {
					list.add(entry.field);
				}
			}
		}
		return (IField[]) list.toArray(new IField[list.size()]);			
	}
	
	//	returns a list of fields with only getter entires checked
	private static IField[] getGetterOnlyFields(Object[] result){
		Collection list= new ArrayList(0);
		Object each= null;
		GetterSetterEntry entry= null;
		boolean getterSet= false;
		for (int i = 0; i < result.length; i++) {
			each= result[i];
			if ((each instanceof GetterSetterEntry)){ 
				entry= (GetterSetterEntry)each;
				if (entry.isGetterEntry) {
					list.add(entry.field);
					getterSet= true;
				}
				if ((! entry.isGetterEntry) && (getterSet == true)) {
					list.remove(entry.field);
					getterSet= false;
				}
			}
			else
				getterSet= false;	
		}
		return (IField[]) list.toArray(new IField[list.size()]);			
	}
	
	//	returns a list of fields with only setter entries checked
	private static IField[] getSetterOnlyFields(Object[] result){
		Collection list= new ArrayList(0);
		Object each= null;	
		GetterSetterEntry entry= null;
		boolean getterSet= false;
		for (int i = 0; i < result.length; i++) {
			each= result[i];
			if ((each instanceof GetterSetterEntry)){ 
				entry= (GetterSetterEntry)each;
				if (entry.isGetterEntry) {
					getterSet= true;
				}
				if ((! entry.isGetterEntry) && (getterSet != true)) {
					list.add(entry.field);
					getterSet= false;
				}
			}
			else
				getterSet= false;	
		}
		return (IField[]) list.toArray(new IField[list.size()]);					
	}
	
	// returns a list of fields with both entries checked
	private static IField[] getGetterSetterFields(Object[] result){
		Collection list= new ArrayList(0);
		Object each= null;		
		GetterSetterEntry entry= null;
		boolean getterSet= false;
		for (int i = 0; i < result.length; i++) {
			each= result[i];
			if ((each instanceof GetterSetterEntry)){ 
				entry= (GetterSetterEntry)each;
				if (entry.isGetterEntry) {
					getterSet= true;
				}
				if ((! entry.isGetterEntry) && (getterSet == true)) {
					list.add(entry.field);
					getterSet= false;
				}
			}
			else
				getterSet= false;	
		}
		return (IField[]) list.toArray(new IField[list.size()]);			
	}
	
	private void generate(IField[] getterFields, IField[] setterFields, IField[] getterSetterFields, IJavaElement elementPosition) throws CoreException{
		if (getterFields.length == 0 && setterFields.length == 0 && getterSetterFields.length == 0)
			return;
		
		ICompilationUnit cu= null;
		if (getterFields.length != 0)
			cu= getterFields[0].getCompilationUnit();
		else if (setterFields.length != 0)
			cu= setterFields[0].getCompilationUnit();
		else
			cu= getterSetterFields[0].getCompilationUnit();
		//open the editor, forces the creation of a working copy
		IEditorPart editor= EditorUtility.openInEditor(cu);
		
		IField[] workingCopyGetterFields= getWorkingCopyFields(getterFields);
		IField[] workingCopySetterFields= getWorkingCopyFields(setterFields);
		IField[] workingCopyGetterSetterFields= getWorkingCopyFields(getterSetterFields);
		IJavaElement workingCopyElementPosition= getWorkingCopy(elementPosition);

		if (workingCopyGetterFields != null && workingCopySetterFields != null && workingCopyGetterSetterFields != null)
			run(workingCopyGetterFields, workingCopySetterFields, workingCopyGetterSetterFields, editor, workingCopyElementPosition);			
	}
	
	private static IJavaElement getWorkingCopy(IJavaElement elementPosition) {
		if(elementPosition instanceof IMember)
			return JavaModelUtil.toWorkingCopy((IMember)elementPosition);
		return elementPosition;
	}

	private IField[] getWorkingCopyFields(IField[] fields) throws CoreException{
		if (fields.length == 0)
			return new IField[0];

				return;
			}
			IJavaElement element= SelectionConverter.getElementAtOffset(fEditor);
			
			if (element != null){
				IType type= (IType)element.getAncestor(IJavaElement.TYPE);
				if (type != null){

		
	//---- Helpers -------------------------------------------------------------------
	
	private void run(IField[] getterFields, IField[] setterFields, IField[] getterSetterFields, IEditorPart editor, IJavaElement elementPosition) {
		IRewriteTarget target= (IRewriteTarget) editor.getAdapter(IRewriteTarget.class);
		if (target != null) {
			target.beginCompoundChange();
		}
		try {
			AddGetterSetterOperation op= createAddGetterSetterOperation(getterFields, setterFields, getterSetterFields, elementPosition);
			// Set the status fields corresponding to the visibility and modifiers set
			op.setSort(fSort);
			op.setVisibility(fVisibility);
			op.setSynchronized(fSynchronized);
			op.setFinal(fFinal);
			op.setNative(fNative);
			new ProgressMonitorDialog(getShell()).run(false, true, new WorkbenchRunnableAdapter(op));
		
			IMethod[] createdMethods= op.getCreatedAccessors();

		}
	}

	private AddGetterSetterOperation createAddGetterSetterOperation(IField[] getterFields, IField[] setterFields, IField[] getterSetterFields, IJavaElement elementPosition) {
		IRequestQuery skipSetterForFinalQuery= skipSetterForFinalQuery();
		IRequestQuery skipReplaceQuery= skipReplaceQuery();
		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
		return new AddGetterSetterOperation(getterFields, setterFields, getterSetterFields, settings, skipSetterForFinalQuery, skipReplaceQuery, elementPosition);
	}
	
	private IRequestQuery skipSetterForFinalQuery() {

		return null;
	}
	
	private static class GetterSetterEntry {
		public final IField field;
		public final boolean isGetterEntry;
		GetterSetterEntry(IField field, boolean isGetterEntry){
			this.field= field;
			this.isGetterEntry= isGetterEntry;
		}
	}
	
	private static class AddGetterSetterLabelProvider extends JavaElementLabelProvider {
		
		AddGetterSetterLabelProvider() {

	/**
	 * @return map IField -> GetterSetterEntry[]
	 */
	private static Map createGetterSetterMapping(IType type) throws JavaModelException{
		IField[] fields= type.getFields();
		Map result= new HashMap();
		for (int i= 0; i < fields.length; i++) {

	}
	
	private static class AddGetterSetterContentProvider implements ITreeContentProvider{
		private boolean fsortAlphabetically;
		private static final Object[] EMPTY= new Object[0];
		private Map fGetterSetterEntries;//IField -> Object[] (with 0 to 2 elements of type GetterSetterEntry)
		public AddGetterSetterContentProvider(Map entries) throws JavaModelException {
			fGetterSetterEntries= entries;
		}

		public boolean hasChildren(Object element) {
			return getChildren(element).length > 0;
		}
		
		/* Enter the getter/setter methods alphabetically into file */
		public void enterAlphabetically(boolean alpha) {
			fsortAlphabetically= alpha;
		}
				
		/*
		 * @see IStructuredContentProvider#getElements(Object)
		 */
		public Object[] getElements(Object inputElement) {
			return fGetterSetterEntries.keySet().toArray();
		}
		
		
		/*
		 * @see IContentProvider#dispose()
		 */

		 */
		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		}
	}
	
	private static class GetterSetterTreeSelectionDialog extends CheckedTreeSelectionDialog {

		private boolean fSort;
		private int fVisibility;
		private boolean fNative;
		private boolean fFinal;
		private boolean fSynchronized;
		private int fInsertionIndex;
		private CompilationUnitEditor fEditor;
		
		public GetterSetterTreeSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider, CompilationUnitEditor editor) {
			super(parent, labelProvider, contentProvider);
			fEditor= editor;
		}

		public int getInsertionIndex() {
			return fInsertionIndex;
		}
		
		public int getVisibility() {
			return fVisibility;
		}

		public boolean getSort() {
			return fSort;
		}
		
		public boolean getFinal() {
			return fFinal;
		}		

		public boolean getNative() {
			return fNative;
		}	
		
		public boolean getSynchronized() {
			return fSynchronized;
		}	

		private boolean isEditorAvailable() {
			return fEditor != null;
		}	
						
		/**
		 * Adds the Select Getters and Select Setters buttons.
		 * Adds modifiers radio buttons and alphabetical order radio buttons. 
		 * 
		 * @param composite the parent composite
		 */
		protected Composite createSelectionButtons(Composite composite) {
			Composite buttonComposite = super.createSelectionButtons(composite); 
					
			addGetSetSelectButtons(buttonComposite);
			addOrderEntryChoices(buttonComposite);	
			addVisibilityAndModifiersChoices(buttonComposite);
										
			((GridLayout) buttonComposite.getLayout()).numColumns= 4;
			return buttonComposite;
		}
		
		private Composite addGetSetSelectButtons(Composite buttonComposite) {
			// Add buttons for selecting getters or setters only: http://bugs.eclipse.org/bugs/show_bug.cgi?id=35870
			int id = IDialogConstants.CLIENT_ID + 1;
			Button gettersButton = createButton(buttonComposite, id++, ActionMessages.getString("GetterSetterTreeSelectionDialog.select_getters"), false); //$NON-NLS-1$	

			SelectionListener listener = new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {
					getTreeViewer().setCheckedElements(getGetterSetterElements(true));
					updateOKStatus();
				}
			};
			gettersButton.addSelectionListener(listener);
		
			Button settersButton = createButton(buttonComposite, id++, ActionMessages.getString("GetterSetterTreeSelectionDialog.select_setters"), false); //$NON-NLS-1$	

			listener = new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {					
					getTreeViewer().setCheckedElements(getGetterSetterElements(false));
					updateOKStatus();
				}
			};
			settersButton.addSelectionListener(listener);
			
			return buttonComposite;			
		}
		
		private Composite addVisibilityAndModifiersChoices(Composite buttonComposite) {
			// Add visibility and modifiers buttons: http://bugs.eclipse.org/bugs/show_bug.cgi?id=35870
			IVisibilityChangeListener visibilityChangeListener = new IVisibilityChangeListener(){
				public void visibilityChanged(int newVisibility) {
					fVisibility= newVisibility;
				}
				public void modifierChanged(int modifier, boolean isChecked) {	
					switch (modifier) {
						case Modifier.FINAL: fFinal= isChecked; return;
						case Modifier.SYNCHRONIZED: fSynchronized= isChecked; return;
						case Modifier.NATIVE: fNative= isChecked; return;
						default: return;
					}
				}
			};
			int correctVisibility= Modifier.PUBLIC;
			int[] availableVisibilities= new int[]{Modifier.PUBLIC, Modifier.PROTECTED, Modifier.PRIVATE, Modifier.NONE};
			int[] availableModifiers= new int[] {Modifier.FINAL, Modifier.SYNCHRONIZED, Modifier.NATIVE};
			
			Composite visibilityComposite= VisibilityControlUtil.createVisibilityControlAndModifiers(buttonComposite, visibilityChangeListener, availableVisibilities, correctVisibility, availableModifiers);
			((GridData)visibilityComposite.getLayoutData()).horizontalSpan = 4;		
			
			return visibilityComposite;				
		}
		
		private Composite addOrderEntryChoices(Composite buttonComposite) {
			// Add order entry choices: http://bugs.eclipse.org/bugs/show_bug.cgi?id=35870
			Label enterLabel= new Label(buttonComposite, SWT.NONE);
			enterLabel.setText(ActionMessages.getString("GetterSetterTreeSelectionDialog.enterAt_label")); //$NON-NLS-1$
			GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
			gd.horizontalSpan= 1;
			enterLabel.setLayoutData(gd);

			final Combo enterCombo= new Combo(buttonComposite, SWT.READ_ONLY);
			fillWithPossibleInsertPositions(enterCombo);
			//enterCombo.setText(enterCombo.getItem(0));
			gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
			gd.horizontalSpan= 3;
			enterCombo.setLayoutData(gd);
			enterCombo.addSelectionListener(new SelectionAdapter(){
				public void widgetSelected(SelectionEvent e) {
					fInsertionIndex= enterCombo.getSelectionIndex();
				}
			});

			Label label= new Label(buttonComposite, SWT.NONE);
			label.setText(ActionMessages.getString("GetterSetterTreeSelectionDialog.sort_label")); //$NON-NLS-1$
			gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
			gd.horizontalSpan= 1;
			label.setLayoutData(gd);

			final Combo combo= new Combo(buttonComposite, SWT.READ_ONLY);
			combo.setItems(new String[]{ActionMessages.getString("GetterSetterTreeSelectionDialog.alpha_pair_sort"), //$NON-NLS-1$
										ActionMessages.getString("GetterSetterTreeSelectionDialog.alpha_method_sort")});  //$NON-NLS-1$  
			final int methodIndex= 1;	// Hard-coded. Change this if the list gets more complicated.
			combo.setText(combo.getItem(0));
			gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
			gd.horizontalSpan= 3;
			combo.setLayoutData(gd);
			combo.addSelectionListener(new SelectionAdapter(){
				public void widgetSelected(SelectionEvent e) {
					fSort= (combo.getSelectionIndex() == methodIndex);
				}
			});	

			return buttonComposite;			
		}
		
		private void fillWithPossibleInsertPositions(Combo combo) {
			Object allFields[]= getContentProvider().getElements(null);
			IField field= (IField)allFields[0];

			if (isEditorAvailable())
				combo.add(ActionMessages.getString("GetterSetterTreeSelectionDialog.cursor_position")); //$NON-NLS-1$	

			combo.add(ActionMessages.getString("GetterSetterTreeSelectionDialog.first_method")); //$NON-NLS-1$
			try {
				IMethod[] methods= field.getDeclaringType().getMethods();
				for (int i= 0; i < methods.length; i++) {
					combo.add(JavaElementLabels.getElementLabel(methods[i], JavaElementLabels.M_PARAMETER_TYPES));
				}		
			} catch (JavaModelException e) {
			}
			combo.select(0);
		}		

		private Object[] getGetterSetterElements(boolean isGetter){
			Object[] allFields= getContentProvider().getElements(null);
			Set result= new HashSet();
			for (int i = 0; i < allFields.length; i++) {
				IField field= (IField)allFields[i];
				GetterSetterEntry[] entries= getEntries(field);
				for (int j = 0; j < entries.length; j++) {
					AddGetterSetterAction.GetterSetterEntry entry= entries[j];
					if (entry.isGetterEntry == isGetter)
						result.add(entry);
				}
			}
			return result.toArray();
		}

		private GetterSetterEntry[] getEntries(IField field) {
			List result= Arrays.asList(getContentProvider().getChildren(field));
			return (GetterSetterEntry[]) result.toArray(new GetterSetterEntry[result.size()]);
		}

	}

	private static class GetterSetterEntry {
		public final IField field;
		public final boolean isGetterEntry;

		GetterSetterEntry(IField field, boolean isGetterEntry){
			this.field= field;
			this.isGetterEntry= isGetterEntry;
		}
	}

	/**
	 * Sets the location where the new getter/setter methods will be entered. 
	 */
	private IJavaElement setElementPosition(IJavaElement element) {
		try {
			if (element == null) {
				return null;
			}
			int type = element.getElementType();
			if (type == IJavaElement.METHOD || type == IJavaElement.FIELD)
				return element;
			else {		
				ITextSelection textSelect= (ITextSelection)fEditor.getSelectionProvider().getSelection();	
				GoToNextPreviousMemberAction action= GoToNextPreviousMemberAction.newGoToNextMemberAction(fEditor);
				ISourceRange sourceRange= action.getNewSelectionRange(createSourceRange(textSelect), null);
				IJavaElement nextElement= SelectionConverter.getElementAtOffset(SelectionConverter.getInput(fEditor), createTextSelection(sourceRange));
				type= nextElement.getElementType();
				if (type == IJavaElement.METHOD || type == IJavaElement.FIELD)
					return nextElement;
				else		// end of file
					return null;

			}
		} catch (JavaModelException e) {
		}
		return null;
	}
	
	private static ISourceRange createSourceRange(ITextSelection textSelection){
		return new SourceRange(textSelection.getOffset(), textSelection.getLength());
	}
	
	private static ITextSelection createTextSelection(ISourceRange sourceRange){
		return new TextSelection(sourceRange.getOffset(), sourceRange.getLength());
	}
}

Lines 11-14 Link Here

(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IVisibilityChangeListener.java (+1 lines)
11	package org.eclipse.jdt.internal.ui.refactoring;	11	package org.eclipse.jdt.internal.ui.refactoring;
12	public interface IVisibilityChangeListener{	12	public interface IVisibilityChangeListener{
13	void visibilityChanged(int newVisibility);	13	void visibilityChanged(int newVisibility);
		14	void modifierChanged(int modifier, boolean isChecked);
14	}	15	}




import java.util.ArrayList;
import java.util.List;

import org.eclipse.jdt.core.dom.Modifier;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
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.Group;

public class VisibilityControlUtil {
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;

class VisibilityControlUtil {
	private VisibilityControlUtil(){}
	
	public static Composite createVisibilityControl(Composite parent, final IVisibilityChangeListener visibilityChangeListener, int[] availableVisibilities, int correctVisibility) {
		List allowedVisibilities= convertToIntegerList(availableVisibilities);
		if (allowedVisibilities.size() == 1)
			return null;

		GridData gd= new GridData(GridData.FILL_HORIZONTAL);
		group.setLayoutData(gd);
		GridLayout layout= new GridLayout();
		layout.makeColumnsEqualWidth= true;
		layout.numColumns= 4; layout.marginWidth= 0;
		group.setLayout(layout);
		

					new Integer(Modifier.PROTECTED),
					new Integer(Modifier.NONE),
					new Integer(Modifier.PRIVATE)};
		Integer initialVisibility= new Integer(correctVisibility);
		for (int i= 0; i < labels.length; i++) {
			Button radio= new Button(group, SWT.RADIO);
			Integer visibilityCode= data[i];

		group.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
		return group;
	}

	public static Composite createVisibilityControlAndModifiers(Composite parent, final IVisibilityChangeListener visibilityChangeListener, int[] availableVisibilities, int correctVisibility, int[] availableModifiers) {
		Composite visibilityComposite= createVisibilityControl(parent, visibilityChangeListener, availableVisibilities, correctVisibility);

		List allowedModifiers= convertToIntegerList(availableModifiers);
		if (allowedModifiers.size() == 1)
			return null;
			
		String[] labels= new String[] {
			RefactoringMessages.getString("VisibilityControlUtil.abstract"), //$NON-NLS-1$
			RefactoringMessages.getString("VisibilityControlUtil.static"), //$NON-NLS-1$
			RefactoringMessages.getString("VisibilityControlUtil.final"), //$NON-NLS-1$
			RefactoringMessages.getString("VisibilityControlUtil.synchronized"), //$NON-NLS-1$
			RefactoringMessages.getString("VisibilityControlUtil.native"), //$NON-NLS-1$
		};		
		Integer[] data= new Integer[] {
					new Integer(Modifier.ABSTRACT),
					new Integer(Modifier.STATIC),
					new Integer(Modifier.FINAL),
					new Integer(Modifier.SYNCHRONIZED),
					new Integer(Modifier.NATIVE)};
		
		for (int i=0; i < labels.length; i++) {
			if (allowedModifiers.contains(data[i])) {
				Button checkboxButton= new Button(visibilityComposite, SWT.CHECK);
				checkboxButton.setText(labels[i]);
				GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
				checkboxButton.setLayoutData(gd);
				checkboxButton.setData(data[i]);
				checkboxButton.setEnabled(true);
				checkboxButton.setSelection(false);
				checkboxButton.addSelectionListener(new SelectionListener() {
					private Object modifiers;
	
					public void widgetSelected(SelectionEvent event) {
						visibilityChangeListener.modifierChanged(((Integer)event.widget.getData()).intValue(), ((Button) event.widget).getSelection());
					}
		
					public void widgetDefaultSelected(SelectionEvent event) {
						widgetSelected(event);
					}
				});				
			}
		}				
		return visibilityComposite;			
	}

	private static List convertToIntegerList(int[] array) {
		List result= new ArrayList(array.length);
		for (int i= 0; i < array.length; i++) {

Lines 386-391 Link Here

(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties (+5 lines)
386		386
387	VisibilityControlUtil.Access_modifier=Access modifier	387	VisibilityControlUtil.Access_modifier=Access modifier
388	VisibilityControlUtil.defa&ult_4=de&fault	388	VisibilityControlUtil.defa&ult_4=de&fault
		389	VisibilityControlUtil.abstract=&abstract
		390	VisibilityControlUtil.final=f&inal
		391	VisibilityControlUtil.static=stati&c
		392	VisibilityControlUtil.synchronized=s&ynchronized
		393	VisibilityControlUtil.native=&native
389		394
390	PullUpInputPage1.pull_up=pull up	395	PullUpInputPage1.pull_up=pull up
391	PullUpInputPage1.declare_abstract=declare abstract in destination	396	PullUpInputPage1.declare_abstract=declare abstract in destination

Return to bug 35870

Lines 73-89 Link Here

(-)ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties (-5 / +15 lines)
73	OverrideMethodsAction.error.type_removed_in_editor=Input type has been removed in editor.	73	OverrideMethodsAction.error.type_removed_in_editor=Input type has been removed in editor.
74	OverrideMethodsAction.not_applicable=Operation not applicable to current text selection. Please position the cursor inside a type.	74	OverrideMethodsAction.not_applicable=Operation not applicable to current text selection. Please position the cursor inside a type.
75		75
76	AddGetterSetterAction.label=Gene&rate Getter and Setter...	76	AddGetterSetterAction.label=Gene&rate Getters and Setters...
77	AddGetterSetterAction.description=Generate Getter and Setter methods for type's fields	77	AddGetterSetterAction.description=Generate Getter and Setter methods for type's fields
78	AddGetterSetterAction.tooltip=Generate Getter and Setter methods for the Type's Fields	78	AddGetterSetterAction.tooltip=Generate Getter and Setter methods for the type's Fields
79		79
80	AddGetterSetterAction.error.title=Generate Getter and Setter	80	AddGetterSetterAction.error.title=Generate Getters and Setters
81	AddGetterSetterAction.error.actionfailed=Generating Getter and Setter Failed.	81	AddGetterSetterAction.error.actionfailed=Generating Getters and Setters Failed.
82	AddGetterSetterAction.error.fieldNotExisting=The field ''{0}'' has been removed in the editor.	82	AddGetterSetterAction.error.fieldNotExisting=The field ''{0}'' has been removed in the editor.
83	AddGetterSetterAction.not_applicable=Operation not applicable to current text selection. A field has to be selected or a type that declares fields.	83	AddGetterSetterAction.not_applicable=Operation not applicable to current text selection. A field has to be selected or a type that declares fields.
84	AddGetterSetterAction.read_only=The compilation unit in which the field ''{0}'' is declared is read only.	84	AddGetterSetterAction.read_only=The compilation unit in which the field ''{0}'' is declared is read only.
85		85
86	AddGetterSetterAction.QueryDialog.title=Generate Getter and Setter	86	AddGetterSetterAction.QueryDialog.title=Generate Getters and Setters
87	AddGetterSetterAction.SkipSetterForFinalDialog.message=Field ''{0}'' is final.\nOK to skip creation of the setter method?	87	AddGetterSetterAction.SkipSetterForFinalDialog.message=Field ''{0}'' is final.\nOK to skip creation of the setter method?
88	AddGetterSetterAction.SkipExistingDialog.message=Method ''{0}'' already exists.\nSkip creation?	88	AddGetterSetterAction.SkipExistingDialog.message=Method ''{0}'' already exists.\nSkip creation?
89	AddGetterSetterAction.SkipExistingDialog.skip.label=&Skip	89	AddGetterSetterAction.SkipExistingDialog.skip.label=&Skip
Lines 95-100 Link Here
95	AddGetterSetterAction.methods_selected={0} methods selected.	95	AddGetterSetterAction.methods_selected={0} methods selected.
96	AddGettSetterAction.typeContainsNoFields.message=The type contains no fields or all fields have getters/setters already.	96	AddGettSetterAction.typeContainsNoFields.message=The type contains no fields or all fields have getters/setters already.
97		97
		98	GetterSetterTreeSelectionDialog.select_getters=Select &Getters
		99	GetterSetterTreeSelectionDialog.select_setters=Select &Setters
		100	GetterSetterTreeSelectionDialog.alpha_pair_sort=Fields in getter/setter pairs
		101	GetterSetterTreeSelectionDialog.alpha_method_sort=Method names alphabetically
		102	GetterSetterTreeSelectionDialog.modifier_label=&Modfiers:
		103	GetterSetterTreeSelectionDialog.sort_label=S&ort by:
		104	GetterSetterTreeSelectionDialog.enterAt_label=&Insert point:
		105	GetterSetterTreeSelectionDialog.cursor_position=Current cursor position
		106	GetterSetterTreeSelectionDialog.first_method=First method
98		107
99	AddUnimplementedConstructorsAction.label=Add &Constructors from Superclass	108	AddUnimplementedConstructorsAction.label=Add &Constructors from Superclass
100	AddUnimplementedConstructorsAction.description=Evaluate and add constructors from superclass	109	AddUnimplementedConstructorsAction.description=Evaluate and add constructors from superclass
Lines 230-235 Link Here
230	PullUpAction.problem.message=Operation not possible.	239	PullUpAction.problem.message=Operation not possible.
231		240
232	OverrideMethodQuery.groupMethodsByTypes=Group methods by &types	241	OverrideMethodQuery.groupMethodsByTypes=Group methods by &types
		242	OverrideMethodQuery.createComment=Generate method &comment
233	OverrideMethodQuery.dialog.title=Override/Implement Methods	243	OverrideMethodQuery.dialog.title=Override/Implement Methods
234	OverrideMethodQuery.dialog.description=&Select methods to override or implement:	244	OverrideMethodQuery.dialog.description=&Select methods to override or implement:
235	OverrideMethodQuery.selectioninfo.one={0} method selected.	245	OverrideMethodQuery.selectioninfo.one={0} method selected.

Lines 13-34 Link Here

(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/VisibilityControlUtil.java (-6 / +53 lines)
13	import java.util.ArrayList;	13	import java.util.ArrayList;
14	import java.util.List;	14	import java.util.List;
15		15
		16	import org.eclipse.jdt.core.dom.Modifier;
16	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.events.SelectionAdapter;	18	import org.eclipse.swt.events.SelectionAdapter;
18	import org.eclipse.swt.events.SelectionEvent;	19	import org.eclipse.swt.events.SelectionEvent;
		20	import org.eclipse.swt.events.SelectionListener;
19	import org.eclipse.swt.layout.GridData;	21	import org.eclipse.swt.layout.GridData;
20	import org.eclipse.swt.layout.GridLayout;	22	import org.eclipse.swt.layout.GridLayout;
21	import org.eclipse.swt.widgets.Button;	23	import org.eclipse.swt.widgets.Button;
22	import org.eclipse.swt.widgets.Composite;	24	import org.eclipse.swt.widgets.Composite;
23	import org.eclipse.swt.widgets.Group;	25	import org.eclipse.swt.widgets.Group;
24		26
25	import org.eclipse.jdt.core.dom.Modifier;	27	public class VisibilityControlUtil {
26	import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
27
28	class VisibilityControlUtil {
29	private VisibilityControlUtil(){}	28	private VisibilityControlUtil(){}
30		29
31	public static Composite createVisibilityControl(Composite parent, final IVisibilityChangeListener visibilityChangeListener, int[] availableVisibilities, int currectVisibility) {	30	public static Composite createVisibilityControl(Composite parent, final IVisibilityChangeListener visibilityChangeListener, int[] availableVisibilities, int correctVisibility) {
32	List allowedVisibilities= convertToIntegerList(availableVisibilities);	31	List allowedVisibilities= convertToIntegerList(availableVisibilities);
33	if (allowedVisibilities.size() == 1)	32	if (allowedVisibilities.size() == 1)
34	return null;	33	return null;
Lines 38-43 Link Here
38	GridData gd= new GridData(GridData.FILL_HORIZONTAL);	37	GridData gd= new GridData(GridData.FILL_HORIZONTAL);
39	group.setLayoutData(gd);	38	group.setLayoutData(gd);
40	GridLayout layout= new GridLayout();	39	GridLayout layout= new GridLayout();
		40	layout.makeColumnsEqualWidth= true;
41	layout.numColumns= 4; layout.marginWidth= 0;	41	layout.numColumns= 4; layout.marginWidth= 0;
42	group.setLayout(layout);	42	group.setLayout(layout);
43		43
Lines 52-58 Link Here
52	new Integer(Modifier.PROTECTED),	52	new Integer(Modifier.PROTECTED),
53	new Integer(Modifier.NONE),	53	new Integer(Modifier.NONE),
54	new Integer(Modifier.PRIVATE)};	54	new Integer(Modifier.PRIVATE)};
55	Integer initialVisibility= new Integer(currectVisibility);	55	Integer initialVisibility= new Integer(correctVisibility);
56	for (int i= 0; i < labels.length; i++) {	56	for (int i= 0; i < labels.length; i++) {
57	Button radio= new Button(group, SWT.RADIO);	57	Button radio= new Button(group, SWT.RADIO);
58	Integer visibilityCode= data[i];	58	Integer visibilityCode= data[i];
Lines 69-74 Link Here
69	group.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));	69	group.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
70	return group;	70	return group;
71	}	71	}
		72
		73	public static Composite createVisibilityControlAndModifiers(Composite parent, final IVisibilityChangeListener visibilityChangeListener, int[] availableVisibilities, int correctVisibility, int[] availableModifiers) {
		74	Composite visibilityComposite= createVisibilityControl(parent, visibilityChangeListener, availableVisibilities, correctVisibility);
		75
		76	List allowedModifiers= convertToIntegerList(availableModifiers);
		77	if (allowedModifiers.size() == 1)
		78	return null;
		79
		80	String[] labels= new String[] {
		81	RefactoringMessages.getString("VisibilityControlUtil.abstract"), //$NON-NLS-1$
		82	RefactoringMessages.getString("VisibilityControlUtil.static"), //$NON-NLS-1$
		83	RefactoringMessages.getString("VisibilityControlUtil.final"), //$NON-NLS-1$
		84	RefactoringMessages.getString("VisibilityControlUtil.synchronized"), //$NON-NLS-1$
		85	RefactoringMessages.getString("VisibilityControlUtil.native"), //$NON-NLS-1$
		86	};
		87	Integer[] data= new Integer[] {
		88	new Integer(Modifier.ABSTRACT),
		89	new Integer(Modifier.STATIC),
		90	new Integer(Modifier.FINAL),
		91	new Integer(Modifier.SYNCHRONIZED),
		92	new Integer(Modifier.NATIVE)};
		93
		94	for (int i=0; i < labels.length; i++) {
		95	if (allowedModifiers.contains(data[i])) {
		96	Button checkboxButton= new Button(visibilityComposite, SWT.CHECK);
		97	checkboxButton.setText(labels[i]);
		98	GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
		99	checkboxButton.setLayoutData(gd);
		100	checkboxButton.setData(data[i]);
		101	checkboxButton.setEnabled(true);
		102	checkboxButton.setSelection(false);
		103	checkboxButton.addSelectionListener(new SelectionListener() {
		104	private Object modifiers;
		105
		106	public void widgetSelected(SelectionEvent event) {
		107	visibilityChangeListener.modifierChanged(((Integer)event.widget.getData()).intValue(), ((Button) event.widget).getSelection());
		108	}
		109
		110	public void widgetDefaultSelected(SelectionEvent event) {
		111	widgetSelected(event);
		112	}
		113	});
		114	}
		115	}
		116	return visibilityComposite;
		117	}
		118
72	private static List convertToIntegerList(int[] array) {	119	private static List convertToIntegerList(int[] array) {
73	List result= new ArrayList(array.length);	120	List result= new ArrayList(array.length);
74	for (int i= 0; i < array.length; i++) {	121	for (int i= 0; i < array.length; i++) {