Stabilize swtbot UI tests.

Change-Id: Idc922b06b7b1177801bc20d6dd93bc35577dd1df

6 files changed, 17 insertions, 17 deletions

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java
index c3b3c1942a..0191f39bfa 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteJPAEntityFeature.java
@@ -72,7 +72,7 @@ public class DeleteJPAEntityFeature extends DefaultDeleteFeature {
 			String name = jpt.getName();
 			
 			
-			JpaArtifactFactory.instance().forceSaveEntityClass(jpt, getFeatureProvider());
+//			JpaArtifactFactory.instance().forceSaveEntityClass(jpt, getFeatureProvider());
 			JpaArtifactFactory.instance().deleteEntityClass(jpt, getFeatureProvider());
 			if (! JpaPreferences.getDiscoverAnnotatedClasses(jpt.getJpaProject().getProject())) {
 				JPAEditorUtil.createUnregisterEntityFromXMLJob(jpaProject, name);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityFeature.java
index 9fbf3ca1e5..05bdda4765 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/MoveEntityFeature.java
@@ -17,7 +17,6 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.feature;
 
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.internal.ui.refactoring.reorg.ReorgMoveAction;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages;
 import org.eclipse.ui.IEditorPart;
@@ -31,10 +30,9 @@ public class MoveEntityFeature extends RefactorEntityFeature {
 	}
 	
 	public void execute(ICustomContext context) {
-		ICompilationUnit cu = getFeatureProvider().getCompilationUnit(jpt);
 		IWorkbenchSite ws = ((IEditorPart)getDiagramEditor()).getSite();
 		ReorgMoveAction action = new ReorgMoveAction(ws);
-		execute(context, action, cu);
+		execute(context, action);
 	}
 	
 	
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java
index efdf9abf8b..cda63d292e 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java
@@ -70,7 +70,6 @@ import org.eclipse.swt.widgets.Display;
 
 public abstract class RefactorEntityFeature extends AbstractCustomFeature {
 
-	protected JavaPersistentType jpt = null;
 	protected Set<JavaPersistentAttribute> ats = null;
 	protected boolean hasNameAnnotation = false;
 
@@ -86,7 +85,8 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature {
     	PictogramElement pe = ctx.getInnerPictogramElement();
     	Object bo = getFeatureProvider().getBusinessObjectForPictogramElement(pe);
     	if (bo instanceof JavaPersistentType) {
-    		jpt = (JavaPersistentType)bo;
+    		JavaPersistentType jpt = (JavaPersistentType)bo;
+    		ats = JpaArtifactFactory.instance().getRelatedAttributes(jpt);
     		hasNameAnnotation = JpaArtifactFactory.instance().hasNameAnnotation(jpt);
     		return true;
     	}
@@ -96,7 +96,8 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature {
     			return false;
      		bo = getFeatureProvider().getBusinessObjectForPictogramElement(cs);
         	if (bo instanceof JavaPersistentType) {
-        		jpt = (JavaPersistentType)bo;
+        		JavaPersistentType jpt = (JavaPersistentType)bo;
+        		ats = JpaArtifactFactory.instance().getRelatedAttributes(jpt);
         		hasNameAnnotation = JpaArtifactFactory.instance().hasNameAnnotation(jpt);
         		return true;
         	}
@@ -109,11 +110,15 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature {
 		return true;
 	}
 	
-	public void execute(ICustomContext context, SelectionDispatchAction action, ICompilationUnit cu) {
-		StructuredSelection sel = new StructuredSelection(cu);
-		final Shape pict = (Shape)getFeatureProvider().getPictogramElementForBusinessObject(jpt);
+	public void execute(ICustomContext context, SelectionDispatchAction action) {
+		final Shape pict = (Shape)context.getInnerPictogramElement();
+		
 		JavaPersistentType jpt = (JavaPersistentType)getFeatureProvider().
 									getBusinessObjectForPictogramElement(pict);
+		ICompilationUnit cu = getFeatureProvider().getCompilationUnit(jpt);
+
+		StructuredSelection sel = new StructuredSelection(cu);
+
 		final JPAEditorConstants.DIAGRAM_OBJECT_TYPE dot = JpaArtifactFactory.instance().determineDiagramObjectType(jpt);
 		final PersistenceUnit pu = JpaArtifactFactory.instance().getPersistenceUnit(jpt);
 		final Semaphore s = new Semaphore(0);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RenameEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RenameEntityFeature.java
index 1258cfa79d..d87083060e 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RenameEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RenameEntityFeature.java
@@ -17,10 +17,8 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.feature;
 
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.ui.actions.RenameAction;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages;
-import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchSite;
 
@@ -33,11 +31,9 @@ public class RenameEntityFeature extends RefactorEntityFeature {
 	}
 
 	public void execute(ICustomContext context) {
-		ICompilationUnit cu = getFeatureProvider().getCompilationUnit(jpt);
 		IWorkbenchSite ws = ((IEditorPart)getDiagramEditor()).getSite();
 		RenameAction action = new RenameAction(ws);
-		ats = JpaArtifactFactory.instance().getRelatedAttributes(jpt);
-		execute(context, action, cu);		
+		execute(context, action);		
 	}
 	
 	@Override
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
index 3305b5b465..1835a0ff65 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
@@ -137,7 +137,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate {
 
 
 	private static final String ERROR_OPENING_DIAGRAM = JPAEditorMessages.OpenJpaDiagramActionDelegate_openJPADiagramErrorMsg;
-	private JpaProject jpaProject;
+//	private JpaProject jpaProject;
 	private Shell shell;
 	private WeakReference<ISelection> selectionRef = new WeakReference<ISelection>(null); 
 	
@@ -175,6 +175,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate {
 	}
 
 	protected PersistenceUnit obtainJpaProjectAndPersistenceUnit(ISelection selection) throws CoreException {
+		JpaProject jpaProject = null;
 		Object firstElement = ((IStructuredSelection) selection).getFirstElement();
 		if(firstElement instanceof JpaRootContextNodeModel){
 			jpaProject = JpaArtifactFactory.instance().getJpaProject(((JpaRootContextNodeModel)firstElement).getProject());
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java
index 1c3d6bc2df..999a80e1a2 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java
@@ -775,7 +775,7 @@ public class JpaArtifactFactory {
 	 * @param fp
 	 * @return an unique attribute name.
 	 */
-	private String genUniqueAttrName(JavaPersistentType jpt, 
+	public String genUniqueAttrName(JavaPersistentType jpt, 
 			String attrTypeName, IJPAEditorFeatureProvider fp) {
 		
 		ICompilationUnit ijl = fp.getCompilationUnit(jpt);