Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Dietrich2018-07-10 20:00:40 +0000
committerChristian Dietrich2018-07-10 20:00:40 +0000
commit0c51bd98bb5deb97cf10a3a4b9a47bfb0cf90fbe (patch)
treeb7fa864e55d284273f87023d26b4e9c10d745f46
parent193bbeaad49dc49c1953d3e939972ee9f9043e1d (diff)
downloadorg.eclipse.emf-0c51bd98bb5deb97cf10a3a4b9a47bfb0cf90fbe.tar.gz
org.eclipse.emf-0c51bd98bb5deb97cf10a3a4b9a47bfb0cf90fbe.tar.xz
org.eclipse.emf-0c51bd98bb5deb97cf10a3a4b9a47bfb0cf90fbe.zip
[536883] Skip modelDirectory validation against workspace in standalone
mode Change-Id: I42dd3fe5a24cfee71e9af30282802428c9c88a2f Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelValidator.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelValidator.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelValidator.java
index 962f0fc54..16102538e 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelValidator.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelValidator.java
@@ -607,12 +607,15 @@ public class GenModelValidator extends EObjectValidator
return true;
}
- IStatus status;
+ IStatus status = Status.OK_STATUS;
try
{
IWorkspaceRoot workspaceRoot = EcorePlugin.getWorkspaceRoot();
- IPath workspacePath = new Path(path).makeAbsolute();
- status = workspaceRoot.getWorkspace().validatePath(workspacePath.toString(), IResource.FOLDER);
+ if (workspaceRoot != null)
+ {
+ IPath workspacePath = new Path(path).makeAbsolute();
+ status = workspaceRoot.getWorkspace().validatePath(workspacePath.toString(), IResource.FOLDER);
+ }
if (status.isOK())
{
for (char c : path.toCharArray())

Back to the top