catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF
index 1ebe036..994f92a 100644
--- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF
@@ -51,7 +51,6 @@
org.eclipse.osbp.osgi.hybrid.api;bundle-version="0.9.0",
org.apache.commons.lang;bundle-version="2.6.0",
org.eclipse.osbp.datainterchange.api;bundle-version="0.9.0",
- org.eclipse.osbp.xtext.datainterchange;bundle-version="0.9.0",
org.eclipse.osbp.persistence;bundle-version="0.9.0",
org.jsoup;bundle-version="1.8.3",
org.eclipse.xtend.lib.macro,
@@ -63,7 +62,8 @@
org.eclipse.osbp.bpm.api;bundle-version="0.9.0",
org.eclipse.osbp.ecview.dsl;bundle-version="0.9.0",
org.eclipse.osbp.vaaclipse.addons.common.api;bundle-version="0.9.0",
- mondrian.osgi
+ mondrian.osgi,
+ org.eclipse.osbp.xtext.datainterchange;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.annotation,
javax.validation,
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java
index f799d3b..f8dd1da 100644
--- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java
@@ -92,7 +92,7 @@
import org.eclipse.osbp.xtext.chart.ChartDSLPackage;
import org.eclipse.osbp.xtext.chart.ChartPackage;
import org.eclipse.osbp.xtext.datainterchange.DataDSLPackage;
-import org.eclipse.osbp.xtext.datainterchange.DataInterchangePackage;
+import org.eclipse.osbp.xtext.datainterchange.DataInterchangeGroup;
import org.eclipse.osbp.xtext.dialogdsl.Dialog;
import org.eclipse.osbp.xtext.dialogdsl.DialogDSLPackage;
import org.eclipse.osbp.xtext.dialogdsl.DialogPackage;
@@ -699,8 +699,8 @@
DialogPackage pkg = (DialogPackage) object.eContainer();
return pkg == null ? "" : toFQN(pkg.getName(), object.getName());
} else if (viewModel instanceof PerspectiveDataInterchange) {
- DataInterchangePackage pkg = ((PerspectiveDataInterchange) viewModel).getRef();
- return pkg == null ? "" : pkg.getName();
+ DataInterchangeGroup group = ((PerspectiveDataInterchange) viewModel).getRef();
+ return group == null ? "" : group.getName();
}
return null;
}
diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java
index b54e8ca..ce1bff2 100644
--- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java
+++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java
@@ -225,27 +225,31 @@
}
// create trimbar
- MTrimBar trimBar = null;
- if (trimmedWindow.getTrimBars().isEmpty()) {
- trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
- trimBar.setElementId(IPerspectiveProvider.E4Constants.TRIMBAR);
- trimBar.setToBeRendered(true);
- trimBar.setVisible(true);
- trimBar.setSide(SideValue.TOP);
- trimmedWindow.getTrimBars().add(trimBar);
- } else {
- trimBar = trimmedWindow.getTrimBars().get(0);
- }
+ MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
+ trimBar.setElementId(IPerspectiveProvider.E4Constants.TRIMBAR);
+ trimBar.setToBeRendered(true);
+ trimBar.setVisible(true);
+ trimBar.setSide(SideValue.TOP);
+ trimBar.setContainerData("TOPBAR_LEFT");
+ trimmedWindow.getTrimBars().add(trimBar);
+
+ MTrimBar trimBar2 = BasicFactoryImpl.eINSTANCE.createTrimBar();
+ trimBar2.setElementId(IPerspectiveProvider.E4Constants.TRIMBAR);
+ trimBar2.setToBeRendered(true);
+ trimBar2.setVisible(true);
+ trimBar2.setSide(SideValue.TOP);
+ trimBar2.setContainerData("TOPBAR_RIGHT");
+ trimmedWindow.getTrimBars().add(trimBar2);
// add our standard toolcontrols
if (ProductConfiguration.hasDemoToolsLanguage()) {
- trimBar.getChildren().add(createToolControl(I18NHandler.class));
+ trimBar2.getChildren().add(createToolControl(I18NHandler.class));
}
if (ProductConfiguration.hasDemoToolsTheme()) {
- trimBar.getChildren().add(createToolControl(ThemeHandler.class));
+ trimBar2.getChildren().add(createToolControl(ThemeHandler.class));
}
if (ProductConfiguration.hasToolsPrintService()) {
- trimBar.getChildren().add(createToolControl(PrintServiceHandler.class));
+ trimBar2.getChildren().add(createToolControl(PrintServiceHandler.class));
}
trimBar.getChildren().add(createToolControl(UserHandler.class));
log.debug("toolcontrols added");
