Squashed vorto devtool commits

Signed-off-by: shiv12095 <[email protected]>

bundles/org.eclipse.vorto.editor.functionblock.ide/META-INF/MANIFEST.MF

@@ -0,0 +1,15 @@
+FManifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.vorto.editor.functionblock.ide
+Bundle-Vendor: My Company
+Bundle-Version: 0.9.0.qualifier
+Bundle-SymbolicName: org.eclipse.vorto.editor.functionblock.ide;singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.vorto.editor.functionblock,
+ org.eclipse.xtext.ide,
+ org.eclipse.xtext.xbase.ide
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.vorto.editor.functionblock.ide.contentassist.antlr,
+ org.eclipse.vorto.editor.functionblock.ide.contentassist.antlr.internal
+Import-Package: org.eclipse.vorto.editor.datatype.services,
+ org.eclipse.vorto.editor.functionblock.services

bundles/org.eclipse.vorto.editor.functionblock.ide/build.properties

@@ -0,0 +1,5 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/

bundles/org.eclipse.vorto.editor.functionblock.ide/pom.xml

@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 	<modelVersion>4.0.0</modelVersion>
+
+ 	<parent>
+ 		<groupId>org.eclipse.vorto</groupId>
+ 		<artifactId>bundles</artifactId>
+ 		<version>0.9.0-SNAPSHOT</version>
+ 	</parent>
+
+ 	<artifactId>org.eclipse.vorto.editor.functionblock.ide</artifactId>
+ 	<packaging>eclipse-plugin</packaging>
+
+ 	<name>Function Block Editor Plugin IDE</name>
+
+ 	<build>
+ 		<plugins>
+ 			<plugin>
+ 				<groupId>org.eclipse.xtend</groupId>
+ 				<artifactId>xtend-maven-plugin</artifactId>
+ 			</plugin>
+ 		</plugins>
+ 	</build>
+
+</project> 

bundles/org.eclipse.vorto.editor.functionblock.tests/META-INF/MANIFEST.MF

@@ -18,10 +18,11 @@ Require-Bundle: org.eclipse.vorto.editor.functionblock.ui,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.vorto.editor.functionblock
-Import-Package: org.junit.runner;version="4.5.0",
- org.junit.runners;version="4.5.0",
+Export-Package: org.eclipse.vorto.editor.functionblock.tests
+Import-Package: org.hamcrest.core,
+ org.junit;version="4.5.0",
+ org.junit.runner;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
  org.junit.runner.notification;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
- org.hamcrest.core
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0"

bundles/org.eclipse.vorto.editor.functionblock.tests/build.properties

@@ -1,5 +1,6 @@
 source.. = src/,\
-           xtend-gen/
+           xtend-gen/,\
+           src-gen/
 bin.includes = META-INF/,\
                .,\
                about.html

bundles/org.eclipse.vorto.editor.functionblock.tests/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>org.eclipse.vorto.editor.functionblock.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
-	<name>Vorto Functionblock Editor Tests</name>
+	<name>Vorto Function Block Editor Tests</name>
 
 	<build>
 		<plugins>

bundles/org.eclipse.vorto.editor.functionblock.tests/src/org/eclipse/vorto/editor/functionblock/AllEditorTests.java → bundles/org.eclipse.vorto.editor.functionblock.tests/src/org/eclipse/vorto/editor/functionblock/tests/AllEditorTests.java

@@ -1,18 +1,18 @@
-/**
- * Copyright (c) 2015-2016 Bosch Software Innovations GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Eclipse Distribution License v1.0 which accompany this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * The Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- * Bosch Software Innovations GmbH - Please refer to git log
- */
-package org.eclipse.vorto.editor.functionblock;
+/*******************************************************************************
+ *  Copyright (c) 2015,2016 Bosch Software Innovations GmbH and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  and Eclipse Distribution License v1.0 which accompany this distribution.
+ *   
+ *  The Eclipse Public License is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  The Eclipse Distribution License is available at
+ *  http://www.eclipse.org/org/documents/edl-v10.php.
+ *   
+ *  Contributors:
+ *  Bosch Software Innovations GmbH - Please refer to git log
+ *******************************************************************************/
+package org.eclipse.vorto.editor.functionblock.tests;
 
 import org.eclipse.vorto.editor.functionblock.tests.formatter.FunctionblockModelFormatterTest;
 import org.eclipse.vorto.editor.functionblock.tests.validator.FBEntityEnumCrossReferenceTest;

bundles/org.eclipse.vorto.editor.functionblock.tests/src/org/eclipse/vorto/editor/functionblock/tests/FunctionblockParsingTest.xtend

@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Bosch Software Innovations GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * The Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Bosch Software Innovations GmbH - Please refer to git log
+ *
+ *******************************************************************************/
+/*
+ * generated by Xtext
+ */
+package org.eclipse.vorto.editor.functionblock.tests
+
+import com.google.inject.Inject
+import org.eclipse.vorto.core.api.model.functionblock.FunctionblockModel
+import org.eclipse.vorto.core.api.model.functionblock.impl.FunctionblockPackageImpl
+import org.eclipse.xtext.junit4.InjectWith
+import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.junit4.util.ParseHelper
+import org.junit.Assert
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(typeof(XtextRunner))
+@InjectWith(typeof(FunctionblockInjectorProvider))
+class FunctionblockParsingTest{
+
+	@Inject extension ParseHelper<FunctionblockModel> parserHelper;
+
+	@BeforeClass
+	def static void initializeModel() {
+		FunctionblockPackageImpl.init();
+	}
+
+	@Test 
+	def void loadModel() {
+		val result = parserHelper.parse('''
+			Hello Xtext!
+		''')
+		Assert.assertNotNull(result)
+	}
+
+}

bundles/org.eclipse.vorto.editor.functionblock.tests/src/org/eclipse/vorto/editor/functionblock/tests/formatter/FunctionblockModelFormatterTest.xtend

@@ -1,10 +1,10 @@
 package org.eclipse.vorto.editor.functionblock.tests.formatter
 
 import com.google.inject.Inject
+import org.eclipse.vorto.core.api.model.functionblock.FunctionblockModel
 import org.eclipse.vorto.core.api.model.functionblock.impl.FunctionblockPackageImpl
-import org.eclipse.vorto.editor.functionblock.FunctionblockInjectorProvider
+import org.eclipse.vorto.editor.functionblock.tests.FunctionblockInjectorProvider
 import org.eclipse.xtext.formatting.INodeModelFormatter
-import org.eclipse.vorto.core.api.model.functionblock.FunctionblockModel
 import org.eclipse.xtext.junit4.AbstractXtextTests
 import org.eclipse.xtext.junit4.InjectWith
 import org.eclipse.xtext.junit4.XtextRunner

bundles/org.eclipse.vorto.editor.functionblock.ui/META-INF/MANIFEST.MF

@@ -1,32 +1,32 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Vorto Functionblock Editor UI (Incubation)
-Bundle-Vendor: Eclipse.org/Vorto
-Bundle-Version: 0.9.0.qualifier
-Bundle-SymbolicName: org.eclipse.vorto.editor.functionblock.ui;singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.compare,
- org.eclipse.vorto.editor.datatype,
- org.eclipse.vorto.editor.datatype.ui,
- org.eclipse.vorto.editor.functionblock,
- org.eclipse.vorto.core,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.vorto.editor.functionblock.ui,org.eclipse.
- vorto.editor.functionblock.ui.contentassist,org.eclipse.vorto.editor.
- functionblock.ui.contentassist.antlr,org.eclipse.vorto.editor.functio
- nblock.ui.contentassist.antlr.internal,org.eclipse.vorto.editor.funct
- ionblock.ui.internal,org.eclipse.vorto.editor.functionblock.ui.quickf
- ix
-Bundle-ClassPath: templates/,.,icons/
-Import-Package: org.apache.log4j
-Bundle-Activator: org.eclipse.vorto.editor.functionblock.ui.internal.FunctionblockActivator
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Vorto Functionblock Editor UI (Incubation)
+Bundle-Vendor: Eclipse.org/Vorto
+Bundle-Version: 0.9.0.qualifier
+Bundle-SymbolicName: org.eclipse.vorto.editor.functionblock.ui;singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext.ui,
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.ui,
+ org.eclipse.xtext.builder,
+ org.antlr.runtime,
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.compare,
+ org.eclipse.vorto.editor.datatype,
+ org.eclipse.vorto.editor.datatype.ui,
+ org.eclipse.vorto.editor.functionblock,
+ org.eclipse.vorto.editor.functionblock.ide,
+ org.eclipse.vorto.core,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib;resolution:=optional
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.vorto.editor.functionblock.ui,
+ org.eclipse.vorto.editor.functionblock.ui.contentassist,
+ org.eclipse.vorto.editor.functionblock.ui.internal,
+ org.eclipse.vorto.editor.functionblock.ui.quickfix
+Bundle-ClassPath: templates/,.,icons/
+Import-Package: org.apache.log4j
+Bundle-Activator: org.eclipse.vorto.editor.functionblock.ui.internal.FunctionblockActivator

bundles/org.eclipse.vorto.editor.functionblock.ui/src/org/eclipse/vorto/editor/functionblock/ui/FunctionblockUiModule.java → bundles/org.eclipse.vorto.editor.functionblock.ui/src/org/eclipse/vorto/editor/functionblock/ui/FunctionblockUiModule.xtend

@@ -1,32 +1,28 @@
-/**
- * Copyright (c) 2015-2016 Bosch Software Innovations GmbH and others.
+/** 
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
- *
  * The Eclipse Public License is available at
  * http://www.eclipse.org/legal/epl-v10.html
  * The Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
- *
  * Contributors:
  * Bosch Software Innovations GmbH - Please refer to git log
  */
+package
 /*
  * generated by Xtext
  */
-package org.eclipse.vorto.editor.functionblock.ui;
+org.eclipse.vorto.editor.functionblock.ui
 
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.plugin.AbstractUIPlugin
 
-/**
- * 
- * 
+/** 
  * Use this class to register components to be used within the IDE.
  */
-public class FunctionblockUiModule extends
-		org.eclipse.vorto.editor.functionblock.ui.AbstractFunctionblockUiModule {
-	public FunctionblockUiModule(AbstractUIPlugin plugin) {
-		super(plugin);
+class FunctionblockUiModule extends org.eclipse.vorto.editor.functionblock.ui.AbstractFunctionblockUiModule {
+	new(AbstractUIPlugin plugin) {
+		super(plugin)
 	}
 }

bundles/org.eclipse.vorto.editor.functionblock.web/.gitignore

@@ -0,0 +1 @@
+/WebRoot/