X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fsharedontology%2Fwizard%2FSharedOntologyImportWizard.java;h=d2b296f91d5aacbd8a3c4b6ee00598189bb6d56e;hp=df65646346386755b7cecc2388350ac74824a652;hb=e88be95edf1f80781646cfdf717ec1b663264179;hpb=9acebe9584f8f2a78f0322b6e0e24438e7ceb984 diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/SharedOntologyImportWizard.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/SharedOntologyImportWizard.java index df6564634..d2b296f91 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/SharedOntologyImportWizard.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/sharedontology/wizard/SharedOntologyImportWizard.java @@ -31,11 +31,13 @@ import org.eclipse.swt.SWT; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.preferences.ScopedPreferenceStore; +import org.simantics.Simantics; import org.simantics.databoard.binding.Binding; import org.simantics.databoard.binding.mutable.Variant; import org.simantics.databoard.container.DataContainer; import org.simantics.databoard.container.DataContainers; import org.simantics.databoard.container.FormatHandler; +import org.simantics.databoard.util.URIStringUtils; import org.simantics.db.Resource; import org.simantics.db.Session; import org.simantics.db.layer0.migration.MigratedImportResult; @@ -48,7 +50,6 @@ import org.simantics.modeling.ui.Activator; import org.simantics.modeling.ui.utils.NoProjectPage; import org.simantics.project.IProject; import org.simantics.project.ProjectKeys; -import org.simantics.ui.SimanticsUI; import org.simantics.ui.utils.ResourceAdaptionUtils; import org.simantics.utils.strings.EString; import org.simantics.utils.ui.ErrorLogger; @@ -70,7 +71,7 @@ public class SharedOntologyImportWizard extends Wizard implements IImportWizard String recentPathsPref = store.getString(Preferences.RECENT_SHARED_LIBRARY_IMPORT_LOCATIONS); Deque recentImportPaths = Preferences.decodePaths(recentPathsPref); - ISessionContext ctx = SimanticsUI.getSessionContext(); + ISessionContext ctx = Simantics.getSessionContext(); if (ctx == null) return false; IProject project = ctx.getHint(ProjectKeys.KEY_PROJECT); @@ -146,7 +147,7 @@ public class SharedOntologyImportWizard extends Wizard implements IImportWizard if (result[0].hasMissingExternals()) { InfoDialog.open(getShell(), "Missing Externals Created", "The system was unable to find some of the external entities referenced by the imported material. Place-holders have been created for the missing entities.\nThe missing entities are:\n" - + EString.implode(result[0].tgResult.missingExternals), + + URIStringUtils.unescape(EString.implode(result[0].tgResult.missingExternals)), SWT.SHEET); } } catch (InvocationTargetException e) {