--- a/src/net/timbusproject/dpes/alternative/AlternativesBuilder/PackageAlternativesBuilder.java
+++ b/src/net/timbusproject/dpes/alternative/AlternativesBuilder/PackageAlternativesBuilder.java
@@ -22,12 +22,8 @@
import net.timbusproject.dpes.alternative.Risk;
import net.timbusproject.dpes.alternative.kb.PackageKnowledgeBase;
-import org.sbaresearch.owl.AnnotationNotFoundException;
-import org.sbaresearch.owl.JenaQueryFacade;
-import org.sbaresearch.owl.OwlApiFacade;
-import org.sbaresearch.owl.OwlElementNotFoundException;
+import org.sbaresearch.owl.*;
import org.semanticweb.owlapi.model.IRI;
-import org.semanticweb.owlapi.model.OWLNamedIndividual;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
import org.slf4j.LoggerFactory;
@@ -66,7 +62,7 @@
ChangesOntologyBuilder changesOntologyBuilder = new ChangesOntologyBuilder(
originalModelFacade.getOntology(), originalModelFacade.getIndividual(individualAtRisk.toString()), "SoftwareReplacement");
- String packageName = getFragmentOfResource(originalModelFacade, affectedResourceName);
+ String packageName = AlternativesBuilderHelper.getFragmentOfResource(originalModelFacade, affectedResourceName);
// 1. Get virtual package(s) that are provided by this package
@@ -86,7 +82,7 @@
}
} else {
LOG.info("No virtual package for the individual at risk found, using all available virtual packages.");
- String affectedResourceFragment = getFragmentOfResource(originalModelFacade, affectedResourceName);
+ String affectedResourceFragment = AlternativesBuilderHelper.getFragmentOfResource(originalModelFacade, affectedResourceName);
alternativePackages.addAll(knowledgeBase.getAlternativePackages(affectedResourceFragment));
}
for (int i = 0; i < alternativePackages.size(); ++i) {
@@ -99,16 +95,4 @@
return alternatives;
}
- private String getFragmentOfResource(OwlApiFacade originalModelFacade, String affectedResourceName) throws OwlElementNotFoundException {
- OWLNamedIndividual affectedIndiv = originalModelFacade.getIndividual(originalModelFacade.findIndividualByFragmentAndLabel(affectedResourceName).toString());
- String affectedResourceFragment = originalModelFacade.createIri(affectedResourceName).getFragment();
- try {
- affectedResourceFragment = originalModelFacade.hasLabel(affectedIndiv) ? originalModelFacade.getLabel(affectedIndiv) : affectedResourceFragment;
- } catch (AnnotationNotFoundException e) {
- LOG.error("Unable to get label for resource: " + affectedResourceName + ". Using resource name as fallback.");
- }
- LOG.info("Getting alternatives for tool: " + affectedResourceFragment);
- return affectedResourceFragment;
- }
-
}