375535: Use constant rather than simple boolean as ViewDescriptor persistence parameter

https://bugs.eclipse.org/bugs/show_bug.cgi?id=375535

5 files changed, 15 insertions, 10 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
index 4353185514e..b31c9cd819a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
@@ -56,6 +56,7 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.CommandProxyWithResult;

 import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

 import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

 import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

 import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementBorderEditPart;

@@ -219,7 +220,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEdi
 

 		IAdaptable elementAdapter = new EObjectAdapter(droppedObject);

 

-		ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class, droppedObjectGraphicalType, ViewUtil.APPEND, true, getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class, droppedObjectGraphicalType, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(absoluteLocation);

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
index d261efba84e..03a124084c0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

 import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

@@ -105,7 +106,7 @@ public class BlockDropHelper extends ElementHelper {
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 			

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -154,7 +155,7 @@ public class BlockDropHelper extends ElementHelper {
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 			

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
index b3867c3c673..c548b4284e2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescrip
 import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

 import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

 import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

@@ -49,7 +50,7 @@ public class PartDropHelper extends ElementHelper {
 		}

 					

 		// Prepare the view creation command

-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedEObject, null), Node.class, SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedEObject, null), Node.class, SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -60,7 +61,7 @@ public class PartDropHelper extends ElementHelper {
 	private boolean isValidPart(Object object, EObject dropTarget) {

 		boolean isValid = false;

 		

-		// The drop object is supposed to be a Port (or FlowPort)

+		// The drop object is supposed to be a Property

 		if ((object != null) && (object instanceof Property) && !(object instanceof Port)) {

 			

 			// The dropTarget has to be a TypedElement with a non-null Type

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
index b1cc80eb72d..1ee0326d323 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
@@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

@@ -69,7 +70,7 @@ public class PortDropHelper extends ElementHelper {
 		}

 					

 		// Prepare the view creation command

-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedPort, null), Node.class, graphicalType, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject)droppedPort, null), Node.class, graphicalType, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(location);		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
index 09e43304eee..1837198240c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

 import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

@@ -107,7 +108,7 @@ public class TypeDropHelper extends ElementHelper {
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 			

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -152,7 +153,7 @@ public class TypeDropHelper extends ElementHelper {
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 			

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -185,7 +186,7 @@ public class TypeDropHelper extends ElementHelper {
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 			

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);

@@ -230,7 +231,7 @@ public class TypeDropHelper extends ElementHelper {
 		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

 			

 		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, ViewUtil.APPEND, true, host.getDiagramPreferencesHint());

+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

 		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

 		createViewRequest.setLocation(request.getLocation().getCopy());		

 		Command viewCreateCommand = host.getCommand(createViewRequest);