[Quality] Patch some code smell
- use SonarLint
- add @Override for interface
- use <> constructor
- remove unused = null affectation
Change-Id: I76059f8f33282681f88dfb062df70c0f3c99518b
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformCreationEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformCreationEditHelperAdvice.java
index daf4854..056ee1d 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformCreationEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformCreationEditHelperAdvice.java
@@ -62,15 +62,14 @@
IElementType elementType=createRelationshipRequest.getElementType();
if (elementType instanceof ISpecializationType){
- ArrayList<IElementType> elementTypesHierarchy= new ArrayList<IElementType>();
+ ArrayList<IElementType> elementTypesHierarchy= new ArrayList<>();
elementTypesHierarchy.add(elementType);
ISpecializationType iSpecializationType=(ISpecializationType)elementType;
elementTypesHierarchy.addAll(Arrays.asList(iSpecializationType.getAllSuperTypes()));
if(!(elementTypesHierarchy.contains(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONFORM)))){
return super.approveRequest(request);
- }
- {//This is a conform Element
+ } else {//This is a conform Element
//test source
if (!(createRelationshipRequest.getSource() instanceof Classifier)){
return false;
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorReorientEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorReorientEditHelperAdvice.java
index bd758ca..895767d 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorReorientEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorReorientEditHelperAdvice.java
@@ -84,7 +84,7 @@
if (reorientedEdgeView != null) {
oppositeEndView = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();
}
- List<Property> newNestedPath = null;
+ List<Property> newNestedPath;
if (reorientedEdgeView != null && newEndView != null) {
// we are working with a 'graphical' reconnect request
newNestedPath = utils.getNestedPropertyPath(newEndView, oppositeEndView);
@@ -148,10 +148,10 @@
// Restrict action to SysML Connector (meaning owned by Block)
if (((ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_BLOCK)).getMatcher().matches(connector.eContainer())) {
- List<Property> newFullNestedPath = new ArrayList<Property>();
+ List<Property> newFullNestedPath = new ArrayList<>();
Edge reorientedEdgeView = RequestParameterUtils.getReconnectedEdge(request);
View newEndView = RequestParameterUtils.getReconnectedEndView(request);
- View oppositeEndView = null;
+ View oppositeEndView;
// graphical case : verify encapsulation and get the new path
if (reorientedEdgeView != null) {
@@ -166,7 +166,7 @@
}
} else {
// we are in the semantic case
- newFullNestedPath = ((List<Property>) request.getParameter(UMLConnectorUtils.NESTED_CONNECTOR_END_PATH));
+ newFullNestedPath = (List<Property>) request.getParameter(UMLConnectorUtils.NESTED_CONNECTOR_END_PATH);
// we need to verify encapsulation
if (ConnectorUtil.isCrossingEncapuslation(newFullNestedPath)) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConstraintCreationEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConstraintCreationEditHelperAdvice.java
index 5aaf113..67c0704 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConstraintCreationEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConstraintCreationEditHelperAdvice.java
@@ -40,8 +40,8 @@
public void configureRequest(IEditCommandRequest request) {
if (request instanceof CreateElementRequest) {
// check the element to create is a sub kind of UML Constraint
- CreateElementRequest createElementRequest = ((CreateElementRequest) request);
- if ((Arrays.asList(createElementRequest.getElementType().getAllSuperTypes()).contains(UMLElementTypes.CONSTRAINT))) {
+ CreateElementRequest createElementRequest = (CreateElementRequest) request;
+ if (Arrays.asList(createElementRequest.getElementType().getAllSuperTypes()).contains(UMLElementTypes.CONSTRAINT)) {
// check the container as Constraint Block property
if (((ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINTPROPERTY)).getMatcher().matches(createElementRequest.getContainer())) {
if (((CreateElementRequest) request).getContainer() instanceof Property) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/DirectedRelationshipPropertyPathEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/DirectedRelationshipPropertyPathEditHelperAdvice.java
index d326fa7..432ed10 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/DirectedRelationshipPropertyPathEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/DirectedRelationshipPropertyPathEditHelperAdvice.java
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
@@ -67,7 +68,7 @@
View targetView = RequestParameterUtils.getTargetView(request);
if (request.getElementType() instanceof ISpecializationType) {
// get all specializations from elementTypes
- ArrayList<IElementType> elementTypesHierarchy = new ArrayList<IElementType>();
+ List<IElementType> elementTypesHierarchy = new ArrayList<>();
elementTypesHierarchy.add(request.getElementType());
ISpecializationType iSpecializationType = (ISpecializationType) request.getElementType();
elementTypesHierarchy.addAll(Arrays.asList(iSpecializationType.getAllSuperTypes()));
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PartCreationEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PartCreationEditHelperAdvice.java
index acc4878..6c93529 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PartCreationEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PartCreationEditHelperAdvice.java
@@ -53,13 +53,13 @@
IElementType elementType=request.getTypeToConfigure();
if (elementType instanceof ISpecializationType){
- ArrayList<IElementType> elementTypesHierarchy= new ArrayList<IElementType>();
+ ArrayList<IElementType> elementTypesHierarchy= new ArrayList<>();
elementTypesHierarchy.add(elementType);
ISpecializationType iSpecializationType=(ISpecializationType)elementType;
elementTypesHierarchy.addAll(Arrays.asList(iSpecializationType.getAllSuperTypes()));
//this is part
- if((elementTypesHierarchy.contains(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_PART)))){
+ if(elementTypesHierarchy.contains(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_PART))){
return new CreateAssociationCommand( request, AggregationKind.COMPOSITE_LITERAL);
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PrivatePackageImportEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PrivatePackageImportEditHelperAdvice.java
index 8a8e879..94b540c 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PrivatePackageImportEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/PrivatePackageImportEditHelperAdvice.java
@@ -27,7 +27,7 @@
/**
* The helperadvice class used for PrivatePackageImport
- *
+ * @deprecated
*/
@Deprecated // Unused (now model based) see Bug 483804
public class PrivatePackageImportEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReferenceCreationEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReferenceCreationEditHelperAdvice.java
index c80d143..5c11203 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReferenceCreationEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReferenceCreationEditHelperAdvice.java
@@ -52,13 +52,13 @@
IElementType elementType = request.getTypeToConfigure();
if (elementType instanceof ISpecializationType) {
- ArrayList<IElementType> elementTypesHierarchy = new ArrayList<IElementType>();
+ ArrayList<IElementType> elementTypesHierarchy = new ArrayList<>();
elementTypesHierarchy.add(elementType);
ISpecializationType iSpecializationType = (ISpecializationType) elementType;
elementTypesHierarchy.addAll(Arrays.asList(iSpecializationType.getAllSuperTypes()));
// this is a reference
- if ((elementTypesHierarchy.contains(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_REFERENCE)))) {
+ if (elementTypesHierarchy.contains(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_REFERENCE))) {
return new CreateAssociationCommand(request, AggregationKind.SHARED_LITERAL);
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReorientDirectedRelationshipPPEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReorientDirectedRelationshipPPEditHelperAdvice.java
index e488c66..2217c57 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReorientDirectedRelationshipPPEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ReorientDirectedRelationshipPPEditHelperAdvice.java
@@ -60,20 +60,12 @@
@Override
protected ICommand getAfterReorientRelationshipCommand(ReorientRelationshipRequest request) {
ICommand defaultCommand = super.getAfterReorientRelationshipCommand(request);
-
-
int reorientDirection = request.getDirection();
View newEndView = RequestParameterUtils.getReconnectedEndView(request);
if ((((ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_ALLOCATE_ABSTRACTION)).getMatcher().matches(request.getRelationship())) ||
(((ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_REFINE_ABSTRACTION)).getMatcher().matches(request.getRelationship())) ||
(((ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_TRACE_ABSTRACTION)).getMatcher().matches(request.getRelationship()))) {
- boolean isSource = true;
- if (ReorientRequest.REORIENT_SOURCE == reorientDirection) {
- isSource = true;
- } else {
- isSource = false;
- }
-
+ boolean isSource = ReorientRequest.REORIENT_SOURCE == reorientDirection;
if (newEndView.getElement() instanceof Property) {
SetDirectedRelationshipPropertyPathCommand setPropertyPathCommand = new SetDirectedRelationshipPropertyPathCommand(request.getEditingDomain(), newEndView, isSource);
EMFToIEditCommandWrapper editCommandWrapper = new EMFToReorientRelationshipEditCommandWrapper(request.getRelationship(), request, setPropertyPathCommand);
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/SetEncapsulatedEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/SetEncapsulatedEditHelperAdvice.java
index b13c948..d3f2d06 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/SetEncapsulatedEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/SetEncapsulatedEditHelperAdvice.java
@@ -69,7 +69,7 @@
@Override
protected ICommand getBeforeSetCommand(SetRequest request) {
ICommand setCommand = super.getBeforeSetCommand(request);
- Set<Connector> connectorToDelete = new HashSet<Connector>();
+ Set<Connector> connectorToDelete = new HashSet<>();
EObject elementToEdit = request.getElementToEdit();
if ((elementToEdit instanceof Block) && (request.getFeature() == BlocksPackage.eINSTANCE.getBlock_IsEncapsulated())) {
@@ -115,7 +115,7 @@
EReference[] eRefs = new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() };
Collection<?> references = EMFCoreUtil.getReferencers(block.getBase_Class(), eRefs);
- List<Property> propertyReferences = new LinkedList<Property>();
+ List<Property> propertyReferences = new LinkedList<>();
for (Object reference : references) {
if (reference instanceof Property) {
propertyReferences.add((Property) reference);
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/SetNestedPathCommand.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/SetNestedPathCommand.java
index 2cbea1a..1925b61 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/SetNestedPathCommand.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/SetNestedPathCommand.java
@@ -112,17 +112,13 @@
return false;
}
- // if (!(getElementToEdit() instanceof Connector)) {
- // return false;
- // }
-
// Verify (basic) that the related Connector well-formed.
// In case of Connector creation, the connector is most probably not created yet
if ((getConnector() != null) && (getConnector().getEnds().size() != 2)) {
return false; // binary connector expected.
}
- return super.canExecute();// true;
+ return super.canExecute();
}
@Override
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ActorPartPropertyMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ActorPartPropertyMatcher.java
index 2a9100e..cafb79a 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ActorPartPropertyMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ActorPartPropertyMatcher.java
@@ -28,13 +28,11 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean matches(EObject eObject) {
-
boolean isMatch = false;
if ((eObject instanceof Property) && !(eObject instanceof Port)) {
-
Property element = (Property) eObject;
-
// The property is necessary a composition and has a type
if ((element.getType() != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {
// Moreover its type has to be a Actor
@@ -43,5 +41,4 @@
}
return isMatch;
}
-
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ConstraintPropertyMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ConstraintPropertyMatcher.java
index fa18827..cda4e9a 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ConstraintPropertyMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ConstraintPropertyMatcher.java
@@ -25,6 +25,13 @@
*/
public class ConstraintPropertyMatcher implements IElementMatcher {
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)
+ *
+ * @param eObject
+ * @return
+ */
+ @Override
public boolean matches(EObject eObject) {
if (eObject instanceof Property) {
Property property = (Property) eObject;
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInMatcher.java
index 80c86e1..1a3a19d 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInMatcher.java
@@ -32,6 +32,7 @@
* @param eObject
* @return
*/
+ @Override
public boolean matches(EObject eObject) {
boolean isFlowPortIn = false;
if (eObject instanceof Port) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInOutMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInOutMatcher.java
index 74ecef2..8d4d81f 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInOutMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortInOutMatcher.java
@@ -32,6 +32,7 @@
* @param eObject
* @return
*/
+ @Override
public boolean matches(EObject eObject) {
boolean isFlowPortInOut = false;
if (eObject instanceof Port) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortNAMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortNAMatcher.java
index cc33e56..588f3fa 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortNAMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortNAMatcher.java
@@ -20,20 +20,22 @@
*/
public class FlowPortNAMatcher implements IElementMatcher {
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)
+ *
+ * @param eObject
+ * @return
+ */
+ @Override
public boolean matches(EObject eObject) {
-
boolean isFlowPortNa = false;
-
if (eObject instanceof Port) {
-
Port port = (Port) eObject;
FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-
if ((flowPort != null) && (!flowPort.isAtomic())) {
isFlowPortNa = true;
}
}
-
return isFlowPortNa;
}
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortOutMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortOutMatcher.java
index 5350d38..4d94923 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortOutMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/FlowPortOutMatcher.java
@@ -32,6 +32,7 @@
* @param eObject
* @return
*/
+ @Override
public boolean matches(EObject eObject) {
boolean isFlowPortOut = false;
if (eObject instanceof Port) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/PartPropertyMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/PartPropertyMatcher.java
index af3d6c5..80bd487 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/PartPropertyMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/PartPropertyMatcher.java
@@ -27,6 +27,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean matches(EObject eObject) {
boolean isMatch = false;
if ((eObject instanceof Property) && !(eObject instanceof Port)) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ReferencePropertyMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ReferencePropertyMatcher.java
index e709c2f..7ee60ff 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ReferencePropertyMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ReferencePropertyMatcher.java
@@ -27,6 +27,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean matches(EObject eObject) {
boolean isMatch = false;
if ((eObject instanceof Property) && !(eObject instanceof Port)) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/internal/SysML14ProfileMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/internal/SysML14ProfileMatcher.java
index d1085fe..3a4f616 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/internal/SysML14ProfileMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/internal/SysML14ProfileMatcher.java
@@ -44,7 +44,7 @@
EList<Profile> allAppliedProfiles = model.getAllAppliedProfiles();
if (allAppliedProfiles!=null){
- List<String> appliedProfileByUri = new ArrayList<String>();
+ List<String> appliedProfileByUri = new ArrayList<>();
for (Profile appliedProfile : allAppliedProfiles) {
appliedProfileByUri.add(appliedProfile.getURI());
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/ConnectorUtil.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/ConnectorUtil.java
index 4c37150..7136508 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/ConnectorUtil.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/ConnectorUtil.java
@@ -229,7 +229,7 @@
* @return connectors that have this property in their <NestedConnectorEnd> property path.
*/
public static List<Connector> filterConnectorByPropertyInNestedConnectorEnd(List<Connector> connectors, Property part) {
- List<Connector> res = new ArrayList<Connector>();
+ List<Connector> res = new ArrayList<>();
for (Connector connector : connectors) {
EList<ConnectorEnd> ends = connector.getEnds();
for (ConnectorEnd connectorEnd : ends) {
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/PropertyPathUtil.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/PropertyPathUtil.java
index b4444b7..7870b83 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/PropertyPathUtil.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/PropertyPathUtil.java
@@ -59,7 +59,7 @@
* @return a list of properties defined by hierarchy of view, maybe an empty list
*/
public static List<Property> getPropertyListFromView(View view) {
- ArrayList<Property> propertiesList = new ArrayList<Property>();
+ List<Property> propertiesList = new ArrayList<>();
View currentView = view;
while (currentView != null) {
if (currentView instanceof Shape && currentView.getElement() instanceof Property) {
@@ -85,7 +85,7 @@
public static List<Property> getPropertyPath(View sourceView) {
List<Property> propertyList = getPropertyListFromView(sourceView);
// remove the first property
- if (propertyList.size() != 0) {
+ if (!propertyList.isEmpty()) {
propertyList.remove(0);
Collections.reverse(propertyList);
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/SysMLServiceTypeUtil.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/SysMLServiceTypeUtil.java
index 31b76e8..a022b33 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/SysMLServiceTypeUtil.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/SysMLServiceTypeUtil.java
@@ -18,9 +18,6 @@
*
*/
public final class SysMLServiceTypeUtil {
-
- private SysMLServiceTypeUtil(){
- }
public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_VALUETYPE= "org.eclipse.papyrus.SysML14.ValueType"; //$NON-NLS-1$
@@ -179,5 +176,6 @@
public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_ACTORPART= "org.eclipse.papyrus.SysML14.ActorPart"; //$NON-NLS-1$
-
+ private SysMLServiceTypeUtil(){
+ }
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/UMLConnectorUtils.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/UMLConnectorUtils.java
index cd71810..f39b340 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/UMLConnectorUtils.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/util/UMLConnectorUtils.java
@@ -60,7 +60,7 @@
* @return the list of crossed structure views.
*/
public List<View> getNestedPath(View checkedEnd, View oppositeEnd) {
- List<View> isNestedConnectableElement = new ArrayList<View>();
+ List<View> isNestedConnectableElement = new ArrayList<>();
View nearestContainer = new UMLConnectorUtils().getNearestStructureContainer(checkedEnd);
if (nearestContainer != null) {
@@ -88,7 +88,7 @@
* @return the list of crossed structure views.
*/
public List<Property> getNestedPropertyPath(View checkedEnd, View oppositeEnd) {
- List<Property> nestedPropertyPath = new ArrayList<Property>();
+ List<Property> nestedPropertyPath = new ArrayList<>();
List<View> nestedPath = getNestedPath(checkedEnd, oppositeEnd);
for (View view : nestedPath) {
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/internal/utils/DiagnosticUtil.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/internal/utils/DiagnosticUtil.java
index 02e5361..ac22a58 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/internal/utils/DiagnosticUtil.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/internal/utils/DiagnosticUtil.java
@@ -34,7 +34,7 @@
* @return
*/
public static List<Diagnostic> findDiagnosticBySource(Diagnostic diagnostic, String source) {
- List<Diagnostic> foundDiagnostic = new ArrayList<Diagnostic>();
+ List<Diagnostic> foundDiagnostic = new ArrayList<>();
List<Diagnostic> children = diagnostic.getChildren();
if (source.equals(diagnostic.getSource())) {
foundDiagnostic.add(diagnostic);
@@ -54,7 +54,7 @@
* @return
*/
public static List<Diagnostic> filterDiagnosticsByElement(List<Diagnostic> diagnostics, Element element) {
- List<Diagnostic> filteredDiagnostics = new ArrayList<Diagnostic>();
+ List<Diagnostic> filteredDiagnostics = new ArrayList<>();
for (Diagnostic diagnostic : diagnostics) {
List<?> datas = diagnostic.getData();
if (datas != null && !datas.isEmpty()) {
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AcceptChangeStructuralFeatureEventActionSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AcceptChangeStructuralFeatureEventActionSelector.java
index e180d79..e3b3320 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AcceptChangeStructuralFeatureEventActionSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AcceptChangeStructuralFeatureEventActionSelector.java
@@ -17,6 +17,7 @@
public class AcceptChangeStructuralFeatureEventActionSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof AcceptChangeStructuralFeatureEventAction;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AllocateActivityPartitionSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AllocateActivityPartitionSelector.java
index dae6de6..04b047f 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AllocateActivityPartitionSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AllocateActivityPartitionSelector.java
@@ -17,6 +17,7 @@
public class AllocateActivityPartitionSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof AllocateActivityPartition;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AssociationSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AssociationSelector.java
index fb7b6ab..7c9da61 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AssociationSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/AssociationSelector.java
@@ -17,6 +17,7 @@
public class AssociationSelector implements IClientSelector {
+ @Override
public boolean selects(Object object) {
return object instanceof Association;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BindingConnectorSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BindingConnectorSelector.java
index b262a46..469cc2d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BindingConnectorSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BindingConnectorSelector.java
@@ -17,6 +17,7 @@
public class BindingConnectorSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof BindingConnector;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BlockSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BlockSelector.java
index 9c449f8..7c58476 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BlockSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BlockSelector.java
@@ -17,6 +17,7 @@
public class BlockSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Block;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BoundReferenceSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BoundReferenceSelector.java
index 00a0314..4c9c3aa 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BoundReferenceSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/BoundReferenceSelector.java
@@ -17,6 +17,7 @@
public class BoundReferenceSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof BoundReference;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ChangeStructuralFeatureEventSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ChangeStructuralFeatureEventSelector.java
index 8b1955a..c5cbb89 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ChangeStructuralFeatureEventSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ChangeStructuralFeatureEventSelector.java
@@ -17,6 +17,7 @@
public class ChangeStructuralFeatureEventSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ChangeStructuralFeatureEvent;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ClassifierBehaviorPropertySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ClassifierBehaviorPropertySelector.java
index 33902fa..80657a1 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ClassifierBehaviorPropertySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ClassifierBehaviorPropertySelector.java
@@ -17,6 +17,7 @@
public class ClassifierBehaviorPropertySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ClassifierBehaviorProperty;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConformSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConformSelector.java
index fea2d0d..b648693 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConformSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConformSelector.java
@@ -17,6 +17,7 @@
public class ConformSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Conform;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConnectorPropertySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConnectorPropertySelector.java
index 0f76d85..bdf1557 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConnectorPropertySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ConnectorPropertySelector.java
@@ -17,6 +17,7 @@
public class ConnectorPropertySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ConnectorProperty;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/CopySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/CopySelector.java
index e06bc42..cd290a2 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/CopySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/CopySelector.java
@@ -17,6 +17,7 @@
public class CopySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Copy;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DeriveReqtSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DeriveReqtSelector.java
index c020fbd..4c13126 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DeriveReqtSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DeriveReqtSelector.java
@@ -17,6 +17,7 @@
public class DeriveReqtSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof DeriveReqt;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedFeatureSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedFeatureSelector.java
index b4fdced..efaf0b3 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedFeatureSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedFeatureSelector.java
@@ -17,6 +17,7 @@
public class DirectedFeatureSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof DirectedFeature;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedRelationshipPropertyPathSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedRelationshipPropertyPathSelector.java
index 2a85d12..06cc360 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedRelationshipPropertyPathSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DirectedRelationshipPropertyPathSelector.java
@@ -17,6 +17,7 @@
public class DirectedRelationshipPropertyPathSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof DirectedRelationshipPropertyPath;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DiscreteSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DiscreteSelector.java
index 481b276..82e4a40 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DiscreteSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DiscreteSelector.java
@@ -17,6 +17,7 @@
public class DiscreteSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Discrete;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DistributedPropertySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DistributedPropertySelector.java
index 43087c6..1ccf598 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DistributedPropertySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/DistributedPropertySelector.java
@@ -17,6 +17,7 @@
public class DistributedPropertySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof DistributedProperty;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ElementPropertyPathSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ElementPropertyPathSelector.java
index 2cb273e..aead930 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ElementPropertyPathSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ElementPropertyPathSelector.java
@@ -17,6 +17,7 @@
public class ElementPropertyPathSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ElementPropertyPath;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/EndPathMultiplicitySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/EndPathMultiplicitySelector.java
index 672e3af..772e635 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/EndPathMultiplicitySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/EndPathMultiplicitySelector.java
@@ -17,6 +17,7 @@
public class EndPathMultiplicitySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof EndPathMultiplicity;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ExposeSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ExposeSelector.java
index 1ff635d..8d9b073 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ExposeSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ExposeSelector.java
@@ -17,6 +17,7 @@
public class ExposeSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Expose;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FlowPropertySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FlowPropertySelector.java
index 69532ee..eb1514b 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FlowPropertySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FlowPropertySelector.java
@@ -17,6 +17,7 @@
public class FlowPropertySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof FlowProperty;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FullPortSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FullPortSelector.java
index 30c59fd..1bd30f3 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FullPortSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/FullPortSelector.java
@@ -17,6 +17,7 @@
public class FullPortSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof FullPort;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InterfaceBlockSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InterfaceBlockSelector.java
index 73d789c..70cad83 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InterfaceBlockSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InterfaceBlockSelector.java
@@ -17,6 +17,7 @@
public class InterfaceBlockSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof InterfaceBlock;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InvocationOnNestedPortActionSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InvocationOnNestedPortActionSelector.java
index 8bb8087..03ee80d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InvocationOnNestedPortActionSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/InvocationOnNestedPortActionSelector.java
@@ -17,6 +17,7 @@
public class InvocationOnNestedPortActionSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof InvocationOnNestedPortAction;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ItemFlowSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ItemFlowSelector.java
index 18b8c25..fa7ed02 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ItemFlowSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ItemFlowSelector.java
@@ -17,6 +17,7 @@
public class ItemFlowSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ItemFlow;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NestedConnectorEndSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NestedConnectorEndSelector.java
index 2e8acb8..ab681de 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NestedConnectorEndSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NestedConnectorEndSelector.java
@@ -17,6 +17,7 @@
public class NestedConnectorEndSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof NestedConnectorEnd;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NoBufferSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NoBufferSelector.java
index cb46269..85b229d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NoBufferSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/NoBufferSelector.java
@@ -17,6 +17,7 @@
public class NoBufferSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof NoBuffer;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OptionalSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OptionalSelector.java
index c385a1c..f42f692 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OptionalSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OptionalSelector.java
@@ -17,6 +17,7 @@
public class OptionalSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Optional;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OverwriteSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OverwriteSelector.java
index 1cdbf16..622311a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OverwriteSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/OverwriteSelector.java
@@ -17,6 +17,7 @@
public class OverwriteSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Overwrite;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ParticipantPropertySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ParticipantPropertySelector.java
index a5e3f36..eb2c657 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ParticipantPropertySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ParticipantPropertySelector.java
@@ -17,6 +17,7 @@
public class ParticipantPropertySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ParticipantProperty;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProbabilitySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProbabilitySelector.java
index 3d3dbed..0498404 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProbabilitySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProbabilitySelector.java
@@ -17,6 +17,7 @@
public class ProbabilitySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Probability;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/PropertySpecificTypeSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/PropertySpecificTypeSelector.java
index d612119..d502d07 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/PropertySpecificTypeSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/PropertySpecificTypeSelector.java
@@ -17,6 +17,7 @@
public class PropertySpecificTypeSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof PropertySpecificType;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProxyPortSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProxyPortSelector.java
index b4b3437..a328592 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProxyPortSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ProxyPortSelector.java
@@ -17,6 +17,7 @@
public class ProxyPortSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ProxyPort;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RateSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RateSelector.java
index db48237..9ea6b29 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RateSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RateSelector.java
@@ -17,6 +17,7 @@
public class RateSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Rate;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RefineSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RefineSelector.java
index 64e8df2..11cfd4c 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RefineSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RefineSelector.java
@@ -17,6 +17,7 @@
public class RefineSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Refine;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RequirementSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RequirementSelector.java
index 690bb5c..c86e782 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RequirementSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/RequirementSelector.java
@@ -17,6 +17,7 @@
public class RequirementSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Requirement;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/SatisfySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/SatisfySelector.java
index 3430154..4f60e8d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/SatisfySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/SatisfySelector.java
@@ -17,6 +17,7 @@
public class SatisfySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Satisfy;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TestCaseSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TestCaseSelector.java
index 77307c6..59630da 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TestCaseSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TestCaseSelector.java
@@ -17,6 +17,7 @@
public class TestCaseSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof TestCase;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TraceSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TraceSelector.java
index 47ccdc1..e4a6f0a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TraceSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TraceSelector.java
@@ -16,7 +16,8 @@
import org.eclipse.papyrus.sysml14.requirements.Trace;
public class TraceSelector implements IClientSelector {
-
+
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Trace;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TriggerOnNestedPortSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TriggerOnNestedPortSelector.java
index 2e15f67..c953490 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TriggerOnNestedPortSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/TriggerOnNestedPortSelector.java
@@ -17,6 +17,7 @@
public class TriggerOnNestedPortSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof TriggerOnNestedPort;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ValueTypeSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ValueTypeSelector.java
index 69ef64b..67c487d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ValueTypeSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ValueTypeSelector.java
@@ -17,6 +17,7 @@
public class ValueTypeSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof ValueType;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/VerifySelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/VerifySelector.java
index 91fba89..f00cbb2 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/VerifySelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/VerifySelector.java
@@ -17,6 +17,7 @@
public class VerifySelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Verify;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewSelector.java
index 91e5583..fd12ab8 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewSelector.java
@@ -17,6 +17,7 @@
public class ViewSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof View;
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewpointSelector.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewpointSelector.java
index 9e45de8..805b3ab 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewpointSelector.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/selectors/ViewpointSelector.java
@@ -17,6 +17,7 @@
public class ViewpointSelector implements IClientSelector {
+ @Override
public boolean selects(Object stereoApplicationObj) {
return stereoApplicationObj instanceof Viewpoint;
}
diff --git a/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/QUDVUtil.java b/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/QUDVUtil.java
index da49530..95018a7 100644
--- a/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/QUDVUtil.java
+++ b/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/QUDVUtil.java
@@ -28,19 +28,15 @@
*/
public final class QUDVUtil {
- /**
- * Avoid instantiation for utility class
- *
- */
- private QUDVUtil() {
- }
-
public static final String UNIT_AND_QUANTITY_KIND = "UnitAndQuantityKind"; //$NON-NLS-1$
public static final String QUANTITY_KIND = "QuantityKind"; //$NON-NLS-1$
public static final String UNIT = "Unit"; //$NON-NLS-1$
+ /** Avoid instantiation for utility class */
+ private QUDVUtil() {
+ }
/**
* Return the classifier in QUDV from the namspace
* Ex : getClassifierByNameSpaceFromQUDV("UnitAndQuantityKind","Unit") to get Unit Classifier
diff --git a/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysMLResource.java b/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysMLResource.java
index dd7d072..4ae5edd 100644
--- a/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysMLResource.java
+++ b/core/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysMLResource.java
@@ -30,9 +30,7 @@
*/
public final class SysMLResource {
- private SysMLResource(){
- }
public static final String PROFILES_PATHMAP = "pathmap://SysML14_PROFILES/"; //$NON-NLS-1$
@@ -52,6 +50,9 @@
private static final String UNNAMED = "unnamed"; //$NON-NLS-1$
+ private SysMLResource(){
+ }
+
/**
* Creates a model with SysML profile applied
*
@@ -106,7 +107,7 @@
* @return a package, a model or null
*/
public static Package getFirstMatchingContainerProfiledBy(Element element, String profileUri){
- EList<Profile> appliedProfiles = null;
+ EList<Profile> appliedProfiles;
if(element instanceof Package){
Package pakage = (Package)element;
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/BlockClassifierViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/BlockClassifierViewFactory.java
index f71ea96..15b7cd4 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/BlockClassifierViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/BlockClassifierViewFactory.java
@@ -42,6 +42,7 @@
*/
private static final String CLASS = "Class";//$NON-NLS-1$
+ @Override
public Node createElementView(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/FlowSpecificationClassifierViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/FlowSpecificationClassifierViewFactory.java
index 2b5701e..4cc4645 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/FlowSpecificationClassifierViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/FlowSpecificationClassifierViewFactory.java
@@ -43,6 +43,7 @@
*/
private static final String INTERFACE = "Interface";//$NON-NLS-1$
+ @Override
public Node createElementView(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/OperationPortViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/OperationPortViewFactory.java
index 55cf32a..3404770 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/OperationPortViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/OperationPortViewFactory.java
@@ -39,6 +39,7 @@
*/
protected static final String OPERATION_BORDER_ITEM_LABEL = "Operation_BorderItem_Label";//$NON-NLS-1$
+ @Override
public Node createElementView(EObject domainElement, View containerView,String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/PortViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/PortViewFactory.java
index 9482fbf..1d63bda 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/PortViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/internal/factory/PortViewFactory.java
@@ -34,6 +34,7 @@
*/
protected static final String OPERATION_BORDER_ITEM_LABEL = "Operation_BorderItem_Label";//$NON-NLS-1$
+ @Override
public Node createElementView(EObject domainElement, View containerView,String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/provider/ParserProvider.java b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/provider/ParserProvider.java
index 8503fe5..4a345d9 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/provider/ParserProvider.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/src/org/eclipse/papyrus/sysml14/diagram/blockdefinition/provider/ParserProvider.java
@@ -31,7 +31,7 @@
public class ParserProvider extends AbstractProvider implements IParserProvider {
/** map from graphical hint to parsers */
- private static final Map<String, IParser> graphicalHintToParser = new HashMap<String, IParser>();
+ private static final Map<String, IParser> graphicalHintToParser = new HashMap<>();
static {
graphicalHintToParser.put("Constraint_Label", new ConstraintLabelParser());
@@ -40,6 +40,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean provides(IOperation operation) {
if (operation instanceof GetParserOperation) {
IAdaptable hint = ((GetParserOperation) operation).getHint();
@@ -53,8 +54,9 @@
/**
* {@inheritDoc}
*/
+ @Override
public IParser getParser(IAdaptable hint) {
- String parserHint = (String) hint.getAdapter(String.class);
+ String parserHint = hint.getAdapter(String.class);
if (parserHint != null) {
IParser parser = graphicalHintToParser.get(parserHint);
if (parser != null) {
@@ -62,7 +64,7 @@
}
}
- View view = (View) hint.getAdapter(View.class);
+ View view = hint.getAdapter(View.class);
if (view != null) {
IParser parser = graphicalHintToParser.get(view.getType());
if (parser != null) {
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/FlowPortViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/FlowPortViewFactory.java
index f57371d..9d549d4 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/FlowPortViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/FlowPortViewFactory.java
@@ -29,6 +29,7 @@
*/
protected static final String FLOWPORT_ICON_BORDER_ITEM = "FlowPort_Icon_BorderItem"; //$NON-NLS-1$
+ @Override
public Node createElementView(EObject domainElement, View containerView,String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/SysMLConnectorViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/SysMLConnectorViewFactory.java
index 5666c39..9fc2f4f 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/SysMLConnectorViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/factory/SysMLConnectorViewFactory.java
@@ -59,7 +59,7 @@
Connector edge = NotationFactory.eINSTANCE.createConnector();
edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
- List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);
+ List<RelativeBendpoint> points = new ArrayList<>(2);
points.add(new RelativeBendpoint());
points.add(new RelativeBendpoint());
bendpoints.setPoints(points);
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/locator/FixedPortPositionLocator.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/locator/FixedPortPositionLocator.java
index c98c819..e4526e7 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/locator/FixedPortPositionLocator.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/locator/FixedPortPositionLocator.java
@@ -44,7 +44,7 @@
@Override
public int getCurrentSideOfParent() {
int defaultSkink = 10;
- Rectangle basisRectangle = new Rectangle(0, 0, parentFigure.getBounds().width, (parentFigure.getBounds().height));
+ Rectangle basisRectangle = new Rectangle(0, 0, parentFigure.getBounds().width, parentFigure.getBounds().height);
// creation of an internal rectangle in order to compute the position (size divided by 2);
int skinkWidth = constraint.width / 2;
int skinkHeight = constraint.height / 2;
@@ -59,8 +59,6 @@
}
Rectangle internalRectangle = basisRectangle.getShrinked(new Insets(skinkHeight, skinkWidth, skinkHeight, skinkWidth));
// let draw2D to compute position
- int position = internalRectangle.getPosition(constraint.getTopLeft());
- // use to Debug
- return position;
+ return internalRectangle.getPosition(constraint.getTopLeft());
}
}
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java
index 85bc664..6f92f79 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java
@@ -19,11 +19,11 @@
*/
public final class GraphicalSysMLServiceTypeUtil {
- private GraphicalSysMLServiceTypeUtil() {
- }
-
public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_PARAMETER_BORDER_ITEM = "org.eclipse.papyrus.sysmldi.Parameter_BorderItem"; //$NON-NLS-1$
public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINT_LABEL = "org.eclipse.papyrus.sysmldi.Constraint_Label";//$NON-NLS-1$
+
+ private GraphicalSysMLServiceTypeUtil() {
+ }
}
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/src/org/eclipse/papyrus/sysml14/diagram/internalblock/internal/factory/BlockCompositeViewFactory.java b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/src/org/eclipse/papyrus/sysml14/diagram/internalblock/internal/factory/BlockCompositeViewFactory.java
index 8366caf..b905a4c 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/src/org/eclipse/papyrus/sysml14/diagram/internalblock/internal/factory/BlockCompositeViewFactory.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/src/org/eclipse/papyrus/sysml14/diagram/internalblock/internal/factory/BlockCompositeViewFactory.java
@@ -36,6 +36,7 @@
*/
public class BlockCompositeViewFactory extends AbstractBasicViewFactory {
+ @Override
public Node createElementView(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
Shape node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintDropStrategy.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintDropStrategy.java
index b93fac9..72a9aa0 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintDropStrategy.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintDropStrategy.java
@@ -72,11 +72,11 @@
if (targetEditPart instanceof GraphicalEditPart) {
IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) targetEditPart;
List<EObject> sourceElements = getSourceEObjects(request);
- if (sourceElements.size() == 0) {
+ if (sourceElements.isEmpty()) {
return null;
}
- final List<EObject> valuesToAdd = new ArrayList<EObject>(sourceElements.size());
+ final List<EObject> valuesToAdd = new ArrayList<>(sourceElements.size());
final ISpecializationType constraintPropertyElementType = (ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINTPROPERTY);
// the target must me a constraint property
Element target = (Element) graphicalEditPart.resolveSemanticElement();
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintPropertyDropStrategy.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintPropertyDropStrategy.java
index e4c8c5e..5587db0 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintPropertyDropStrategy.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ConstraintPropertyDropStrategy.java
@@ -81,16 +81,16 @@
if (targetEditPart instanceof GraphicalEditPart) {
IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) targetEditPart;
List<EObject> sourceElements = getSourceEObjects(request);
- if (sourceElements.size() == 0) {
+ if (sourceElements.isEmpty()) {
return null;
}
- final List<EObject> valuesToAdd = new ArrayList<EObject>(sourceElements.size());
+ final List<EObject> valuesToAdd = new ArrayList<>(sourceElements.size());
final ISpecializationType constraintPropertyElementType = (ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINTPROPERTY);
// the target must me a constraint property
if (INTERNAL_STRUCTURE_ID.equals(graphicalEditPart.getNotationView().getType())) {
for (EObject sourceElement : sourceElements) {
- if ((constraintPropertyElementType.getMatcher().matches(sourceElement))) {
+ if (constraintPropertyElementType.getMatcher().matches(sourceElement)) {
addCommandDrop(targetEditPart, cc, valuesToAdd, sourceElement, (ISpecializationType) ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.SysML14.ConstraintPropertyComposite"));
}
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ParameterDropStrategy.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ParameterDropStrategy.java
index bef36ea..7775014 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ParameterDropStrategy.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/dnd/ParameterDropStrategy.java
@@ -69,11 +69,11 @@
if (targetEditPart instanceof GraphicalEditPart) {
IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) targetEditPart;
List<EObject> sourceElements = getSourceEObjects(request);
- if (sourceElements.size() == 0) {
+ if (sourceElements.isEmpty()) {
return null;
}
- final List<EObject> valuesToAdd = new ArrayList<EObject>(sourceElements.size());
+ final List<EObject> valuesToAdd = new ArrayList<>(sourceElements.size());
final ISpecializationType parameterPropertyElementType = (ISpecializationType) ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINTPROPERTY);
if (parameterPropertyElementType == null) {
return null;
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/edit/part/ParameterBorderItermEditPart.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/edit/part/ParameterBorderItermEditPart.java
index 681a6c3..86d8910 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/edit/part/ParameterBorderItermEditPart.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/edit/part/ParameterBorderItermEditPart.java
@@ -35,12 +35,9 @@
super(view);
}
-
@Override
public IBorderItemLocator getNewBorderItemLocator(IFigure mainFigure) {
return new ParameterPositionLocator(mainFigure, PositionConstants.NONE);
}
-
-
-
+
}
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/locator/ParameterPositionLocator.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/locator/ParameterPositionLocator.java
index d37f6de..818a025 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/locator/ParameterPositionLocator.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/locator/ParameterPositionLocator.java
@@ -30,17 +30,21 @@
*
* @param parentFigure
* @param preferredSide
+ * @deprecated
*/
+ @Deprecated
public ParameterPositionLocator(IFigure parentFigure, int preferredSide) {
super(parentFigure, preferredSide);
- }
-
+ }
+
/**
* @see org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator#setPortPosition(java.lang.String)
*
* @param position
+ * @deprecated
*/
@Override
+ @Deprecated
public void setPortPosition(String position) {
// Always internal
super.setPortPosition(PortPositionEnum.INSIDE.toString());
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/policy/ParametricDropEditPolicy.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/policy/ParametricDropEditPolicy.java
index a479929..9addad7 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/policy/ParametricDropEditPolicy.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/policy/ParametricDropEditPolicy.java
@@ -59,7 +59,7 @@
// when there is 2 strategies, the default is always the last
Object[] matchingStrategiesArray = matchingStrategies.keySet().toArray();
if (matchingStrategiesArray[0] instanceof IParametricDropStrategy && matchingStrategiesArray[1] instanceof DefaultDropStrategy) {
- Map<DropStrategy, Command> parametricMatchingStrategies = new HashMap<DropStrategy, Command>();
+ Map<DropStrategy, Command> parametricMatchingStrategies = new HashMap<>();
DropStrategy dropStrategyKey = (DropStrategy) matchingStrategiesArray[0];
parametricMatchingStrategies.put(dropStrategyKey, matchingStrategies.get(dropStrategyKey));
return parametricMatchingStrategies;
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/provider/ParametricDropEditPolicyProvider.java b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/provider/ParametricDropEditPolicyProvider.java
index b981d3d..e5160ff 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/provider/ParametricDropEditPolicyProvider.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/src/org/eclipse/papyrus/sysml14/diagram/parametric/provider/ParametricDropEditPolicyProvider.java
@@ -84,7 +84,7 @@
*/
protected String getDiagramType(View currentView) {
Diagram diagram = currentView.getDiagram();
- String currentDiagramType = null;
+ String currentDiagramType;
ViewPrototype viewPrototype = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);
if (viewPrototype != null) {
currentDiagramType = viewPrototype.getLabel();
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java
index 39c283a..8f43dff 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java
@@ -68,14 +68,14 @@
PackageUtil.applyProfile(packageOwner, standardUMLProfile, true);
}
- Package umlPrimitiveTypes = (Package) PackageUtil.loadPackage(URI.createURI(UMLResource.UML_PRIMITIVE_TYPES_LIBRARY_URI), owner.eResource().getResourceSet());
+ Package umlPrimitiveTypes = PackageUtil.loadPackage(URI.createURI(UMLResource.UML_PRIMITIVE_TYPES_LIBRARY_URI), owner.eResource().getResourceSet());
if (umlPrimitiveTypes != null){
PackageImport pi = UMLFactory.eINSTANCE.createPackageImport();
pi.setImportedPackage(umlPrimitiveTypes);
packageOwner.getPackageImports().add(pi);
}
- Package sysmlLibrary = (Package) PackageUtil.loadPackage(URI.createURI(SysMLResource.LIBRARY_PATH), owner.eResource().getResourceSet());
+ Package sysmlLibrary = PackageUtil.loadPackage(URI.createURI(SysMLResource.LIBRARY_PATH), owner.eResource().getResourceSet());
if (sysmlLibrary != null){
PackageImport pi = UMLFactory.eINSTANCE.createPackageImport();
pi.setImportedPackage(sysmlLibrary);
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java
index 35ef130..1fa4b62 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java
@@ -66,7 +66,7 @@
@Override
protected boolean equivalent(Constraint constraint) {
if (super.equivalent(constraint)) {
- return (constraint instanceof HasStereotypeSysml14Constraint);
+ return constraint instanceof HasStereotypeSysml14Constraint;
}
return false;
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/paste/PartPasteStrategy.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/paste/PartPasteStrategy.java
index 8b6311b..fa3d660 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/paste/PartPasteStrategy.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/paste/PartPasteStrategy.java
@@ -110,10 +110,10 @@
return "Paste all copied elements"; //$NON-NLS-1$
}
- /*
+ /**
* (non-Javadoc)
- *
* @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getImage()
+ * @deprecated
*/
@Override
@Deprecated
@@ -121,10 +121,10 @@
return null;
}
- /*
- * (non-Javadoc)
- *
+
+ /** (non-Javadoc)
* @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getPriority()
+ * @deprecated
*/
@Override
@Deprecated
@@ -159,7 +159,7 @@
Object object = iterator.next();
EObject target = papyrusClipboard.getTragetCopyFromInternalClipboardCopy(object);
Object additionnalData = additionalDataMap.get(object);
- EList<Association> listDuplicatedAssociation = new BasicEList<Association>();
+ EList<Association> listDuplicatedAssociation = new BasicEList<>();
EObject associationContainer = null;
if (target instanceof Property && targetOwner instanceof Classifier && additionnalData instanceof PartAdditionalData) { // test if it is a part
Classifier block = (Classifier) targetOwner;
@@ -245,7 +245,7 @@
*/
@Override
public void prepare(PapyrusClipboard<Object> papyrusClipboard, Collection<EObject> selection) {
- Map<Object, IClipboardAdditionalData> mapCopyPartData = new HashMap<Object, IClipboardAdditionalData>();
+ Map<Object, IClipboardAdditionalData> mapCopyPartData = new HashMap<>();
for (Iterator<EObject> iterator = papyrusClipboard.iterateOnSource(); iterator.hasNext();) {
EObject eObjectSource = iterator.next();
if (eObjectSource instanceof Element) {
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/GetContainedAttributesJavaQuery.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/GetContainedAttributesJavaQuery.java
index 73c272d..6c8ddbe 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/GetContainedAttributesJavaQuery.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/GetContainedAttributesJavaQuery.java
@@ -34,13 +34,13 @@
*/
public class GetContainedAttributesJavaQuery implements IJavaQuery2<Property, Collection<EObject>> {
-
/* (non-Javadoc)
* @see org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2#evaluate(org.eclipse.emf.ecore.EObject, org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2, org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager)
- * @Override
+ *
*/
+ @Override
public Collection<EObject> evaluate(Property property, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
- List<EObject> result = new ArrayList<EObject>();
+ List<EObject> result = new ArrayList<>();
if(property.getType()!=null){
result.addAll(property.getType().getOwnedElements());
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/IsTypedPropertyJavaQuery.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/IsTypedPropertyJavaQuery.java
index 5da90e6..2e0f605 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/IsTypedPropertyJavaQuery.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/queries/property/IsTypedPropertyJavaQuery.java
@@ -29,11 +29,12 @@
/* (non-Javadoc)
* @see org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2#evaluate(org.eclipse.emf.ecore.EObject, org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2, org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager)
- * @Override
+ *
* Return true if the element is a typed property
*/
+ @Override
public Boolean evaluate(Property source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
- return (source.getType()!=null);
+ return source.getType()!=null;
}
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportSysMLQUDVLibraryInModel.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportSysMLQUDVLibraryInModel.java
index dd5c98f..640fcd6 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportSysMLQUDVLibraryInModel.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportSysMLQUDVLibraryInModel.java
@@ -38,6 +38,7 @@
private org.eclipse.uml2.uml.Package qudv;
+ @Override
public void execute() {
// Get its resource
@@ -60,7 +61,7 @@
}
try {
- root.eResource().save(Collections.EMPTY_MAP);
+ root.eResource().save(Collections.emptyMap());
} catch (IOException e) {
Activator.getLogHelper().error(e);
}
@@ -74,6 +75,7 @@
*
* @param modelSet
*/
+ @Override
public void setModelSet(ModelSet modelSet) {
this.modelSet = modelSet;
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportUMLStandardProfileInModel.java b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportUMLStandardProfileInModel.java
index 0ef4be7..f38b4d7 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportUMLStandardProfileInModel.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/template/ImportUMLStandardProfileInModel.java
@@ -28,7 +28,7 @@
/**
* Based on org.eclipse.papyrus.uml.templaterepository.ImportUMLPrimitiveTypesInModel
- *
+ * @deprecated
*/
@Deprecated //FIXME unused since the standard profile is in the default created model 0.8.1 (What about adding it in papyrus core?)
public class ImportUMLStandardProfileInModel implements IGenerator {
@@ -45,6 +45,7 @@
*
* @param modelSet
*/
+ @Override
public void setModelSet(ModelSet modelSet) {
this.modelSet = modelSet;
}
@@ -69,6 +70,7 @@
* @see org.eclipse.papyrus.uml.diagram.wizards.transformation.IGenerator#execute()
*
*/
+ @Override
public void execute() {
Resource umlResource = UmlUtils.getUmlModel(modelSet).getResource();
@@ -91,7 +93,7 @@
}
try {
- rootElement.eResource().save(Collections.EMPTY_MAP);
+ rootElement.eResource().save(Collections.emptyMap());
} catch (IOException e) {
Activator.getLogHelper().error(e);
}
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/filter/SysmlCommandFilter.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/filter/SysmlCommandFilter.java
index 4ae450f..20bb71e 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/filter/SysmlCommandFilter.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/filter/SysmlCommandFilter.java
@@ -33,15 +33,16 @@
*/
public static final SysmlCommandFilter INSTANCE = new SysmlCommandFilter();
+ private List<IElementType> visibleCommands;
+
private SysmlCommandFilter() {
// to prevent instantiation
}
- private List<IElementType> visibleCommands;
-
+ @Override
public List<IElementType> getVisibleCommands() {
if (visibleCommands == null) {
- List<IElementType> localVisibleCommands = new ArrayList<IElementType>();
+ List<IElementType> localVisibleCommands = new ArrayList<>();
localVisibleCommands.add(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_BLOCK));
localVisibleCommands.add(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINTBLOCK));
localVisibleCommands.add(ElementTypeRegistry.getInstance().getType(SysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_FLOWPORT));
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ActorPartPropertyHandler.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ActorPartPropertyHandler.java
index 25c21c9..175ddc1 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ActorPartPropertyHandler.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ActorPartPropertyHandler.java
@@ -67,7 +67,7 @@
return UnexecutableCommand.INSTANCE;
}
- CreateElementRequest createRequest = null;
+ CreateElementRequest createRequest;
if (reference == null) {
createRequest = new CreateElementRequest(container, getElementTypeToCreate());
} else {
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ConstraintBlockParameterHandler.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ConstraintBlockParameterHandler.java
index 4de24a8..0dce576 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ConstraintBlockParameterHandler.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ConstraintBlockParameterHandler.java
@@ -71,7 +71,7 @@
return UnexecutableCommand.INSTANCE;
}
- CreateElementRequest createRequest = null;
+ CreateElementRequest createRequest;
if (reference == null) {
createRequest = new CreateElementRequest(container, getElementTypeToCreate());
} else {
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/FlowPortNAHandler.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/FlowPortNAHandler.java
index 65c2bfd..69f1a47 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/FlowPortNAHandler.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/FlowPortNAHandler.java
@@ -49,7 +49,7 @@
return UnexecutableCommand.INSTANCE;
}
- CreateElementRequest createRequest = null;
+ CreateElementRequest createRequest;
if (reference == null) {
createRequest = new CreateElementRequest(container, getElementTypeToCreate());
} else {
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/PartPropertyHandler.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/PartPropertyHandler.java
index 9983695..93ddf1b 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/PartPropertyHandler.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/PartPropertyHandler.java
@@ -67,7 +67,7 @@
return UnexecutableCommand.INSTANCE;
}
- CreateElementRequest createRequest = null;
+ CreateElementRequest createRequest;
if (reference == null) {
createRequest = new CreateElementRequest(container, getElementTypeToCreate());
} else {
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ReferencePropertyHandler.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ReferencePropertyHandler.java
index edfcecd..57b1379 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ReferencePropertyHandler.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ReferencePropertyHandler.java
@@ -67,7 +67,7 @@
return UnexecutableCommand.INSTANCE;
}
- CreateElementRequest createRequest = null;
+ CreateElementRequest createRequest;
if (reference == null) {
createRequest = new CreateElementRequest(container, getElementTypeToCreate());
} else {
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ValuePropertyHandler.java b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ValuePropertyHandler.java
index 15535f5..e47aff3 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ValuePropertyHandler.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/src/org/eclipse/papyrus/sysml14/nattable/ui/handlers/ValuePropertyHandler.java
@@ -67,7 +67,7 @@
return UnexecutableCommand.INSTANCE;
}
- CreateElementRequest createRequest = null;
+ CreateElementRequest createRequest;
if (reference == null) {
createRequest = new CreateElementRequest(container, getElementTypeToCreate());
} else {
