diff options
| author | Henrik Rentz-Reichert | 2012-09-11 08:02:27 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-09-11 08:02:27 +0000 |
| commit | 84d7579c94b310ce805810c3c8b90e6a69b3282f (patch) | |
| tree | 63640c39b4de908951edd8e5ea07a7787593caf2 /plugins/org.eclipse.etrice.generator.fsmtest | |
| parent | a49fd8507422c6ea39179a3ddf18b1d3bdd8811a (diff) | |
| parent | bbb4a782fa43b721efa92ff8abbb7055a6020626 (diff) | |
| download | org.eclipse.etrice-84d7579c94b310ce805810c3c8b90e6a69b3282f.tar.gz org.eclipse.etrice-84d7579c94b310ce805810c3c8b90e6a69b3282f.tar.xz org.eclipse.etrice-84d7579c94b310ce805810c3c8b90e6a69b3282f.zip | |
Merge branch 'change/7581/1'
Conflicts:
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
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
runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java
runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java
runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java
runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.fsmtest')
2 files changed, 11 insertions, 11 deletions
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/.FSMtestGenerator.java._trace b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/.FSMtestGenerator.java._trace Binary files differdeleted file mode 100644 index 3804e4237..000000000 --- a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/.FSMtestGenerator.java._trace +++ /dev/null diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java index 2e0d9715a..85ec4254a 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java +++ b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java @@ -1,11 +1,11 @@ -package org.eclipse.etrice.generator.generator; - -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.generator.IFileSystemAccess; -import org.eclipse.xtext.generator.IGenerator; - -@SuppressWarnings("all") -public class FSMtestGenerator implements IGenerator { - public void doGenerate(final Resource resource, final IFileSystemAccess fsa) { - } -} +package org.eclipse.etrice.generator.generator;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.generator.IFileSystemAccess;
+import org.eclipse.xtext.generator.IGenerator;
+
+@SuppressWarnings("all")
+public class FSMtestGenerator implements IGenerator {
+ public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+ }
+}
|