Bug 430921 - PartDescriptorEditor private member IProject project isI20140423-2200

never initialized or set, but is used as a parameter to other methods

Change-Id: I03602c0a626f70dab7355bea68ab04844cb8080c
Signed-off-by: Steven Spungin <steven@spungin.tv>

1 files changed, 4 insertions, 6 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
index d197c483..5e7703d3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java
@@ -72,12 +72,10 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 
 	private Composite composite;
 	private EMFDataBindingContext context;
-	private IProject project;
-	// This was added for BUG 430921. The member 'project' is
-	// never set, and seems to be always null in this class.
+
 	@Inject
 	@Optional
-	private IProject projectInjected;
+	private IProject project;
 
 	private IListProperty PART__MENUS = EMFProperties.list(BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS);
 	private IListProperty HANDLER_CONTAINER__HANDLERS = EMFProperties.list(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS);
@@ -214,7 +212,7 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 			 */
 			//
 			final IContributionClassCreator c = getEditor().getContributionCreator(org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl.Literals.PART);
-			if (projectInjected != null && c != null) {
+			if (project != null && c != null) {
 				lnk = new Link(parent, SWT.NONE);
 				lnk.setText("<A>" + Messages.PartEditor_ClassURI + "</A>"); //$NON-NLS-1$//$NON-NLS-2$
 				lnk.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
@@ -225,7 +223,7 @@ public class PartDescriptorEditor extends AbstractComponentEditor {
 						MPart dummyPart = MBasicFactory.INSTANCE.createPart();
 						String contributionURI = ((MPartDescriptor) getMaster().getValue()).getContributionURI();
 						dummyPart.setContributionURI(contributionURI);
-						c.createOpen(dummyPart, getEditingDomain(), projectInjected, lnk.getShell());
+						c.createOpen(dummyPart, getEditingDomain(), project, lnk.getShell());
 						((MPartDescriptor) masterFinal.getValue()).setContributionURI(dummyPart.getContributionURI());
 					}
 				});