Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrschnekenbu2012-06-26 13:29:43 +0000
committerrschnekenbu2012-06-26 13:29:43 +0000
commit242f8805d3866084fae9b19409714d7e73b2560e (patch)
treefb073c5bd5f9b32d9847c7f7c5f5150e725182a2 /plugins/sysml
parent5caf4878de831d6817103d951089f6b68eaae730 (diff)
downloadorg.eclipse.papyrus-242f8805d3866084fae9b19409714d7e73b2560e.tar.gz
org.eclipse.papyrus-242f8805d3866084fae9b19409714d7e73b2560e.tar.xz
org.eclipse.papyrus-242f8805d3866084fae9b19409714d7e73b2560e.zip
Apply code formatter on the generated code for IBD
Diffstat (limited to 'plugins/sysml')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java13
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java3
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java7
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java8
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java1
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java1
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java1
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java22
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java14
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java3
14 files changed, 35 insertions, 50 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
index 382b7906fd4..43356b603df 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
@@ -98,7 +98,7 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
}
} else if(owner instanceof Package) {
-
+
try {
canvasDomainElement = null;
@@ -115,13 +115,13 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
canvasDomainElement = block;
diagram = super.createDiagram(diagramResource, (Package)owner, name);
}
-
+
} catch (ExecutionException e) {
e.printStackTrace();
}
-
+
}
-
+
return diagram;
}
@@ -151,7 +151,7 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
// Create a view for the canvasDomainElement in the new diagram
View view = ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
view.setElement(diagram.getElement());
-
+
// Update the view position and size (should adapt to canvas current size)
Bounds viewBounds = (Bounds)((Node)view).getLayoutConstraint();
viewBounds.setX(DEFAULT_MARGIN);
@@ -159,9 +159,10 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
viewBounds.setHeight(DEFAULT_HEIGHT);
viewBounds.setWidth(DEFAULT_WIDTH);
}
-
+
/**
* {@inheritDoc}
+ *
* @generated NOT
*/
@Override
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
index 69fbfcaafe9..355c96a6d76 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
@@ -19,8 +19,9 @@ import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;
import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-/**
+/**
* Customization of the DND edit policy for the Internal Block Diagram
+ *
* @deprecated prefer using {@link CustomDiagramDragDropEditPolicy}.
*/
@Deprecated
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
index 6e5cd1bd330..db8771fa450 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
@@ -32,7 +32,8 @@ public class DiagramPaletteFactory extends PaletteFactory.Adapter {
{
put("internalblock.tool.block", new IElementType[]{ SysMLElementTypes.BLOCK });
- put("internalblock.tool.blockpropertycomposite", new IElementType[]{ SysMLElementTypes.PART_PROPERTY, SysMLElementTypes.REFERENCE_PROPERTY, SysMLElementTypes.ACTOR_PART_PROPERTY, SysMLElementTypes.VALUE_PROPERTY, UMLElementTypes.PROPERTY });
+ put("internalblock.tool.blockpropertycomposite", new IElementType[]{ SysMLElementTypes.PART_PROPERTY, SysMLElementTypes.REFERENCE_PROPERTY, SysMLElementTypes.ACTOR_PART_PROPERTY,
+ SysMLElementTypes.VALUE_PROPERTY, UMLElementTypes.PROPERTY });
put("internalblock.tool.flowport", new IElementType[]{ SysMLElementTypes.FLOW_PORT });
put("internalblock.tool.port", new IElementType[]{ UMLElementTypes.PORT });
//Start of user code Custom nodes
@@ -41,12 +42,12 @@ public class DiagramPaletteFactory extends PaletteFactory.Adapter {
put("internalblock.tool.actorpart", new IElementType[]{ SysMLElementTypes.ACTOR_PART_PROPERTY });
put("internalblock.tool.value", new IElementType[]{ SysMLElementTypes.VALUE_PROPERTY });
put("internalblock.tool.property", new IElementType[]{ UMLElementTypes.PROPERTY });
-
+
put("internalblock.tool.flowport_na", new IElementType[]{ SysMLElementTypes.FLOW_PORT_NA });
put("internalblock.tool.flowport_in", new IElementType[]{ SysMLElementTypes.FLOW_PORT_IN });
put("internalblock.tool.flowport_out", new IElementType[]{ SysMLElementTypes.FLOW_PORT_OUT });
put("internalblock.tool.flowport_inout", new IElementType[]{ SysMLElementTypes.FLOW_PORT_IN_OUT });
-
+
put("internalblock.tool.constraint", new IElementType[]{ UMLElementTypes.CONSTRAINT });
put("internalblock.tool.comment", new IElementType[]{ UMLElementTypes.COMMENT });
//End of user code
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
index d7597b2d7ba..8c8d5167f9b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
@@ -28,7 +28,7 @@ public class InternalBlockDiagramViewFactory extends DiagramViewFactory {
@Override
protected List createStyles(View view) {
//DiagramVersioningUtils.setCompatibilityVersion((Diagram) view, INTERNAL_VERSION);
- return super.createStyles(view);
+ return super.createStyles(view);
}
protected MeasurementUnit getMeasurementUnit() {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
index 14ea4555850..53d889a323a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
@@ -106,13 +106,13 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
*/
public InternalBlockDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
super(servicesRegistry, diagram);
-
+
// Verify diagram compatibility version
verifyDiagramCompatibilityVersion(diagram);
// Fix Port locations (implementations before 0.8.1 were erroneous see https://bugs.eclipse.org/bugs/show_bug.cgi?id=354815)
- (new FixPortsLocationOnOpening()).fix(diagram);
-
+ (new FixPortsLocationOnOpening()).fix(diagram);
+
// adds a listener to the palette service, which reacts to palette customizations
PapyrusPaletteService.getInstance().addProviderChangeListener(this);
@@ -124,7 +124,6 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
setDocumentProvider(documentProvider);
}
-
protected void verifyDiagramCompatibilityVersion(Diagram diagram) {
IDiagramVersionUpdater updater = new DiagramVersionUpdater();
@@ -270,7 +269,6 @@ public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements I
return savedOperation != op;
}
-
/**
* @generated
*/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
index 4a5bc024732..45da4aeed2e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
@@ -41,7 +41,6 @@ public class BlockCompositePreferencePage extends InternalBlockDiagramNodePrefer
compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
// Start of user code custom static initializations
compartmentTitleDefaultVisibilityMap.remove("structure"); //$NON-NLS-1$
compartmentTitleDefaultVisibilityMap.put("structure", Boolean.FALSE); //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
index 6ad312cb4dc..503f11a0a16 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
@@ -21,7 +21,6 @@ public class CommentAnnotatedElementPreferencePage extends InternalBlockDiagramL
/** Constant key to access preferences */
protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"; //$NON-NLS-1$
-
/** Default constructor */
public CommentAnnotatedElementPreferencePage() {
super();
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
index ac5a6a4206b..2bcc6d949e7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
@@ -21,7 +21,6 @@ public class CommentPreferencePage extends InternalBlockDiagramNodePreferencePag
/** Constant key to access preferences */
protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
-
/** Default constructor */
public CommentPreferencePage() {
super();
@@ -40,5 +39,4 @@ public class CommentPreferencePage extends InternalBlockDiagramNodePreferencePag
}
-
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
index 6e723571df6..bcad61f171a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
@@ -21,7 +21,6 @@ public class ConstraintConstrainedElementPreferencePage extends InternalBlockDia
/** Constant key to access preferences */
protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"; //$NON-NLS-1$
-
/** Default constructor */
public ConstraintConstrainedElementPreferencePage() {
super();
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
index c69fd4c2fd9..8df60a963cf 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
@@ -21,7 +21,6 @@ public class ConstraintPreferencePage extends InternalBlockDiagramNodePreference
/** Constant key to access preferences */
protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
-
/** Default constructor */
public ConstraintPreferencePage() {
super();
@@ -40,5 +39,4 @@ public class ConstraintPreferencePage extends InternalBlockDiagramNodePreference
}
-
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
index 04e563903c4..205fd4458ad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
@@ -60,7 +60,7 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
@Override
public String getNodeGraphicalType(EObject domainElement, String containerType) {
// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
- if(((ISpecializationType)SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)
+ if(((ISpecializationType)SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)
@@ -72,16 +72,16 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
return SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID;
}
-
+
return UNDEFINED_TYPE;
}
-
+
if(((ISpecializationType)SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_IN).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_OUT).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_IN_OUT).getMatcher().matches(domainElement)
|| ((ISpecializationType)SysMLElementTypes.FLOW_PORT_NA).getMatcher().matches(domainElement)) {
-
+
if(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
}
@@ -142,11 +142,11 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
*/
public String getNodeGraphicalType(String proposedType, String containerType) {
// Start of user code getNodeGraphicalType(String proposedType, String containerType)
- if(SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)
+ if(SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)
|| SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)
- || SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)
- || SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)
- || UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
+ || SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)
+ || SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)
+ || UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
@@ -154,10 +154,10 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
return SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID;
}
-
+
return UNDEFINED_TYPE;
}
-
+
if(SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)
|| SysMLElementTypes.FLOW_PORT_IN.getSemanticHint().equals(proposedType)
|| SysMLElementTypes.FLOW_PORT_OUT.getSemanticHint().equals(proposedType)
@@ -173,7 +173,7 @@ public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
if(SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
}
-
+
return UNDEFINED_TYPE;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
index ab330cf6be2..f6b89f7e9c4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
@@ -25,14 +25,10 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
/** SysML Internal Block Diagram :: Diagram */
public static final String DIAGRAM_ID = "InternalBlock"; //$NON-NLS-1$
-
-
-
/** ********************************************************* */
/** SysML Internal Block Diagram - CompositeDiagram related elements */
/** ********************************************************* */
-
/** CompositeDiagram :: COMMENT */
public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
@@ -57,12 +53,10 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = "6049"; //$NON-NLS-1$
-
/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
/** CompositeDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
-
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
index e63635cdc8f..4784d28738b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
@@ -48,7 +48,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
// Fill known nodes set (primary nodes)
knownNodes.add(UMLElementTypes.CONSTRAINT.getSemanticHint());
knownNodes.add(UMLElementTypes.COMMENT.getSemanticHint());
-
+
knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
knownNodes.add(ElementTypes.CONSTRAINT.getSemanticHint());
@@ -111,7 +111,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
}
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
- }
+ }
}
if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
@@ -142,7 +142,7 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
* {@inheritDoc}
*/
public String getNodeGraphicalType(String proposedType, String containerType) {
-
+
if((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
@@ -152,11 +152,11 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
return ElementTypes.COMMENT_CN.getSemanticHint();
}
-
+
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
return ElementTypes.COMMENT_CN.getSemanticHint();
}
-
+
return UNDEFINED_TYPE;
}
@@ -168,10 +168,10 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
if(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
return ElementTypes.CONSTRAINT_CN.getSemanticHint();
}
-
+
return UNDEFINED_TYPE;
}
-
+
if(isKnownNodeType(proposedType)) {
return proposedType;
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
index 79af3fef918..2e375b767c7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
@@ -43,7 +43,6 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
return true;
}
-
// Additional test needed here to decide whether to support Feature type links.
// As feature type link are not related to a MetaClass from the domain model
// they are not already handled by previous tests.
@@ -59,8 +58,6 @@ public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvid
return true;
}
-
-
}
return false;
}

Back to the top