Attachment #73944 for bug #196091

View | Details | Raw Unified | Return to bug 196091
Collapse All | Expand All

Lines 17-22 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/schema/SchemaAttributeDetails.java (-2 / +20 lines)
17	import org.eclipse.jdt.core.IJavaProject;	17	import org.eclipse.jdt.core.IJavaProject;
18	import org.eclipse.jdt.core.IType;	18	import org.eclipse.jdt.core.IType;
19	import org.eclipse.jdt.core.JavaCore;	19	import org.eclipse.jdt.core.JavaCore;
		20	import org.eclipse.jdt.core.search.IJavaSearchConstants;
20	import org.eclipse.jdt.core.search.SearchEngine;	21	import org.eclipse.jdt.core.search.SearchEngine;
21	import org.eclipse.jdt.ui.IJavaElementSearchConstants;	22	import org.eclipse.jdt.ui.IJavaElementSearchConstants;
22	import org.eclipse.jdt.ui.JavaUI;	23	import org.eclipse.jdt.ui.JavaUI;
Lines 41-49 Link Here
41	import org.eclipse.pde.internal.ui.PDEPlugin;	42	import org.eclipse.pde.internal.ui.PDEPlugin;
42	import org.eclipse.pde.internal.ui.PDEUIMessages;	43	import org.eclipse.pde.internal.ui.PDEUIMessages;
43	import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;	44	import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
		45	import org.eclipse.pde.internal.ui.editor.contentassist.TypeFieldAssistDisposer;
44	import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;	46	import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
45	import org.eclipse.pde.internal.ui.parts.ComboPart;	47	import org.eclipse.pde.internal.ui.parts.ComboPart;
46	import org.eclipse.pde.internal.ui.parts.FormEntry;	48	import org.eclipse.pde.internal.ui.parts.FormEntry;
		49	import org.eclipse.pde.internal.ui.util.PDEJavaHelperUI;
47	import org.eclipse.pde.internal.ui.util.SWTUtil;	50	import org.eclipse.pde.internal.ui.util.SWTUtil;
48	import org.eclipse.swt.SWT;	51	import org.eclipse.swt.SWT;
49	import org.eclipse.swt.custom.StackLayout;	52	import org.eclipse.swt.custom.StackLayout;
Lines 103-108 Link Here
103	private Composite fResourceTypeComp;	106	private Composite fResourceTypeComp;
104	private Composite fNotebook;	107	private Composite fNotebook;
105	private StackLayout fNotebookLayout;	108	private StackLayout fNotebookLayout;
		109	private TypeFieldAssistDisposer fClassEntryFieldAssistDisposer;
		110	private TypeFieldAssistDisposer fInterfaceEntryFieldAssistDisposer;
106		111
107	public SchemaAttributeDetails(ElementSection section) {	112	public SchemaAttributeDetails(ElementSection section) {
108	super(section, false);	113	super(section, false);
Lines 173-179 Link Here
173	private Composite createJavaTypeComp(Composite parent, FormToolkit toolkit, Color foreground) {	178	private Composite createJavaTypeComp(Composite parent, FormToolkit toolkit, Color foreground) {
174	Composite comp = createEmptyComposite(parent, toolkit);	179	Composite comp = createEmptyComposite(parent, toolkit);
175	fClassEntry = new FormEntry(comp, toolkit, PDEUIMessages.SchemaAttributeDetails_extends, PDEUIMessages.SchemaAttributeDetails_browseButton, isEditable(), 13);	180	fClassEntry = new FormEntry(comp, toolkit, PDEUIMessages.SchemaAttributeDetails_extends, PDEUIMessages.SchemaAttributeDetails_browseButton, isEditable(), 13);
		181	fClassEntryFieldAssistDisposer = PDEJavaHelperUI.addTypeFieldAssistToText(fClassEntry.getText(),
		182	getPage().getPDEEditor().getCommonProject(),
		183	IJavaSearchConstants.CLASS);
176	fInterfaceEntry = new FormEntry(comp, toolkit, PDEUIMessages.SchemaAttributeDetails_implements, PDEUIMessages.SchemaAttributeDetails_browseButton, isEditable(), 13);	184	fInterfaceEntry = new FormEntry(comp, toolkit, PDEUIMessages.SchemaAttributeDetails_implements, PDEUIMessages.SchemaAttributeDetails_browseButton, isEditable(), 13);
		185	fInterfaceEntryFieldAssistDisposer = PDEJavaHelperUI.addTypeFieldAssistToText(fInterfaceEntry.getText(),
		186	getPage().getPDEEditor().getCommonProject(),
		187	IJavaSearchConstants.INTERFACE);
177	return comp;	188	return comp;
178	}	189	}
179		190
Lines 292-299 Link Here
292	} else {	303	} else {
293	fClassEntry.setValue("", true); //$NON-NLS-1$	304	fClassEntry.setValue("", true); //$NON-NLS-1$
294	fInterfaceEntry.setValue("", true); //$NON-NLS-1$	305	fInterfaceEntry.setValue("", true); //$NON-NLS-1$
295	}	306	}
296
297	}	307	}
298		308
299	public void hookListeners() {	309	public void hookListeners() {
Lines 578-581 Link Here
578	fInterfaceEntry.commit();	588	fInterfaceEntry.commit();
579	fValue.commit();	589	fValue.commit();
580	}	590	}
		591
		592	public void dispose() {
		593	super.dispose();
		594	if (fClassEntryFieldAssistDisposer != null)
		595	fClassEntryFieldAssistDisposer.dispose();
		596	if (fInterfaceEntryFieldAssistDisposer != null)
		597	fInterfaceEntryFieldAssistDisposer.dispose();
		598	}
581	}	599	}

Lines 115-121 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java (-1 / +2 lines)
115	boolean isInterface = Flags.isInterface(proposal.getFlags());	115	boolean isInterface = Flags.isInterface(proposal.getFlags());
116	String completion = new String(proposal.getCompletion());	116	String completion = new String(proposal.getCompletion());
117	if (isInterface && typeScope == IJavaSearchConstants.CLASS \|\|	117	if (isInterface && typeScope == IJavaSearchConstants.CLASS \|\|
118	completion.equals("Dummy2")) //$NON-NLS-1$	118	(!isInterface && typeScope == IJavaSearchConstants.INTERFACE) \|\|
		119	completion.equals("Dummy2")) //$NON-NLS-1$
119	// don't want Dummy class showing up as option.	120	// don't want Dummy class showing up as option.
120	return;	121	return;
121	int period = completion.lastIndexOf('.');	122	int period = completion.lastIndexOf('.');

Return to bug 196091