Merge pull request #1 from ps-watchapp/backend

Backend

de.wwu.md2.framework/src/de/wwu/md2/framework/MD2RuntimeModule.java

@@ -30,7 +30,7 @@ public void configure(Binder binder) {
 		// Bind all generators here		
 		//multiGenBinder.addBinding().to(IOSGenerator.class);
 		//multiGenBinder.addBinding().to(AndroidLollipopGenerator.class);
-		//multiGenBinder.addBinding().to(BackendGenerator.class);
+		multiGenBinder.addBinding().to(BackendGenerator.class);
 		multiGenBinder.addBinding().to(AndroidWearableGenerator.class);
 		//multiGenBinder.addBinding().to(TestGenerator.class);
 		//multiGenBinder.addBinding().to(MapAppsGenerator.class);

de.wwu.md2.framework/src/de/wwu/md2/framework/generator/android/wearable/misc/GradleGen.xtend

@@ -74,6 +74,7 @@ class GradleGen {
 		       compile 'com.google.android.support:wearable:2.0.1'
 		       compile 'com.google.android.gms:play-services-wearable:10.2.1'
 		       compile group: 'com.j256.ormlite', name: 'ormlite-android', version: '4.45'
+		       compile 'com.google.code.gson:gson:2.8.0'
 
 		}
 	'''

de.wwu.md2.framework/src/de/wwu/md2/framework/generator/android/wearable/model/ContentProviderGen.xtend

@@ -158,8 +158,8 @@ import «Settings.MD2LIBRARY_PACKAGE»controller.eventhandler.implementation.Md2
 			        if ((this.getValue(name) == null && value != null) || !this.getValue(name).equals(value)) {
 			        switch (name){
 			        			«FOR attribute: (content.entity as Entity).attributes»			
-			        			case "«attribute.name»":   ((«(content.entity as Entity).name»)content).set«attribute.name.toFirstUpper»(((«IF attribute.type.many»
-			        				Md2List«ELSE»«getMd2TypeStringForAttributeType(attribute.type)»«ENDIF») value)«IF attribute.type instanceof ReferencedType && !attribute.type.many»
+			        			case "«attribute.name»":   ((«(content.entity as Entity).name»)content).set«attribute.name.toFirstUpper»(((«IF attribute.type.many»
+			        				Md2List«ELSE»«getMd2TypeStringForAttributeType(attribute.type)»«ENDIF») value)«IF attribute.type instanceof ReferencedType && !attribute.type.many»
 			        				);
 			        				«ELSEIF attribute.type.many»
 			        				.getContents());

de.wwu.md2.framework/src/de/wwu/md2/framework/generator/android/wearable/model/EntityGen.xtend

@@ -108,6 +108,7 @@ public class «entity.name.toFirstUpper» extends AbstractMd2Entity {
 @DatabaseTable(tableName = "«entity.name.toFirstLower»")
 		public class «entity.name.toFirstUpper»  implements Serializable,Md2Entity{
 		
+		@SerializedName("__internalId")
 		@DatabaseField(generatedId = true, columnName = "id")
 		    private long id;