use standalone setup

Author: yanntm

ITS-commandline/fr.lip6.move.gal.itscl.application/src/fr/lip6/move/gal/itscl/application/Application.java

@@ -102,6 +102,7 @@ public Object start(IApplicationContext context) throws Exception {
 			spec = SerializationUtil.fileToGalSystem(inputff);		
 			System.out.println("Successfully read input file : " + inputff +" in " + (time - System.currentTimeMillis()) + " ms.");
 		} else if (ff.getName().endsWith(".ahg")) {
+			AHGSerializationUtil.setStandalone(true);
 			AttackHyperGraph ahg = AHGSerializationUtil.fileToAttackHyperGraph(inputff);
 			spec = AHGToGALTransformer.transformToGAL(ahg, modelName);
 			System.out.println("Successfully read input file : " + inputff + " and translated to GAL in "

ahg/fr.lip6.move.ahg/src/fr/lip6/move/serialization/AHGSerializationUtil.java

@@ -17,13 +17,19 @@
 import com.google.inject.Injector;
 
 import fr.lip6.move.AhgRuntimeModule;
+import fr.lip6.move.AhgStandaloneSetup;
 import fr.lip6.move.ahg.AttackHyperGraph;
 
 /**
  * Utility class for serialization of gal system
  */
 public class AHGSerializationUtil  {
 
+	private static boolean isStandalone = false;
+	
+	public static void setStandalone(boolean isStandalone) {
+		AHGSerializationUtil.isStandalone = isStandalone;
+	}
 
 	/**
 	 * Create a new file and return a Resource from this file.
@@ -46,14 +52,17 @@ private static Resource createResource(String filename)
 			return null ;
 		}
 	}
-
 	private static Injector createInjector() {
-		return Guice.createInjector(new AhgRuntimeModule());
+		if (isStandalone) {
+			AhgStandaloneSetup gs = new AhgStandaloneSetup();
+			return gs.createInjectorAndDoEMFRegistration();
+		} else { 
+			return Guice.createInjector(new AhgRuntimeModule());
+		}
 	}
-
 
 	/**
-	 * This method serialize a Divine System in the file {@code filename} 
+	 * This method serialize a AHG System in the file {@code filename} 
 	 * @param system The root of Gal system
 	 * @param filename The output filename.
 	 */