[stp-commits] r3326 - org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.comp

[genie@xxxxxxxxxxx]

Author: sdrapeau
Date: 2009-09-15 12:54:16 -0400 (Tue, 15 Sep 2009)
New Revision: 3326

Modified:
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.compositeshell/src/org/eclipse/stp/sca/compositeshell/CompositeShellGenerator.java
Log:
Fix for bug #289475

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.compositeshell/src/org/eclipse/stp/sca/compositeshell/CompositeShellGenerator.java
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.compositeshell/src/org/eclipse/stp/sca/compositeshell/CompositeShellGenerator.java	2009-09-15 16:50:14 UTC (rev 3325)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.compositeshell/src/org/eclipse/stp/sca/compositeshell/CompositeShellGenerator.java	2009-09-15 16:54:16 UTC (rev 3326)
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *    Obeo - initial API and implementation
+ *    Shaikh - removal of common used function
  */
 package org.eclipse.stp.sca.compositeshell;
 
@@ -16,13 +17,10 @@
 import javax.xml.namespace.QName;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.Diagnostician;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 import org.eclipse.stp.sca.Component;
@@ -35,6 +33,7 @@
 import org.eclipse.stp.sca.ScaFactory;
 import org.eclipse.stp.sca.ScaPackage;
 import org.eclipse.stp.sca.Service;
+import org.eclipse.stp.sca.util.ScaCompositeUtils;
 import org.eclipse.stp.sca.util.ScaResourceFactoryImpl;
 
 /**
@@ -55,7 +54,7 @@
 	}
 
 	public void createCompositeShell() {
-		Composite initialComposite = this.getComposite();
+		Composite initialComposite = ScaCompositeUtils.getComposite(compositeFile);
 		if (initialComposite == null) {
 			//TODO
 		} else if (!this.createCompositeShell(initialComposite)) {
@@ -63,42 +62,6 @@
 		}
 	}
 
-	private Composite getComposite() {
-		Composite result = null;
-		// Create a resource set to hold the resources.
-		ResourceSet resourceSet = new ResourceSetImpl();
-		// Register the appropriate resource factory to handle all file
-		// extensions.
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-				.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-						new ScaResourceFactoryImpl());
-		// Register the package to ensure it is available during loading.
-		resourceSet.getPackageRegistry().put(ScaPackage.eNS_URI,
-				ScaPackage.eINSTANCE);
-		URI uri = URI.createFileURI(compositeFile.getFullPath().toString());
-		try {
-			// Demand load resource for this file.
-			Resource resource = resourceSet.getResource(uri, true);
-			// Validate the contents of the loaded resource.
-			for (EObject eObject : resource.getContents()) {
-				Diagnostic diagnostic = Diagnostician.INSTANCE
-						.validate(eObject);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					// TODO
-					
-				} else {
-					if (eObject instanceof DocumentRoot) {
-						result = ((DocumentRoot) eObject).getComposite();
-					}
-				}
-			}
-		} catch (RuntimeException exception) {
-			//TODO
-			exception.printStackTrace();
-		}
-		return result;
-	}
-
 	private boolean createCompositeShell(Composite initialComposite) {
 		boolean result = false;
 		// Create a resource set to hold the resources.