diff options
| author | Juergen Haug | 2012-09-04 11:48:21 +0000 |
|---|---|---|
| committer | Juergen Haug | 2012-09-04 11:48:21 +0000 |
| commit | bbb4a782fa43b721efa92ff8abbb7055a6020626 (patch) | |
| tree | 8126f914b75dd760acc6fa6b8df5e332270b073c /plugins/org.eclipse.etrice.generator.java/src/org | |
| parent | 6fe05eb4d4a8dc783b7d260156d8f0e9fb16f609 (diff) | |
| parent | d0f8636dbf2dd9ea23bd16314710a09fd29fd24f (diff) | |
| download | org.eclipse.etrice-bbb4a782fa43b721efa92ff8abbb7055a6020626.tar.gz org.eclipse.etrice-bbb4a782fa43b721efa92ff8abbb7055a6020626.tar.xz org.eclipse.etrice-bbb4a782fa43b721efa92ff8abbb7055a6020626.zip | |
Merge remote-tracking branch 'origin/master' into change/7398/5
Conflicts:
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.zip
Change-Id: I5c751db4bdb3e1d3c50e482bac8d185ab600882f
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org')
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend index 43f8c7bd9..83762b97b 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend @@ -67,6 +67,7 @@ class ActorClassGen extends GenericActorClassGenerator { import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
«FOR model : root.getReferencedModels(ac)»
import «model.name».*;
@@ -191,9 +192,7 @@ class ActorClassGen extends GenericActorClassGenerator { public void destroy(){
«IF dtor!=null»
-
- // user defined destructor body
- «AbstractGenerator::getInstance().getTranslatedCode(dtor.detailCode)»
+ «ac.name.destructorCall»;
«ENDIF»
}
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java index 31b0532cd..be430db18 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java @@ -71,6 +71,10 @@ public class JavaTranslationProvider extends DefaultTranslationProvider { if (tag.equals("ifitem.index"))
return "ifitem.getIdx()";
+ if (tag.equals("MODEL_LOCATION")) {
+ return RoomNameProvider.getDetailCodeLocation(code);
+ }
+
logger.logInfo("unrecognized tag '"+tag+"' in "
+RoomNameProvider.getDetailCodeLocation(code)+" of "
+RoomNameProvider.getClassLocation(RoomNameProvider.getModelClass(code)));
|