Clean Up

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9709 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/CompositediagramModuleBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray GuiceModule.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray GuiceModule.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramDiagramTypeProvider.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray DiagramTypeProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray DiagramTypeProvider.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramDiagramTypeProviderBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray DiagramTypeProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray DiagramTypeProvider.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramFeatureProvider.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray FeatureProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray FeatureProvider.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramFeatureProviderBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray FeatureProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray FeatureProvider.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramImageProvider.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray ImageProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray ImageProvider.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramImageProviderBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray ImageProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray ImageProvider.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramModelService.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray ModelService.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray ModelService.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code
@@ -68,12 +68,19 @@ public class CompositediagramModelService implements ISprayConstants {
         ResourceSet set = r.getResourceSet();
         EObject bo = (EObject) dtp.getFeatureProvider().getBusinessObjectForPictogramElement(diagram);
         Repository model = null;
-        // If its a proxy, resolve it
-        if (bo != null && bo.eIsProxy()) {
-            if (bo instanceof InternalEObject) {
-                model = (Repository) set.getEObject(((InternalEObject) bo).eProxyURI(), true);
+        if (bo != null) {
+            // If its a proxy, resolve it
+            if (bo.eIsProxy()) {
+                if (bo instanceof InternalEObject) {
+                    model = (Repository) set.getEObject(((InternalEObject) bo).eProxyURI(), true);
+                }
+            } else {
+                if (bo instanceof Repository) {
+                    model = (Repository) bo;
+                }
             }
         }
+
         if (model == null) {
             model = createModel();
         }

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramToolBehaviorProvider.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray ToolBehaviorProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray ToolBehaviorProvider.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/diagram/CompositediagramToolBehaviorProviderBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray ToolBehaviorProvider.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray ToolBehaviorProvider.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramAddAssemblyContextFeature.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray AddShapeFromDslFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray AddShapeFromDslFeature.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramAddAssemblyContextFeatureBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray AddShapeFromDslFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray AddShapeFromDslFeature.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code
@@ -53,7 +53,7 @@ public abstract class CompositediagramAddAssemblyContextFeatureBase extends Abst
                 // OLD STUFF
                 final Object target = getBusinessObjectForPictogramElement(context.getTargetContainer());
                 // NEW stuff
-                // cls CompositeComponent refers to this metaClass
+                // cls CompositeComponent refers to this metaClass?
                 if (target instanceof edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeComponent) {
                     if (SprayLayoutService.isCompartment(context.getTargetContainer())) {
                         String id = GraphitiProperties.get(context.getTargetContainer(), TEXT_ID);

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramAddCompositeComponentFeature.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray AddShapeFromDslFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray AddShapeFromDslFeature.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramAddCompositeComponentFeatureBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray AddShapeFromDslFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray AddShapeFromDslFeature.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramCopyFeature.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:48 CET 2013 by Spray CopyFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray CopyFeature.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramCopyFeatureBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:48 CET 2013 by Spray CopyFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray CopyFeature.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramCreateAssemblyContextFeature.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray CreateShapeFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray CreateShapeFeature.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramCreateAssemblyContextFeatureBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray CreateShapeFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray CreateShapeFeature.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramCreateCompositeComponentFeature.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray CreateShapeFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray CreateShapeFeature.xtend
  * 
  * This file is an extension point: copy to "src" folder to manually add code to this
  * extension point.

edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src-gen/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/features/CompositediagramCreateCompositeComponentFeatureBase.java

 /*************************************************************************************
  *
- * Generated on Thu Jan 03 18:22:47 CET 2013 by Spray CreateShapeFeature.xtend
+ * Generated on Thu Jan 10 09:46:29 CET 2013 by Spray CreateShapeFeature.xtend
  *
  * This file contains generated and should not be changed.
  * Use the extension point class (the direct subclass of this class) to add manual code
@@ -73,7 +73,7 @@ public abstract class CompositediagramCreateCompositeComponentFeatureBase extend
         return new Object[]{newClass};
     }
 
-    //       org.eclipse.emf.ecore.impl.EReferenceImpl@69597c46 (name: components) (ordered: false, unique: true, lowerBound: 0, upperBound: -1) (changeable: true, volatile: false, transient: false, defaultValueLiteral: null, unsettable: false, derived: false) (containment: true, resolveProxies: true) 
+    //       org.eclipse.emf.ecore.impl.EReferenceImpl@568e0556 (name: components) (ordered: false, unique: true, lowerBound: 0, upperBound: -1) (changeable: true, volatile: false, transient: false, defaultValueLiteral: null, unsettable: false, derived: false) (containment: true, resolveProxies: true) 
 
     /**
      * Creates a new {@link CompositeComponent} instance and adds it to the containing type.