Work on *.core.profile.esfsafetyconcepts plug-in.

- Refactoring ESFSafetyConceptsUtil.retrieveSafetyArtifacts()

Change-Id: I664d9f0847a4d9f005867f76dcba255f7eb70afc
diff --git a/core/profile/org.polarsys.esf.core.profile.esfsafetyconcepts/src/main/java/org/polarsys/esf/core/profile/esfsafetyconcepts/util/ESFSafetyConceptsUtil.java b/core/profile/org.polarsys.esf.core.profile.esfsafetyconcepts/src/main/java/org/polarsys/esf/core/profile/esfsafetyconcepts/util/ESFSafetyConceptsUtil.java
index 70d6233..79ccf9a 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfsafetyconcepts/src/main/java/org/polarsys/esf/core/profile/esfsafetyconcepts/util/ESFSafetyConceptsUtil.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfsafetyconcepts/src/main/java/org/polarsys/esf/core/profile/esfsafetyconcepts/util/ESFSafetyConceptsUtil.java
@@ -16,7 +16,7 @@
 import org.eclipse.uml2.uml.Model;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.util.UMLUtil;
-import org.polarsys.esf.esfsafetyconcepts.impl.SSafetyArtifacts;
+import org.polarsys.esf.esfsafetyconcepts.ISSafetyArtifacts;
 
 /**
  * The utility class for dealing with SafetyArtifacts package.
@@ -34,25 +34,25 @@
     }
 
     /**
-     * Retrieve SafetyArtifacts package.
+     * Retrieve SafetyArtifacts.
      *
      * @param pESFModel ESFModel root
-     * @return The SafetyArtifacts package
+     * @return The SafetyArtifacts
      */
-    public static Package retrieveSafetyArtifactsPackage(final Model pESFModel) {
-        Package vSafetyArtifactsPackage = null;
+    public static ISSafetyArtifacts retrieveSafetyArtifacts(final Model pESFModel) {
+        ISSafetyArtifacts vSafetyArtifacts = null;
         Boolean vFound = false;
         List<Package> vPackagesList = pESFModel.getNestedPackages();
         Iterator<Package> vIterator = vPackagesList.iterator();
 
-        while (vFound == false && vIterator.hasNext()) {
+        while (!vFound && vIterator.hasNext()) {
             Package vPackage = vIterator.next();
-            if (UMLUtil.getStereotypeApplication(vPackage, SSafetyArtifacts.class) != null) {
+            if (UMLUtil.getStereotypeApplication(vPackage, ISSafetyArtifacts.class) != null) {
                 vFound = true;
-                vSafetyArtifactsPackage = vPackage;
+                vSafetyArtifacts = (ISSafetyArtifacts) vPackage;
             }
         }
-        return vSafetyArtifactsPackage;
+        return vSafetyArtifacts;
     }
 
 }