switched to usage of generic platform architecture

CanConnector still not working

org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore

@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.fortiss.org/af3/platform/raspberry"
     nsPrefix="org-fortiss-af3-platform-raspberry">
-  <eClassifiers xsi:type="ecore:EClass" name="RaspberryPi" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CanBus" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//TransmissionUnit"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CanConnector" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RaspberryPi" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericExecutionUnit"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CanBus" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericTransmissionUnit"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CanConnector" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericTransceiver"/>
 </ecore:EPackage>

org.fortiss.af3.platform.raspberry/trunk/plugin.xml

@@ -20,7 +20,7 @@
    <extension
          point="org.fortiss.tooling.kernel.modelElementCompositor">
       <modelElementCompositor
-            compositor="org.fortiss.af3.platform.raspberry.compose.RaspberryPiCompositor.java">
+            compositor="org.fortiss.af3.platform.raspberry.compose.RaspberryPiCompositor">
          <modelElementClass
                modelElementClass="org.fortiss.af3.platform.raspberry.model.RaspberryPi">
          </modelElementClass>

org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/CanBusCompositor.java

@@ -39,11 +39,13 @@ public class CanBusCompositor extends
 	@Override
 	protected boolean isCorrectElementClass(IPlatformArchitectureElement container,
 			EObject contained) {
+		final boolean instanceOfAny = isInstanceOfAny(contained, CanConnector.class);
 		if(container != null) {
-			return isInstanceOfAny(container, CanBus.class) &&
-					isInstanceOfAny(contained, CanConnector.class);
+			final boolean instanceOfAny2 = isInstanceOfAny(container, CanBus.class);
+			return instanceOfAny2 &&
+					instanceOfAny;
 		}
-		return isInstanceOfAny(contained, CanConnector.class);
+		return instanceOfAny;
 	}
 
 }

org.fortiss.af3.platform.raspberry/trunk/src/org/fortiss/af3/platform/raspberry/compose/RaspberryPiCompositor.java

@@ -39,11 +39,13 @@ public class RaspberryPiCompositor extends
 	@Override
 	protected boolean isCorrectElementClass(IPlatformArchitectureElement container,
 			EObject contained) {
+		final boolean instanceOfAny2 = isInstanceOfAny(contained, CanConnector.class);
 		if(container != null) {
-			return isInstanceOfAny(container, RaspberryPi.class) &&
-					isInstanceOfAny(contained, CanConnector.class);
+			final boolean instanceOfAny = isInstanceOfAny(container, RaspberryPi.class);
+			return instanceOfAny &&
+					instanceOfAny2;
 		}
-		return isInstanceOfAny(contained, CanConnector.class);
+		return instanceOfAny2;
 	}
 
 }