Fixed some issues with imports loading

- Save the catalog when the save action is performed
protegeproject · May 18, 2016 · 0df4649 · 0df4649
1 parent 6794f44
commit 0df4649
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/protege-editor-owl/src/main/java/org/protege/editor/owl/model/OWLModelManagerImpl.java b/protege-editor-owl/src/main/java/org/protege/editor/owl/model/OWLModelManagerImpl.java
@@ -492,6 +492,7 @@ public void save(OWLOntology ont) throws OWLOntologyStorageException {
                         .addOntology(ont, format, documentIRI)
                         .build();
                 saver.saveOntologies();
+                ensureCatalogFileExists();
                 manager.setOntologyDocumentIRI(ont, documentIRI);
                 logger.info("Saved ontology {} to {} in {} format", ont.getOntologyID(), documentIRI, format);
 
@@ -516,6 +517,20 @@ public void save(OWLOntology ont) throws OWLOntologyStorageException {
         }
     }
 
+    private void ensureCatalogFileExists() {
+        try {
+            OWLOntology activeOntology = getActiveOntology();
+            IRI ontologyDocumentIRI = manager.getOntologyDocumentIRI(activeOntology);
+            if("file".equals(ontologyDocumentIRI.getScheme())) {
+                File file = new File(ontologyDocumentIRI.toURI());
+                File parentDirectory = file.getParentFile();
+                getOntologyCatalogManager().ensureCatalogExists(parentDirectory);
+            }
+        } catch (IllegalArgumentException e) {
+            logger.error("A problem occurred when trying to save the catalog file: {}", e.getMessage());
+        }
+    }
+
     /**
      * @throws OWLOntologyStorageException if a problem occurs during the save
      * @deprecated - this method would require user interaction - use <code>OWLEditorKit.saveAs()</code> instead

diff --git a/protege-editor-owl/src/main/java/org/protege/editor/owl/model/io/OntologySaver.java b/protege-editor-owl/src/main/java/org/protege/editor/owl/model/io/OntologySaver.java
@@ -89,6 +89,7 @@ private Void saveOntologyInternal() throws OWLOntologyStorageException {
             IRI documentIRI = descriptor.getDocumentIRI();
             dlg.setSubMessage(String.format("Location: %s", formatIRI(documentIRI)));
             ontology.saveOntology(descriptor.getDocumentFormat(), documentIRI);
+
         }
         return null;
     }

diff --git a/...itor-owl/src/main/java/org/protege/editor/owl/ui/ontology/imports/AddImportsStrategy.java b/...itor-owl/src/main/java/org/protege/editor/owl/ui/ontology/imports/AddImportsStrategy.java
@@ -62,7 +62,7 @@ public void addImports() {
     }
 
     private void addImportsInOtherThread() {
-        ListenableFuture<List<OWLOntologyChange>> future = service.submit(() -> loadImportsInternal());
+        ListenableFuture<List<OWLOntologyChange>> future = service.submit(this::loadImportsInternal);
         Futures.addCallback(future, new FutureCallback<List<OWLOntologyChange>>() {
             @Override
             public void onSuccess(List<OWLOntologyChange> result) {
@@ -105,16 +105,12 @@ private List<OWLOntologyChange> loadImportsInternal() {
             if (!man.contains(importParameters.getOntologyID())) {
                 try {
                     OWLOntologyManager loadingManager = OWLManager.createConcurrentOWLOntologyManager();
-                    PriorityCollection<OWLOntologyIRIMapper> iriMappers = loadingManager.getIRIMappers();
-                    iriMappers.clear();
-                    iriMappers.add(new UserResolvedIRIMapper(new MissingImportHandlerUI(editorKit)));
-                    iriMappers.add(new WebConnectionIRIMapper());
-                    iriMappers.add(new AutoMappedRepositoryIRIMapper(editorKit.getOWLModelManager().getOntologyCatalogManager()));
-
+                    loadingManager.getIRIMappers()
+                            .add(man.getIRIMappers());
                     ProgressDialogOntologyLoaderListener listener = new ProgressDialogOntologyLoaderListener(dlg, logger);
                     loadingManager.addOntologyLoaderListener(listener);
                     loadingManager.loadOntologyFromOntologyDocument(
-                            new IRIDocumentSource(importedOntologyDocumentIRI),
+                            new IRIDocumentSource(IRI.create(physicalLocation)),
                             new OWLOntologyLoaderConfiguration().setMissingImportHandlingStrategy(MissingImportHandlingStrategy.SILENT));
                     loadingManager.removeOntologyLoaderListener(listener);
 //                        editorKit.getModelManager().fireEvent(EventType.ONTOLOGY_LOADED);

diff --git a/...n/java/org/protege/editor/owl/ui/ontology/imports/wizard/page/ImportConfirmationPage.java b/...n/java/org/protege/editor/owl/ui/ontology/imports/wizard/page/ImportConfirmationPage.java
@@ -28,6 +28,7 @@ public class ImportConfirmationPage extends AbstractOWLWizardPanel {
 	public static final String ID = "ImportConfirmationPage";
 
     private JComponent importedOntologiesComponent;
+
     private TitledBorder titledBorder;
 
     private Object backPanelDescriptor;