Merge pull request eclipse-vorto#182 from bsinno/feature/single_project

Support for a single project containing many vorto models + Perspective
bosch-io · May 24, 2016 · d96d631 · d96d631
2 parents 6100932 + 6501baa
commit d96d631
Show file tree

Hide file tree

Showing 131 changed files with 2,203 additions and 3,726 deletions.
diff --git a/...o.codegen.ui/src/org/eclipse/vorto/codegen/ui/handler/CodeGeneratorInvocationHandler.java b/...o.codegen.ui/src/org/eclipse/vorto/codegen/ui/handler/CodeGeneratorInvocationHandler.java
@@ -25,8 +25,9 @@
 import org.eclipse.vorto.codegen.ui.utils.PlatformUtils;
 import org.eclipse.vorto.core.api.model.informationmodel.InformationModel;
 import org.eclipse.vorto.core.api.model.mapping.MappingModel;
-import org.eclipse.vorto.core.model.IModelProject;
-import org.eclipse.vorto.core.service.ModelProjectServiceFactory;
+import org.eclipse.vorto.core.ui.model.IModelElement;
+import org.eclipse.vorto.core.ui.model.IModelProject;
+import org.eclipse.vorto.core.ui.model.ModelProjectFactory;
 
 /**
  * 
@@ -55,9 +56,11 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 	private void evaluate(String generatorName) {
 
 		final IConfigurationElement[] configElements = getUserSelectedGenerators(generatorName);
-		IModelProject selectedProject = ModelProjectServiceFactory.getDefault().getProjectFromSelection();
+
+
+		IModelElement selectedElement = ModelProjectFactory.getInstance().getModelElementFromSelection();
 
-		InformationModel informationModel = (InformationModel) selectedProject.getModel();
+		InformationModel informationModel = (InformationModel) selectedElement.getModel();
 
 		for (IConfigurationElement e : configElements) {
 			try {
@@ -71,7 +74,7 @@ private void evaluate(String generatorName) {
 				IVortoCodeGenerator informationModelCodeGenerator = (IVortoCodeGenerator) codeGenerator;
 
 				CodeGeneratorTaskExecutor.execute(informationModel, informationModelCodeGenerator,
-						createMappingContext(selectedProject, informationModelCodeGenerator.getServiceKey()));
+						createMappingContext(selectedElement.getProject(), informationModelCodeGenerator.getServiceKey()));
 
 			} catch (Exception e1) {
 				MessageDisplayFactory.getMessageDisplay().displayError(e1);

diff --git a/...pse.vorto.codegen.ui/src/org/eclipse/vorto/codegen/ui/handler/PopulateGeneratorsMenu.java b/...pse.vorto.codegen.ui/src/org/eclipse/vorto/codegen/ui/handler/PopulateGeneratorsMenu.java
@@ -41,6 +41,7 @@ public class PopulateGeneratorsMenu extends CompoundContributionItem {
 	private static final String CLASS = "class";
 	private static final String MENU_LABEL = "menuLabel";
 
+
 	public PopulateGeneratorsMenu() {
 	}
 

diff --git a/bundles/org.eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/AllCoreTests.java b/bundles/org.eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/AllCoreTests.java
diff --git a/...rg.eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/EntityMappingTest.java b/...rg.eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/EntityMappingTest.java
diff --git a/.../org.eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/EnumMappingTest.java b/.../org.eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/EnumMappingTest.java
diff --git a/...pse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/FunctionBlockMappingTest.java b/...pse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/FunctionBlockMappingTest.java
diff --git a/...eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/InfoModelMappingTest.java b/...eclipse.vorto.core.tests/src/org/eclipse/vorto/core/tests/model/InfoModelMappingTest.java
-Original file line number
+Diff line change
@@ Expand Up @@
     	private static final String CLASS = "class";
     	private static final String MENU_LABEL = "menuLabel";
     	public PopulateGeneratorsMenu() {
     	}
@@ Expand Down @@