Skip to content

Commit

Permalink
Removed commented out code
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthewhorridge
matthewhorridge committed May 18, 2016
1 parent cd7f50d commit 6794f44
Showing 1 changed file with 5 additions and 106 deletions.
111 changes: 5 additions & 106 deletions ...tor-owl/src/main/java/org/protege/editor/owl/ui/ontology/imports/OntologyImportsList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,13 @@

import org.protege.editor.core.ui.list.MList;
import org.protege.editor.core.ui.list.MListSectionHeader;
import org.protege.editor.core.ui.util.UIUtil;
import org.protege.editor.core.ui.wizard.Wizard;
import org.protege.editor.owl.OWLEditorKit;
import org.protege.editor.owl.model.event.EventType;
import org.protege.editor.owl.model.library.OntologyCatalogManager;
import org.protege.editor.owl.ui.ontology.imports.wizard.ImportInfo;
import org.protege.editor.owl.ui.ontology.imports.wizard.OntologyImportWizard;
import org.protege.xmlcatalog.CatalogUtilities;
import org.protege.xmlcatalog.XMLCatalog;
import org.protege.xmlcatalog.entry.UriEntry;
import org.semanticweb.owlapi.model.*;
import org.semanticweb.owlapi.util.SimpleIRIMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -35,54 +22,34 @@
*/
public class OntologyImportsList extends MList {

private static final long serialVersionUID = -1532513638674168922L;

private final Logger logger = LoggerFactory.getLogger(OntologyImportsList.class);

private OWLEditorKit editorKit;
private final OWLEditorKit editorKit;

private OWLOntology ont;

private MListSectionHeader directImportsHeader;
private final MListSectionHeader directImportsHeader;

private MListSectionHeader indirectImportsHeader;
private final MListSectionHeader indirectImportsHeader;

private OntologyImportWizard wizard;

private OWLOntologyChangeListener ontChangeListener = changes -> handleOntologyChanges(changes);
private OWLOntologyChangeListener ontChangeListener = this::handleOntologyChanges;

public OntologyImportsList(OWLEditorKit editorKit) {
this.editorKit = editorKit;
setFixedCellHeight(-1);

// setCellRenderer(new OWLOntologyCellRenderer(editorKit){
// public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
// if (value instanceof OntologyImportItem){
// value = ((OntologyImportItem)value).getImportDeclaration().getIRI();
// }
// return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
// }
// });

setCellRenderer(new OntologyImportsItemRenderer(editorKit));

directImportsHeader = new MListSectionHeader() {

public String getName() {
return "Direct Imports";
}

public boolean canAdd() {
return true;
}
};

indirectImportsHeader = new MListSectionHeader() {

public String getName() {
return "Indirect Imports";
}

public boolean canAdd() {
return false;
}
Expand All @@ -94,92 +61,25 @@ public boolean canAdd() {

protected void handleAdd() {
// don't need to check the section as only the direct imports can be added
wizard = new OntologyImportWizard((Frame) SwingUtilities.getAncestorOfClass(Frame.class, editorKit.getWorkspace()), editorKit);
OntologyImportWizard wizard = new OntologyImportWizard((Frame) SwingUtilities.getAncestorOfClass(Frame.class, editorKit.getWorkspace()), editorKit);
int ret = wizard.showModalDialog();

if (ret == Wizard.FINISH_RETURN_CODE) {
AddImportsStrategy strategy = new AddImportsStrategy(editorKit, ont, wizard.getImports());
strategy.addImports();
// OWLOntologyManager manager = editorKit.getModelManager().getOWLOntologyManager();
// OntologyCatalogManager catalogManager = editorKit.getOWLModelManager().getOntologyCatalogManager();
// OWLOntology activeOntology = editorKit.getModelManager().getActiveOntology();
// List<OWLOntologyChange> changes = new ArrayList<>();
//
// for (ImportInfo importParameters : wizard.getImports()) {
// IRI importedOntologyDocumentIRI = importParameters.getImportsDeclarationIRI();
// URI physicalLocation = importParameters.getPhysicalLocation();
// if (willRedirectTotheWrongPlace(catalogManager, importedOntologyDocumentIRI, physicalLocation)) {
// addImportMapping(activeOntology, importedOntologyDocumentIRI, IRI.create(physicalLocation));
// }
// OWLImportsDeclaration decl = manager.getOWLDataFactory().getOWLImportsDeclaration(importedOntologyDocumentIRI);
// if (!manager.contains(importParameters.getOntologyID())) {
// try {
// manager.loadOntology(importedOntologyDocumentIRI);
// editorKit.getModelManager().fireEvent(EventType.ONTOLOGY_LOADED);
// if (importParameters.getOntologyID() != null && !importParameters.getOntologyID().isAnonymous()) {
// OWLOntology importedOnt = manager.getOntology(importParameters.getOntologyID());
// if (importedOnt == null) {
// logger.warn("Imported ontology has unexpected id. " +
// "During imports processing we anticipated " + importParameters.getOntologyID());
// logger.warn("Please notify the Protege developers via the protege 4 mailing list (p4-feedback@lists.stanford.edu)");
// continue;
// }
// editorKit.addRecent(manager.getOntologyDocumentIRI(importedOnt).toURI());
// }
// changes.add(new AddImport(ont, decl));
// } catch (OWLOntologyCreationException e) {
// logger.error("There was a problem loading the ontology from {}. Error: {}", importedOntologyDocumentIRI, e.getMessage(), e);
// JOptionPane.showMessageDialog(this, "An error occurred whilst the ontology at " + importedOntologyDocumentIRI + " was being loaded.", "Error loading ontology", JOptionPane.ERROR_MESSAGE);
// }
// }
//
// }
// editorKit.getModelManager().applyChanges(changes);
}
}

// private boolean willRedirectTotheWrongPlace(OntologyCatalogManager catalogManager, IRI importLocation, URI physicalLocation) {
// if (catalogManager.getRedirect(importLocation.toURI()) == null) {
// return !importLocation.equals(IRI.create(physicalLocation));
// }
// else {
// return !physicalLocation.equals(catalogManager.getRedirect(importLocation.toURI()));
// }
// }
//
// private void addImportMapping(OWLOntology ontology, IRI importLocation, IRI physicalLocation) {
// OWLOntologyManager manager = ontology.getOWLOntologyManager();
//
// manager.addIRIMapper(new SimpleIRIMapper(importLocation, physicalLocation));
// IRI importersDocumentLocation = manager.getOntologyDocumentIRI(ontology);
// if (UIUtil.isLocalFile(importersDocumentLocation.toURI())) {
// File f = new File(importersDocumentLocation.toURI());
// XMLCatalog catalog = editorKit.getModelManager().addRootFolder(f.getParentFile());
// URI physicalUri = CatalogUtilities.relativize(physicalLocation.toURI(), catalog);
// catalog.addEntry(0, new UriEntry("Imports Wizard Entry", catalog, importLocation.toURI().toString(), physicalUri, null));
// try {
// CatalogUtilities.save(catalog, OntologyCatalogManager.getCatalogFile(f.getParentFile()));
// } catch (IOException e) {
// logger.warn("An error occurred whilst saving the catalog file: {}", e);
// }
// }
// }


public void setOntology(OWLOntology ont) {
this.ont = ont;

List<Object> data = new ArrayList<>();

data.add(directImportsHeader);

// @@TODO ordering
for (OWLImportsDeclaration decl : ont.getImportsDeclarations()) {
data.add(new OntologyImportItem(ont, decl, editorKit));
}

data.add(indirectImportsHeader);

// @@TODO ordering
try {
for (OWLOntology ontRef : editorKit.getOWLModelManager().getOWLOntologyManager().getImportsClosure(ont)) {
Expand All @@ -194,7 +94,6 @@ public void setOntology(OWLOntology ont) {
} catch (UnknownOWLOntologyException e) {
throw new OWLRuntimeException(e);
}

setListData(data.toArray());
}

Expand Down

0 comments on commit 6794f44

Please sign in to comment.