ASSIGNED - bug 296327: [SysML] SysML static profile implementation

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

Simple reformat of code (format template r824)

4 files changed, 15 insertions, 30 deletions

diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
index 723e1847d66..3e9252c3b3a 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
+++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
@@ -169,16 +169,14 @@ public class RequirementRelatedTest extends TestCase {
 		Class defaultClass = model.createOwnedClass("defaultClass", false);

 

 		// Add Requirement stereotypes

-		default_reqR = (RequirementRelated)defaultClass.applyStereotype(defaultClass

-				.getApplicableStereotype(REQUIREMENT_RELATED_ID));

+		default_reqR = (RequirementRelated)defaultClass.applyStereotype(defaultClass.getApplicableStereotype(REQUIREMENT_RELATED_ID));

 

 		// ////////////////////////////////////////////////////////////////////

 		// Prepare getTracedFrom test elements

 		// ////////////////////////////////////////////////////////////////////

 

 		Class traced = model.createOwnedClass("traced", false);

-		traced_reqR = (RequirementRelated)traced.applyStereotype(traced

-				.getApplicableStereotype(REQUIREMENT_RELATED_ID));

+		traced_reqR = (RequirementRelated)traced.applyStereotype(traced.getApplicableStereotype(REQUIREMENT_RELATED_ID));

 

 		Class trace1 = model.createOwnedClass("trace1", false);

 		trace1_req = (Requirement)trace1.applyStereotype(trace1.getApplicableStereotype(REQUIREMENT_ID));

@@ -208,8 +206,7 @@ public class RequirementRelatedTest extends TestCase {
 		// ////////////////////////////////////////////////////////////////////

 

 		Class satisfying = model.createOwnedClass("satisfying", false);

-		satisfying_reqR = (RequirementRelated)satisfying.applyStereotype(satisfying

-				.getApplicableStereotype(REQUIREMENT_RELATED_ID));

+		satisfying_reqR = (RequirementRelated)satisfying.applyStereotype(satisfying.getApplicableStereotype(REQUIREMENT_RELATED_ID));

 

 		Class satisfied1 = model.createOwnedClass("satisfied1", false);

 		satisfied1_req = (Requirement)satisfied1.applyStereotype(satisfied1.getApplicableStereotype(REQUIREMENT_ID));

@@ -239,8 +236,7 @@ public class RequirementRelatedTest extends TestCase {
 		// ////////////////////////////////////////////////////////////////////

 

 		Class verifying = model.createOwnedClass("verifying", false);

-		verifying_reqR = (RequirementRelated)verifying.applyStereotype(verifying

-				.getApplicableStereotype(REQUIREMENT_RELATED_ID));

+		verifying_reqR = (RequirementRelated)verifying.applyStereotype(verifying.getApplicableStereotype(REQUIREMENT_RELATED_ID));

 

 		Class verified1 = model.createOwnedClass("verified1", false);

 		verified1_req = (Requirement)verified1.applyStereotype(verified1.getApplicableStereotype(REQUIREMENT_ID));

@@ -270,8 +266,7 @@ public class RequirementRelatedTest extends TestCase {
 		// ////////////////////////////////////////////////////////////////////

 

 		Class refining = model.createOwnedClass("refining", false);

-		refining_reqR = (RequirementRelated)refining.applyStereotype(refining

-				.getApplicableStereotype(REQUIREMENT_RELATED_ID));

+		refining_reqR = (RequirementRelated)refining.applyStereotype(refining.getApplicableStereotype(REQUIREMENT_RELATED_ID));

 

 		Class refined1 = model.createOwnedClass("refined1", false);

 		refined1_req = (Requirement)refined1.applyStereotype(refined1.getApplicableStereotype(REQUIREMENT_ID));

diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
index 096a9702fe9..596313eed44 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
+++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
@@ -385,10 +385,8 @@ public class RequirementTest extends TestCase {
 		Operation op1 = testClass.createOwnedOperation("op1", null, null, null);

 		Operation op2 = testClass.createOwnedOperation("op2", null, null, null);

 

-		testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)op1.applyStereotype(op1

-				.getApplicableStereotype(TESTCASE_ID));

-		testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)op2.applyStereotype(op2

-				.getApplicableStereotype(TESTCASE_ID));

+		testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)op1.applyStereotype(op1.getApplicableStereotype(TESTCASE_ID));

+		testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)op2.applyStereotype(op2.getApplicableStereotype(TESTCASE_ID));

 

 		// Add "Verify" (Abstraction)

 		// testCase1, testCase2 -> verified

diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
index c89e1802f33..eb032eba072 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
+++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
@@ -143,12 +143,9 @@ public class TestCaseTest extends TestCase {
 		Operation op1 = testClass.createOwnedOperation("op1", null, null, null);

 		Operation op2 = testClass.createOwnedOperation("op2", null, null, null);

 

-		testCase0 = (org.eclipse.papyrus.sysml.requirements.TestCase)op0.applyStereotype(op0

-				.getApplicableStereotype(TESTCASE_ID));

-		testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)op1.applyStereotype(op1

-				.getApplicableStereotype(TESTCASE_ID));

-		testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)op2.applyStereotype(op2

-				.getApplicableStereotype(TESTCASE_ID));

+		testCase0 = (org.eclipse.papyrus.sysml.requirements.TestCase)op0.applyStereotype(op0.getApplicableStereotype(TESTCASE_ID));

+		testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)op1.applyStereotype(op1.getApplicableStereotype(TESTCASE_ID));

+		testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)op2.applyStereotype(op2.getApplicableStereotype(TESTCASE_ID));

 

 		// Add "Verify" (Abstraction)

 		// testCase1, testCase2 -> verified1

diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java
index c197907fd50..ec62b4e13cd 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java
+++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java
@@ -93,8 +93,7 @@ public class SysMLTestResources {
 

 			Resource resource = RESOURCE_SET.getResource(uri, true);

 

-			package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(),

-					UMLPackage.Literals.PACKAGE);

+			package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PACKAGE);

 

 		} catch (WrappedException we) {

 			// null package

@@ -105,19 +104,15 @@ public class SysMLTestResources {
 	}

 

 	protected static void registerPathmaps(URI uri) {

-		URIConverter.URI_MAP.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP), uri.appendSegment("libraries")

-				.appendSegment(""));

+		URIConverter.URI_MAP.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP), uri.appendSegment("libraries").appendSegment(""));

 

-		URIConverter.URI_MAP.put(URI.createURI(UMLResource.METAMODELS_PATHMAP), uri.appendSegment("metamodels")

-				.appendSegment(""));

+		URIConverter.URI_MAP.put(URI.createURI(UMLResource.METAMODELS_PATHMAP), uri.appendSegment("metamodels").appendSegment(""));

 

-		URIConverter.URI_MAP.put(URI.createURI(UMLResource.PROFILES_PATHMAP), uri.appendSegment("profiles")

-				.appendSegment(""));

+		URIConverter.URI_MAP.put(URI.createURI(UMLResource.PROFILES_PATHMAP), uri.appendSegment("profiles").appendSegment(""));

 	}

 

 	protected static void registerResourceFactories() {

-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION,

-				UMLResource.Factory.INSTANCE);

+		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);

 	}

 

 	protected static void save(org.eclipse.uml2.uml.Package package_, URI uri) {