[Code style] Apply clean-up and formatter on Extra plug-ins

5 files changed, 261 insertions, 154 deletions

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java
index bd8d9ffc25c..4c6cee1c51a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;

-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.*;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;

@@ -37,6 +36,7 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage

  * @generated

  */

@@ -45,6 +45,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static TimePackage modelPackage;

@@ -53,6 +54,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public TimeAdapterFactory() {

@@ -66,6 +68,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

@@ -75,7 +78,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 			return true;

 		}

 		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

+			return ((EObject) object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

@@ -84,75 +87,90 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TimeSwitch<Adapter> modelSwitch =

-		new TimeSwitch<Adapter>() {

-			@Override

-			public Adapter caseTimedDomain(TimedDomain object) {

-				return createTimedDomainAdapter();

-			}

-			@Override

-			public Adapter caseClock(Clock object) {

-				return createClockAdapter();

-			}

-			@Override

-			public Adapter caseClockType(ClockType object) {

-				return createClockTypeAdapter();

-			}

-			@Override

-			public Adapter caseTimedElement(TimedElement object) {

-				return createTimedElementAdapter();

-			}

-			@Override

-			public Adapter caseTimedValueSpecification(TimedValueSpecification object) {

-				return createTimedValueSpecificationAdapter();

-			}

-			@Override

-			public Adapter caseTimedConstraint(TimedConstraint object) {

-				return createTimedConstraintAdapter();

-			}

-			@Override

-			public Adapter caseClockConstraint(ClockConstraint object) {

-				return createClockConstraintAdapter();

-			}

-			@Override

-			public Adapter caseTimedInstantObservation(TimedInstantObservation object) {

-				return createTimedInstantObservationAdapter();

-			}

-			@Override

-			public Adapter caseTimedDurationObservation(TimedDurationObservation object) {

-				return createTimedDurationObservationAdapter();

-			}

-			@Override

-			public Adapter caseTimedEvent(TimedEvent object) {

-				return createTimedEventAdapter();

-			}

-			@Override

-			public Adapter caseTimedProcessing(TimedProcessing object) {

-				return createTimedProcessingAdapter();

-			}

-			@Override

-			public Adapter caseNfpConstraint(NfpConstraint object) {

-				return createNfpConstraintAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+			new TimeSwitch<Adapter>() {

+				@Override

+				public Adapter caseTimedDomain(TimedDomain object) {

+					return createTimedDomainAdapter();

+				}

+

+				@Override

+				public Adapter caseClock(Clock object) {

+					return createClockAdapter();

+				}

+

+				@Override

+				public Adapter caseClockType(ClockType object) {

+					return createClockTypeAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedElement(TimedElement object) {

+					return createTimedElementAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedValueSpecification(TimedValueSpecification object) {

+					return createTimedValueSpecificationAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedConstraint(TimedConstraint object) {

+					return createTimedConstraintAdapter();

+				}

+

+				@Override

+				public Adapter caseClockConstraint(ClockConstraint object) {

+					return createClockConstraintAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedInstantObservation(TimedInstantObservation object) {

+					return createTimedInstantObservationAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedDurationObservation(TimedDurationObservation object) {

+					return createTimedDurationObservationAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedEvent(TimedEvent object) {

+					return createTimedEventAdapter();

+				}

+

+				@Override

+				public Adapter caseTimedProcessing(TimedProcessing object) {

+					return createTimedProcessingAdapter();

+				}

+

+				@Override

+				public Adapter caseNfpConstraint(NfpConstraint object) {

+					return createNfpConstraintAdapter();

+				}

+

+				@Override

+				public Adapter defaultCase(EObject object) {

+					return createEObjectAdapter();

+				}

+			};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

 	@Override

 	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

+		return modelSwitch.doSwitch((EObject) target);

 	}

 

 

@@ -162,6 +180,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDomain

 	 * @generated

@@ -176,6 +195,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock

 	 * @generated

@@ -190,6 +210,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType

 	 * @generated

@@ -204,6 +225,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement

 	 * @generated

@@ -218,6 +240,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification

 	 * @generated

@@ -232,6 +255,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedConstraint

 	 * @generated

@@ -246,6 +270,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint

 	 * @generated

@@ -260,6 +285,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation

 	 * @generated

@@ -274,6 +300,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDurationObservation

 	 * @generated

@@ -288,6 +315,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedEvent

 	 * @generated

@@ -302,6 +330,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing

 	 * @generated

@@ -316,6 +345,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint

 	 * @generated

@@ -329,6 +359,7 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -336,4 +367,4 @@ public class TimeAdapterFactory extends AdapterFactoryImpl {
 		return null;

 	}

 

-} //TimeAdapterFactory

+} // TimeAdapterFactory

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java
index 3ff187d3803..00746b2dbb7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util.TimeResourceImpl

  * @generated

  */

@@ -30,6 +31,7 @@ public class TimeResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public TimeResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class TimeResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -57,4 +60,4 @@ public class TimeResourceFactoryImpl extends ResourceFactoryImpl {
 		return result;

 	}

 

-} //TimeResourceFactoryImpl

+} // TimeResourceFactoryImpl

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java
index 29c0cc2bd75..fad55238150 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util.TimeResourceFactoryImpl

  * @generated

  */

@@ -28,11 +29,13 @@ public class TimeResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *            the URI of the new resource.

 	 * @generated

 	 */

 	public TimeResourceImpl(URI uri) {

 		super(uri);

 	}

 

-} //TimeResourceImpl

+} // TimeResourceImpl

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java
index 0440a420d31..4151c68a0a9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -13,14 +13,10 @@
  *****************************************************************************/

 package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util;

 

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;

-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.*;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;

 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;

@@ -37,13 +33,13 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
 /**

  * <!-- begin-user-doc -->

  * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

- * to invoke the <code>caseXXX</code> method for each class of the model,

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

  * starting with the actual class of the object

  * and proceeding up the inheritance hierarchy

  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage

  * @generated

  */

@@ -52,6 +48,7 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static TimePackage modelPackage;

@@ -60,6 +57,7 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public TimeSwitch() {

@@ -72,6 +70,7 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -85,88 +84,130 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

 		switch (classifierID) {

-			case TimePackage.TIMED_DOMAIN: {

-				TimedDomain timedDomain = (TimedDomain)theEObject;

-				T result = caseTimedDomain(timedDomain);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+		case TimePackage.TIMED_DOMAIN: {

+			TimedDomain timedDomain = (TimedDomain) theEObject;

+			T result = caseTimedDomain(timedDomain);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case TimePackage.CLOCK: {

+			Clock clock = (Clock) theEObject;

+			T result = caseClock(clock);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case TimePackage.CLOCK_TYPE: {

+			ClockType clockType = (ClockType) theEObject;

+			T result = caseClockType(clockType);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case TimePackage.TIMED_ELEMENT: {

+			TimedElement timedElement = (TimedElement) theEObject;

+			T result = caseTimedElement(timedElement);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case TimePackage.TIMED_VALUE_SPECIFICATION: {

+			TimedValueSpecification timedValueSpecification = (TimedValueSpecification) theEObject;

+			T result = caseTimedValueSpecification(timedValueSpecification);

+			if (result == null) {

+				result = caseTimedElement(timedValueSpecification);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

 			}

-			case TimePackage.CLOCK: {

-				Clock clock = (Clock)theEObject;

-				T result = caseClock(clock);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			return result;

+		}

+		case TimePackage.TIMED_CONSTRAINT: {

+			TimedConstraint timedConstraint = (TimedConstraint) theEObject;

+			T result = caseTimedConstraint(timedConstraint);

+			if (result == null) {

+				result = caseNfpConstraint(timedConstraint);

+			}

+			if (result == null) {

+				result = caseTimedElement(timedConstraint);

 			}

-			case TimePackage.CLOCK_TYPE: {

-				ClockType clockType = (ClockType)theEObject;

-				T result = caseClockType(clockType);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			if (result == null) {

+				result = defaultCase(theEObject);

 			}

-			case TimePackage.TIMED_ELEMENT: {

-				TimedElement timedElement = (TimedElement)theEObject;

-				T result = caseTimedElement(timedElement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			return result;

+		}

+		case TimePackage.CLOCK_CONSTRAINT: {

+			ClockConstraint clockConstraint = (ClockConstraint) theEObject;

+			T result = caseClockConstraint(clockConstraint);

+			if (result == null) {

+				result = caseNfpConstraint(clockConstraint);

 			}

-			case TimePackage.TIMED_VALUE_SPECIFICATION: {

-				TimedValueSpecification timedValueSpecification = (TimedValueSpecification)theEObject;

-				T result = caseTimedValueSpecification(timedValueSpecification);

-				if (result == null) result = caseTimedElement(timedValueSpecification);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			if (result == null) {

+				result = caseTimedElement(clockConstraint);

 			}

-			case TimePackage.TIMED_CONSTRAINT: {

-				TimedConstraint timedConstraint = (TimedConstraint)theEObject;

-				T result = caseTimedConstraint(timedConstraint);

-				if (result == null) result = caseNfpConstraint(timedConstraint);

-				if (result == null) result = caseTimedElement(timedConstraint);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			if (result == null) {

+				result = defaultCase(theEObject);

 			}

-			case TimePackage.CLOCK_CONSTRAINT: {

-				ClockConstraint clockConstraint = (ClockConstraint)theEObject;

-				T result = caseClockConstraint(clockConstraint);

-				if (result == null) result = caseNfpConstraint(clockConstraint);

-				if (result == null) result = caseTimedElement(clockConstraint);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			return result;

+		}

+		case TimePackage.TIMED_INSTANT_OBSERVATION: {

+			TimedInstantObservation timedInstantObservation = (TimedInstantObservation) theEObject;

+			T result = caseTimedInstantObservation(timedInstantObservation);

+			if (result == null) {

+				result = caseTimedElement(timedInstantObservation);

 			}

-			case TimePackage.TIMED_INSTANT_OBSERVATION: {

-				TimedInstantObservation timedInstantObservation = (TimedInstantObservation)theEObject;

-				T result = caseTimedInstantObservation(timedInstantObservation);

-				if (result == null) result = caseTimedElement(timedInstantObservation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			if (result == null) {

+				result = defaultCase(theEObject);

 			}

-			case TimePackage.TIMED_DURATION_OBSERVATION: {

-				TimedDurationObservation timedDurationObservation = (TimedDurationObservation)theEObject;

-				T result = caseTimedDurationObservation(timedDurationObservation);

-				if (result == null) result = caseTimedElement(timedDurationObservation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			return result;

+		}

+		case TimePackage.TIMED_DURATION_OBSERVATION: {

+			TimedDurationObservation timedDurationObservation = (TimedDurationObservation) theEObject;

+			T result = caseTimedDurationObservation(timedDurationObservation);

+			if (result == null) {

+				result = caseTimedElement(timedDurationObservation);

 			}

-			case TimePackage.TIMED_EVENT: {

-				TimedEvent timedEvent = (TimedEvent)theEObject;

-				T result = caseTimedEvent(timedEvent);

-				if (result == null) result = caseTimedElement(timedEvent);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			if (result == null) {

+				result = defaultCase(theEObject);

 			}

-			case TimePackage.TIMED_PROCESSING: {

-				TimedProcessing timedProcessing = (TimedProcessing)theEObject;

-				T result = caseTimedProcessing(timedProcessing);

-				if (result == null) result = caseTimedElement(timedProcessing);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

+			return result;

+		}

+		case TimePackage.TIMED_EVENT: {

+			TimedEvent timedEvent = (TimedEvent) theEObject;

+			T result = caseTimedEvent(timedEvent);

+			if (result == null) {

+				result = caseTimedElement(timedEvent);

 			}

-			default: return defaultCase(theEObject);

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		case TimePackage.TIMED_PROCESSING: {

+			TimedProcessing timedProcessing = (TimedProcessing) theEObject;

+			T result = caseTimedProcessing(timedProcessing);

+			if (result == null) {

+				result = caseTimedElement(timedProcessing);

+			}

+			if (result == null) {

+				result = defaultCase(theEObject);

+			}

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

@@ -176,7 +217,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Domain</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -191,7 +234,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Clock</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -206,7 +251,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Clock Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -221,7 +268,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -236,7 +285,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Value Specification</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -251,7 +302,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Constraint</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -266,7 +319,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Clock Constraint</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -281,7 +336,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Instant Observation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -296,7 +353,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Duration Observation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -311,7 +370,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Event</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -326,7 +387,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Timed Processing</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -341,7 +404,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Nfp Constraint</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -356,7 +421,9 @@ public class TimeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -366,4 +433,4 @@ public class TimeSwitch<T> extends Switch<T> {
 		return null;

 	}

 

-} //TimeSwitch

+} // TimeSwitch

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java
index f43ef66acf6..38eed71aa3c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

  *

- *    

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -24,6 +24,7 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class TimeXMLProcessor extends XMLProcessor {

@@ -32,17 +33,19 @@ public class TimeXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public TimeXMLProcessor() {

 		super((EPackage.Registry.INSTANCE));

 		TimePackage.eINSTANCE.eClass();

 	}

-	

+

 	/**

 	 * Register for "*" and "xml" file extensions the TimeResourceFactoryImpl factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -55,4 +58,4 @@ public class TimeXMLProcessor extends XMLProcessor {
 		return registrations;

 	}

 

-} //TimeXMLProcessor

+} // TimeXMLProcessor