[Quality] Patch some code
- add missing //NLS @
- rename test PrivatePackageImportTest
- refactor ConformCreationEditHelperAdvice
Change-Id: I25c879a172e96b7f33b3d24e302214222b2de0aa
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/.gitignore b/.gitignore
index 71733c7..8e64eff 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@
*~
# Workspace metadata folder created by Oomph when launching tests.
tests/**/.metadata/
-**/src/site/resources/images/rcptt-screenshots
\ No newline at end of file
+**/src/site/resources/images/rcptt-screenshots
+# sonarlint temporary directory
+sonarlint/
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/CreatePrivatePackageImportTest.java b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/PrivatePackageImportTest.java
similarity index 98%
rename from core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/CreatePrivatePackageImportTest.java
rename to core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/PrivatePackageImportTest.java
index b2fd4b3..bcae982 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/CreatePrivatePackageImportTest.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/PrivatePackageImportTest.java
@@ -42,7 +42,7 @@
* Class to test Private package creation
*/
@SuppressWarnings("nls")
-public class CreatePrivatePackageImportTest {
+public class PrivatePackageImportTest {
private final static String ELEMENT_TYPE_ID = "org.eclipse.papyrus.SysML14.PrivatePackageImport";
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java
index fb1a0a9..d369942 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java
@@ -38,6 +38,7 @@
* Test class for conform creation
* This class verifies the requirement{@papyrus.req org.eclipse.papyrus.sysml14.service.types#Req_001}
*/
+@SuppressWarnings("nls")
public class ConformReorientEditHelperAdviceTest {
@BeforeClass
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/util/SysMLServiceTypeUtilTest.java b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/util/SysMLServiceTypeUtilTest.java
index 4d42035..4f9767d 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/util/SysMLServiceTypeUtilTest.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/util/SysMLServiceTypeUtilTest.java
@@ -33,6 +33,7 @@
* @author Benoit Maggi
*
*/
+@SuppressWarnings("nls")
public class SysMLServiceTypeUtilTest {
/**
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 056ee1d..5b67161 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
@@ -16,8 +16,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
@@ -45,6 +47,7 @@
*
*/
public class ConformCreationEditHelperAdvice extends AbstractEditHelperAdvice {
+
/**
* @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
*
@@ -54,59 +57,65 @@
@Override
public boolean approveRequest(IEditCommandRequest request) {
//only CreateRelationshipRequest are interested for conform
- if(!(request instanceof CreateRelationshipRequest)){
- return super.approveRequest(request);
- }
- CreateRelationshipRequest createRelationshipRequest=(CreateRelationshipRequest)request;
- //only elementType conform are interested for conform
- IElementType elementType=createRelationshipRequest.getElementType();
-
- if (elementType instanceof ISpecializationType){
- 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);
- } else {//This is a conform Element
- //test source
- if (!(createRelationshipRequest.getSource() instanceof Classifier)){
- return false;
- }
- else{
- // this is a view, but has it a conform link?
- Conform conforLink=null;
- Classifier viewBaseClass= (Classifier)createRelationshipRequest.getSource();
- // Find Conform link
- EList<Generalization> generalizations = viewBaseClass.getGeneralizations();
- if (generalizations != null) {
- Iterator<Generalization> itGen = generalizations.iterator();
- while (itGen.hasNext() && (conforLink == null)) {
- conforLink = UMLUtil.getStereotypeApplication(itGen.next(), Conform.class);
- }
- }
- //Test to verify if the view has already a conform link.
- if( conforLink!=null){
- return false;
- }
- }
- //the source is ok
- if( UMLUtil.getStereotypeApplication((Classifier)createRelationshipRequest.getSource(), View.class)==null){
- return false;
- }
-
- //test target
- if(createRelationshipRequest.getTarget()==null){
- return true;
- }
- if (!(createRelationshipRequest.getTarget() instanceof Classifier)){
- return false;
- }
- return UMLUtil.getStereotypeApplication((Classifier)createRelationshipRequest.getTarget(), Viewpoint.class)!=null;
+ if(request instanceof CreateRelationshipRequest){
+ CreateRelationshipRequest createRelationshipRequest=(CreateRelationshipRequest)request;
+ //only elementType conform are interested for conform
+ IElementType elementType=createRelationshipRequest.getElementType();
+ if (elementType instanceof ISpecializationType){
+ List<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 approveCreateRelationshipRequest(createRelationshipRequest);
+ }
}
}
return super.approveRequest(request);
}
+ /**
+ * is the createRelationshipRequest on Conform (or one sub specialization is approved)
+ * @param createRelationshipRequest
+ * @return
+ */
+ private boolean approveCreateRelationshipRequest(CreateRelationshipRequest createRelationshipRequest) {
+ //test source
+ EObject source = createRelationshipRequest.getSource();
+ if (!(source instanceof Classifier)){
+ return false;
+ }
+ else{
+ // this is a view, but has it a conform link?
+ Conform conformLink=null;
+ Classifier viewBaseClass= (Classifier)source;
+ // Find Conform link
+ EList<Generalization> generalizations = viewBaseClass.getGeneralizations();
+ if (generalizations != null) {
+ Iterator<Generalization> itGen = generalizations.iterator();
+ while (itGen.hasNext() && (conformLink == null)) {
+ conformLink = UMLUtil.getStereotypeApplication(itGen.next(), Conform.class);
+ }
+ }
+ //Test to verify if the view has already a conform link.
+ if(conformLink!=null){
+ return false;
+ }
+ }
+ //the source is ok
+ if( UMLUtil.getStereotypeApplication((Classifier)source, View.class)==null){
+ return false;
+ }
+
+ //test target
+ EObject target = createRelationshipRequest.getTarget();
+ if(target==null){
+ return true;
+ }
+ if (!(target instanceof Classifier)){
+ return false;
+ }
+ return UMLUtil.getStereotypeApplication((Classifier)target, Viewpoint.class)!=null;
+ }
+
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformReorientEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformReorientEditHelperAdvice.java
index 6570e13..f45b0e0 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformReorientEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConformReorientEditHelperAdvice.java
@@ -15,6 +15,7 @@
import java.util.Iterator;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
@@ -51,36 +52,33 @@
return super.approveRequest(request);
}
ReorientRelationshipRequest reorientRelationshipRequest= (ReorientRelationshipRequest) request;
+ EObject newRelationshipEnd = reorientRelationshipRequest.getNewRelationshipEnd();
+ if (!(newRelationshipEnd instanceof Classifier)){
+ return false;
+ }
+
+ Classifier newRelationshipEndClassifier = (Classifier) newRelationshipEnd ;
//SOURCE
- if( ReorientRelationshipRequest.REORIENT_SOURCE==reorientRelationshipRequest.getDirection()){
- if (!(reorientRelationshipRequest.getNewRelationshipEnd() instanceof Classifier)){
- return false;
- }
- if( UMLUtil.getStereotypeApplication((Classifier)reorientRelationshipRequest.getNewRelationshipEnd(), View.class)!=null){
-
+ if(ReorientRelationshipRequest.REORIENT_SOURCE==reorientRelationshipRequest.getDirection()){
+ if( UMLUtil.getStereotypeApplication(newRelationshipEndClassifier, View.class)!=null){
// this is a view, but has it a conform link?
- Conform conforLink=null;
- Classifier viewBaseClass= (Classifier)reorientRelationshipRequest.getNewRelationshipEnd();
+ Conform conformLink=null;
// Find Conform link
- EList<Generalization> generalizations = viewBaseClass.getGeneralizations();
+ EList<Generalization> generalizations = newRelationshipEndClassifier.getGeneralizations();
if (generalizations != null) {
Iterator<Generalization> itGen = generalizations.iterator();
- while (itGen.hasNext() && (conforLink == null)) {
- conforLink = UMLUtil.getStereotypeApplication(itGen.next(), Conform.class);
+ while (itGen.hasNext() && (conformLink == null)) {
+ conformLink = UMLUtil.getStereotypeApplication(itGen.next(), Conform.class);
}
}
//Test to verify if the view has already a conform link.
- if( conforLink!=null){
+ if(conformLink!=null){
return false;
}
return true;
}
- }
- else{//TARGET
- if (!(reorientRelationshipRequest.getNewRelationshipEnd() instanceof Classifier)){
- return false;
- }
- if( UMLUtil.getStereotypeApplication((Classifier)reorientRelationshipRequest.getNewRelationshipEnd(), Viewpoint.class)!=null){
+ }else{//TARGET
+ if( UMLUtil.getStereotypeApplication(newRelationshipEndClassifier, Viewpoint.class)!=null){
return true;
}
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorCreationEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorCreationEditHelperAdvice.java
index 07a59c5..b9a7ebe 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorCreationEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/ConnectorCreationEditHelperAdvice.java
@@ -47,7 +47,12 @@
private UMLConnectorUtils utils = new UMLConnectorUtils();
-
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)
+ *
+ * @param request
+ * @return
+ */
@Override
protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
@@ -77,6 +82,12 @@
return super.getBeforeCreateRelationshipCommand(request);
}
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)
+ *
+ * @param request
+ * @return
+ */
@Override
protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {
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 895767d..6827308 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
@@ -133,6 +133,12 @@
return connectorOwner.getApplicableStereotype("SysML::Blocks::Block") != null;
}
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)
+ *
+ * @param request
+ * @return
+ */
@Override
protected ICommand getAfterReorientRelationshipCommand(final ReorientRelationshipRequest request) {
// we set the new value for the nested path
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 67c0704..88327f4 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
@@ -44,7 +44,7 @@
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) {
+ if (createElementRequest.getContainer() instanceof Property) {
// this line is very important
// change the context ok, but the feature must be change in order to create a port inside the class
createElementRequest.setContainmentFeature(UMLPackage.eINSTANCE.getNamespace_OwnedRule());
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 6c93529..322d998 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
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
@@ -53,7 +54,7 @@
IElementType elementType=request.getTypeToConfigure();
if (elementType instanceof ISpecializationType){
- ArrayList<IElementType> elementTypesHierarchy= new ArrayList<>();
+ List<IElementType> elementTypesHierarchy= new ArrayList<>();
elementTypesHierarchy.add(elementType);
ISpecializationType iSpecializationType=(ISpecializationType)elementType;
elementTypesHierarchy.addAll(Arrays.asList(iSpecializationType.getAllSuperTypes()));
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 5c11203..7f60775 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
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
@@ -52,7 +53,7 @@
IElementType elementType = request.getTypeToConfigure();
if (elementType instanceof ISpecializationType) {
- ArrayList<IElementType> elementTypesHierarchy = new ArrayList<>();
+ List<IElementType> elementTypesHierarchy = new ArrayList<>();
elementTypesHierarchy.add(elementType);
ISpecializationType iSpecializationType = (ISpecializationType) elementType;
elementTypesHierarchy.addAll(Arrays.asList(iSpecializationType.getAllSuperTypes()));
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/UnitEditHelperAdvice.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/UnitEditHelperAdvice.java
index b2cd5fc..39989c0 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/UnitEditHelperAdvice.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/advice/UnitEditHelperAdvice.java
@@ -26,8 +26,6 @@
*/
public class UnitEditHelperAdvice extends AbstractEditHelperAdvice {
-
-
/**
* @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest)
*
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 cafb79a..355eba1 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
@@ -36,7 +36,7 @@
// 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
- isMatch = (element.getType() instanceof Actor);
+ isMatch = element.getType() instanceof Actor;
}
}
return isMatch;
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ValuePropertyMatcher.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ValuePropertyMatcher.java
index 1aaea61..5b62210 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ValuePropertyMatcher.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/matcher/ValuePropertyMatcher.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 3a4f616..de6368b 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
@@ -32,6 +32,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean matches(EObject eObject) {
if (!(eObject instanceof Element)) {
return false;
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 f39b340..af7ce14 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
@@ -158,7 +158,7 @@
*/
public static final String getNameWithQuotes(final NamedElement property) {
final String partName = property.getName();
- final StringBuffer partNameBuffer = new StringBuffer();
+ final StringBuilder partNameBuffer = new StringBuilder();
final Pattern pattern = Pattern.compile(UMLConnectorUtils.HAS_NO_WORD_CHAR_REGEX);
final Matcher matcher = pattern.matcher(partName);
boolean mustHaveQuote = false;
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/SysmlProfileTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/SysmlProfileTest.java
index ac1f759..c83fd95 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/SysmlProfileTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/SysmlProfileTest.java
@@ -22,6 +22,7 @@
*
* @author Benoit Maggi
*/
+@SuppressWarnings("nls")
public class SysmlProfileTest {
/**
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/BlockPropertyNoNameModelConstraint.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/BlockPropertyNoNameModelConstraint.java
index 8c43371..8bd194d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/BlockPropertyNoNameModelConstraint.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/BlockPropertyNoNameModelConstraint.java
@@ -56,7 +56,7 @@
Association association = property.getAssociation();
if (association != null) {
String name = property.getName();
- if (name != null && !"".equals(name)) {
+ if (name != null && !"".equals(name)) {//$NON-NLS-1$
return context.createFailureStatus(context.getTarget());
}
}
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/PropertySpecificTypeMissingNameModelConstraint.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/PropertySpecificTypeMissingNameModelConstraint.java
index 8be1363..1e34b49 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/PropertySpecificTypeMissingNameModelConstraint.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/rules/blocks/PropertySpecificTypeMissingNameModelConstraint.java
@@ -39,7 +39,7 @@
Classifier classifier = propertySpecificType.getBase_Classifier();
if (classifier != null) {
String name = classifier.getName();
- if (name!= null && !"".equals(name)) {
+ if (name!= null && !"".equals(name)) { //$NON-NLS-1$
return context.createFailureStatus(context.getTarget());
}
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ConstraintEnvironmentTest.java b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ConstraintEnvironmentTest.java
index 284dfb1..d9c69c0 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ConstraintEnvironmentTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ConstraintEnvironmentTest.java
@@ -28,9 +28,10 @@
*
* @author Benoit Maggi
*/
+@SuppressWarnings("nls")
public class ConstraintEnvironmentTest {
- public static final String CONSTRAINT_PATH = Activator.PLUGIN_ID +"/resources/SysML1.4ConstraintEnvironment.xmi"; //$NON-NLS-1$
+ public static final String CONSTRAINT_PATH = Activator.PLUGIN_ID +"/resources/SysML1.4ConstraintEnvironment.xmi";
/**
* Validate the model with the rules defined in the meta-model tooling
@@ -40,7 +41,7 @@
URI createPlatformPluginURI = URI.createPlatformPluginURI(CONSTRAINT_PATH, true);
Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true);
Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
- Assert.assertEquals("The constraint model is not valid ", Diagnostic.OK, diagnostic.getSeverity()); //$NON-NLS-1$
+ Assert.assertEquals("The constraint model is not valid ", Diagnostic.OK, diagnostic.getSeverity());
}
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/CustomModelExplorerTest.java b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/CustomModelExplorerTest.java
index 26e4fc4..49764e2 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/CustomModelExplorerTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/CustomModelExplorerTest.java
@@ -31,9 +31,10 @@
*
* @author Francois Le Fevre
*/
+@SuppressWarnings("nls")
public class CustomModelExplorerTest {
- public static final String CUSTOM_MODEL_EXPLORER_PATH = Activator.PLUGIN_ID +"/resources/custom/OperationalSysML.custom"; //$NON-NLS-1$
+ public static final String CUSTOM_MODEL_EXPLORER_PATH = Activator.PLUGIN_ID +"/resources/custom/OperationalSysML.custom";
@BeforeClass
public static void loadElementTypeSet(){
@@ -49,7 +50,7 @@
URI createPlatformPluginURI = URI.createPlatformPluginURI(CUSTOM_MODEL_EXPLORER_PATH, true);
Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true);
Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
- Assert.assertEquals("The custom model explorer Model is not valid "+CUSTOM_MODEL_EXPLORER_PATH, Diagnostic.OK, diagnostic.getSeverity()); //$NON-NLS-1$
+ Assert.assertEquals("The custom model explorer Model is not valid "+CUSTOM_MODEL_EXPLORER_PATH, Diagnostic.OK, diagnostic.getSeverity());
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/NewChildMenuTest.java b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/NewChildMenuTest.java
index 6f8c316..dd4ccde 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/NewChildMenuTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/NewChildMenuTest.java
@@ -39,9 +39,10 @@
*
* @author Benoit Maggi
*/
+@SuppressWarnings("nls")
public class NewChildMenuTest {
- public static final String NEW_CHILD_MENU_PATH = Activator.PLUGIN_ID +"/resources/SysML14.creationmenumodel"; //$NON-NLS-1$
+ public static final String NEW_CHILD_MENU_PATH = Activator.PLUGIN_ID +"/resources/SysML14.creationmenumodel";
@BeforeClass
@@ -88,7 +89,7 @@
URI createPlatformPluginURI = URI.createPlatformPluginURI(NEW_CHILD_MENU_PATH, true);
Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true);
Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
- Assert.assertEquals("The new Child menu is not valid "+NEW_CHILD_MENU_PATH, Diagnostic.OK, diagnostic.getSeverity()); //$NON-NLS-1$
+ Assert.assertEquals("The new Child menu is not valid "+NEW_CHILD_MENU_PATH, Diagnostic.OK, diagnostic.getSeverity());
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/PropertiesTest.java b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/PropertiesTest.java
index 924dce7..686a4ed 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/PropertiesTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/PropertiesTest.java
@@ -30,9 +30,10 @@
*
* @author Benoit Maggi
*/
+@SuppressWarnings("nls")
public class PropertiesTest {
- public static final String PROPERTIES_MENU_PATH = Activator.PLUGIN_ID +"/resources/properties/SysML1.4.ctx"; //$NON-NLS-1$
+ public static final String PROPERTIES_MENU_PATH = Activator.PLUGIN_ID +"/resources/properties/SysML1.4.ctx";
/**
* Validate the model with the rules defined in the meta-model tooling
@@ -42,7 +43,7 @@
URI createPlatformPluginURI = URI.createPlatformPluginURI(PROPERTIES_MENU_PATH, true);
Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true);
Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
- Assert.assertEquals("The properties menu is not valid "+print(diagnostic), Diagnostic.OK, diagnostic.getSeverity()); //$NON-NLS-1$
+ Assert.assertEquals("The properties menu is not valid "+print(diagnostic), Diagnostic.OK, diagnostic.getSeverity());
}
/**
