aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSopot Cela2012-04-27 13:37:28 (EDT)
committerOleg Besedin2012-04-27 13:37:28 (EDT)
commitea915553b25737026c6a2c9a4a7b4c6243ed2469 (patch)
treef404ee2b3ecb8816e56f3dcc9c28c45730f0b638
parente7896b00021d2ac4ad1a126db3556b41e6e38bed (diff)
downloadeclipse.platform.ui-ea915553b25737026c6a2c9a4a7b4c6243ed2469.zip
eclipse.platform.ui-ea915553b25737026c6a2c9a4a7b4c6243ed2469.tar.gz
eclipse.platform.ui-ea915553b25737026c6a2c9a4a7b4c6243ed2469.tar.bz2
Bug 306623 - Application.e4xmi should be default for "applicationXMI"
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java
index 5b0b895..c4f1f59 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java
@@ -84,6 +84,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.Bundle;
import org.w3c.dom.css.CSSStyleDeclaration;
/**
@@ -98,6 +99,7 @@ public class E4Application implements IApplication {
private static final String VERSION_FILENAME = "version.ini"; //$NON-NLS-1$
private static final String WORKSPACE_VERSION_KEY = "org.eclipse.core.runtime"; //$NON-NLS-1$
private static final String WORKSPACE_VERSION_VALUE = "2"; //$NON-NLS-1$
+ private static final String APPLICATION_MODEL_PATH_DEFAULT = "Application.e4xmi";
private String[] args;
@@ -309,6 +311,12 @@ public class E4Application implements IApplication {
String appModelPath = getArgValue(E4Workbench.XMI_URI_ARG, appContext,
false);
+ if (appModelPath == null || appModelPath.length() == 0) {
+ Bundle brandingBundle = appContext.getBrandingBundle();
+ if (brandingBundle != null)
+ appModelPath = brandingBundle.getSymbolicName() + "/"
+ + E4Application.APPLICATION_MODEL_PATH_DEFAULT;
+ }
Assert.isNotNull(appModelPath, E4Workbench.XMI_URI_ARG
+ " argument missing"); //$NON-NLS-1$
final URI initialWorkbenchDefinitionInstance = URI