Merge pull request #147 from Yakindu/145-initial-model

create initial model without annotation for execution semantics
itemisCREATE · Sep 7, 2018 · b79cb3f · b79cb3f
2 parents 09d68be + 4c5d6e0
commit b79cb3f
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 2 deletions.
diff --git a/examples/com.yakindu.solidity.examples/.settings/org.eclipse.core.resources.prefs b/examples/com.yakindu.solidity.examples/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//solidity/default.sct=UTF-8
diff --git a/plugins/com.yakindu.sct.domain.solidity.ui/.classpath b/plugins/com.yakindu.sct.domain.solidity.ui/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/com.yakindu.sct.domain.solidity.ui/.project b/plugins/com.yakindu.sct.domain.solidity.ui/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -24,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/com.yakindu.sct.domain.solidity.ui/META-INF/MANIFEST.MF b/plugins/com.yakindu.sct.domain.solidity.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.ui,
  org.yakindu.sct.model.stext.ui,
  com.yakindu.solidity,
- com.yakindu.solidity.ui
+ com.yakindu.solidity.ui,
+ org.yakindu.sct.ui.editor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: com.yakindu.sct.domain.solidity.ui
diff --git a/plugins/com.yakindu.sct.domain.solidity.ui/build.properties b/plugins/com.yakindu.sct.domain.solidity.ui/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

diff --git a/....ui/src/com/yakindu/sct/domain/solidity/ui/editor/SolidityDomainEditorModuleProvider.java b/....ui/src/com/yakindu/sct/domain/solidity/ui/editor/SolidityDomainEditorModuleProvider.java
@@ -10,11 +10,15 @@
 
 import org.yakindu.sct.domain.extension.IModuleProvider;
 import org.yakindu.sct.domain.generic.editor.EditorModuleProvider;
+import org.yakindu.sct.ui.editor.wizards.IModelCreator;
 
+import com.google.inject.Binder;
 import com.google.inject.Module;
+import com.google.inject.util.Modules;
 import com.yakindu.sct.domain.solidity.modules.SolidityRuntimeModule;
 import com.yakindu.sct.domain.solidity.ui.SolidityUIActivator;
 import com.yakindu.sct.domain.solidity.ui.SolidityUIModule;
+
 /**
  * 
  * @author Andreas Muelder - Initial contribution and API
@@ -32,4 +36,13 @@ protected Module getLanguageUiModule() {
 		return new SolidityUIModule(SolidityUIActivator.getDefault());
 
 	}
+	@Override
+	public Module getModule(String... options) {
+		return Modules.combine(super.getModule(options), new Module() {
+			@Override
+			public void configure(Binder binder) {
+				binder.bind(IModelCreator.class).to(SolidityModelCreator.class);
+			}
+		});
+	}
 }
diff --git a/...main.solidity.ui/src/com/yakindu/sct/domain/solidity/ui/editor/SolidityModelCreator.xtend b/...main.solidity.ui/src/com/yakindu/sct/domain/solidity/ui/editor/SolidityModelCreator.xtend
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2018 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ */
+package com.yakindu.sct.domain.solidity.ui.editor
+
+import org.yakindu.sct.ui.editor.wizards.DefaultModelCreator
+
+/**
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+class SolidityModelCreator extends DefaultModelCreator {
+
+	override protected getInitialSpecification() {
+		'''
+			interface:
+			// Define events and variables here. 
+			// Use CTRL + Space for content assist.;
+		'''
+	}
+}