Merge pull request #224 from eclipse-passage/563753

Bug 563753 - [Passage] Dashboard "Create" link should work
eclipse-passage · May 30, 2020 · 39da453 · 39da453
2 parents 198b87b + 629ae66
commit 39da453
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF
@@ -38,3 +38,4 @@ Export-Package: org.eclipse.passage.loc.dashboard.ui;x-internal:=true,
  org.eclipse.passage.loc.dashboard.ui.panel;x-internal:=true,
  org.eclipse.passage.loc.dashboard.ui.wizards;x-internal:=true,
  org.eclipse.passage.loc.internal.dashboard.ui.i18n;x-internal:=true
+Bundle-ActivationPolicy: lazy
diff --git a/...assage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/CreateClassifier.java b/...assage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/CreateClassifier.java
@@ -76,7 +76,11 @@ public Optional<C> get() {
 	}
 
 	protected Optional<EObject> showWizard(Class<C> type, EditingDomainRegistry<?> registry) {
-		EntityMetadata metadata = context.get(ComposableClassMetadata.class).find(type).get();
+		Optional<EntityMetadata> found = context.get(ComposableClassMetadata.class).find(type);
+		if (!found.isPresent()) {
+			return Optional.empty();
+		}
+		EntityMetadata metadata = found.get();
 		EClass eClass = metadata.eClass();
 		ResourceLocator resourceLocator = new EClassResources(eClass).get();
 		String typeName = resourceLocator.getString(NLS.bind("_UI_{0}_type", eClass.getName())); //$NON-NLS-1$

diff --git a/...ench/src/org/eclipse/passage/loc/internal/workbench/wizards/RootClassifierWizardPage.java b/...ench/src/org/eclipse/passage/loc/internal/workbench/wizards/RootClassifierWizardPage.java
@@ -56,7 +56,7 @@ protected void selectPath() {
 	@Override
 	protected void initControls() {
 		super.initControls();
-		text.setText(basePath() + File.separator + new EObjectNameIdentifier(eClass) + '.' + extension);
+		text.setText(basePath() + File.separator + new EObjectNameIdentifier(eClass).apply('.') + '.' + extension);
 	}
 
 	protected String basePath() {