Menu
▾
▴
[Jason-developers] SF.net SVN: jason: [1195] trunk/applications/jasdl-owlapi
|
From: <tom...@us...> - 2008-04-02 18:55:31
|
Revision: 1195
http://jason.svn.sourceforge.net/jason/?rev=1195&view=rev
Author: tomklapiscak
Date: 2008-04-02 11:55:20 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
Locally resident ontologies can now be specified using relative
filenames. Further structural refactoring.
Modified Paths:
--------------
trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j
trunk/applications/jasdl-owlapi/src/jasdl/architecture/IncomingPropContProcessingStrategy.java
trunk/applications/jasdl-owlapi/src/jasdl/architecture/JasdlAgArch.java
trunk/applications/jasdl-owlapi/src/jasdl/architecture/OutgoingPropContProcessingStrategy.java
trunk/applications/jasdl-owlapi/src/jasdl/architecture/PropContProcessingStrategy.java
trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlAgent.java
trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java
trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/JasdlPlanLibrary.java
trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java
trunk/applications/jasdl-owlapi/src/jasdl/bb/JasdlBeliefBase.java
trunk/applications/jasdl-owlapi/src/jasdl/bb/revision/JasdlIncisionFunction.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AliasFactory.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AxiomToSELiteralConverter.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralToAxiomConverter.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/MappingManager.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/label/LabelManager.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralAllDifferentAssertion.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralClassAssertion.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralDataPropertyAssertion.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralObjectPropertyAssertion.java
trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralPropertyAssertion.java
trunk/applications/jasdl-owlapi/src/jasdl/ia/define_class.java
trunk/applications/jasdl-owlapi/src/jasdl/test/JasdlBeliefBaseTest.java
trunk/applications/jasdl-owlapi/src/jasdl/util/Common.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/xsd/XSDDataType.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/xsd/XSDDataTypeUtils.java
Added Paths:
-----------
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/DuplicateMappingException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/InvalidSELiteralException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlConfigurationException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/NotEnrichedException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/exception/UnknownMappingException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixOWLEntityChecker.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIOWLEntityChecker.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/rendering/
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/rendering/URIOWLObjectRenderer.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/xsd/
Removed Paths:
-------------
trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/parsing/
trunk/applications/jasdl-owlapi/src/jasdl/util/DuplicateMappingException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/InvalidSELiteralException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlConfigurationException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/NotEnrichedException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/UnknownMappingException.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixEntityChecker.java
trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIEntityChecker.java
trunk/applications/jasdl-owlapi/src/jasdl/util/xsd/
Modified: trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j
===================================================================
--- trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/examples/travel_agent/config.mas2j 2008-04-02 18:55:20 UTC (rev 1195)
@@ -44,7 +44,7 @@
jasdl_ontologies="travel",
//jasdl_travel_uri="http://www.dur.ac.uk/t.g.klapiscak/onts/travel.owl",
- jasdl_travel_uri="file:///home/tom/workspace/jason/applications/jasdl-owlapi/examples/travel_agent/ontologies/travel.owl",
+ jasdl_travel_uri="/ontologies/travel.owl",
/*jasdl_travel_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy",*/ // defaults can be overriden per-ontology here
jasdl_travel_mapping_manual="small_beach=beach", // these manual mappings will override any automatic mappings made by strategies,
@@ -66,12 +66,12 @@
jasdl_useBeliefRevision = "true",
jasdl_ontologies="holidays,places",
- jasdl_holidays_uri="file:///home/tom/workspace/jason/applications/jasdl-owlapi/examples/travel_agent/ontologies/travel.owl",
+ jasdl_holidays_uri="/ontologies/travel.owl",
jasdl_holidays_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy",
jasdl_holidays_mapping_manual="small_beach=beach, luxuriousHotel=LuxuryHotel", // for demonstration of arbitrary primitive mappings being handled correctly
- jasdl_places_uri="file:///home/tom/workspace/jason/applications/jasdl-owlapi/examples/travel_agent/ontologies/places.owl",
+ jasdl_places_uri="/ontologies/places.owl",
jasdl_places_mapping_strategies="jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy"
]
agentArchClass jasdl.architecture.JasdlAgArch
Modified: trunk/applications/jasdl-owlapi/src/jasdl/architecture/IncomingPropContProcessingStrategy.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/architecture/IncomingPropContProcessingStrategy.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/architecture/IncomingPropContProcessingStrategy.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -26,9 +26,9 @@
import jasdl.bridge.factory.AliasFactory;
import jasdl.bridge.mapping.aliasing.Alias;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.DuplicateMappingException;
-import jasdl.util.JasdlException;
-import jasdl.util.NotEnrichedException;
+import jasdl.util.exception.DuplicateMappingException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.NotEnrichedException;
import jason.asSyntax.Atom;
import jason.asSyntax.ListTerm;
import jason.asSyntax.Literal;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/architecture/JasdlAgArch.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/architecture/JasdlAgArch.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/architecture/JasdlAgArch.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -20,7 +20,7 @@
package jasdl.architecture;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.architecture.AgArch;
import jason.asSemantics.Message;
import jason.asSyntax.ListTerm;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/architecture/OutgoingPropContProcessingStrategy.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/architecture/OutgoingPropContProcessingStrategy.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/architecture/OutgoingPropContProcessingStrategy.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -24,9 +24,9 @@
import jasdl.asSemantics.JasdlAgent;
import jasdl.bridge.seliteral.SELiteral;
import jasdl.bridge.seliteral.SELiteralAllDifferentAssertion;
-import jasdl.util.JasdlException;
-import jasdl.util.NotEnrichedException;
-import jasdl.util.UnknownMappingException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.NotEnrichedException;
+import jasdl.util.exception.UnknownMappingException;
import jason.asSyntax.ListTerm;
import jason.asSyntax.ListTermImpl;
import jason.asSyntax.Literal;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/architecture/PropContProcessingStrategy.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/architecture/PropContProcessingStrategy.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/architecture/PropContProcessingStrategy.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -20,7 +20,7 @@
package jasdl.architecture;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Literal;
public interface PropContProcessingStrategy {
Modified: trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlAgent.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlAgent.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlAgent.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,8 +1,6 @@
package jasdl.asSemantics;
import static jasdl.util.Common.strip;
-import jasdl.asSemantics.parsing.NSPrefixEntityChecker;
-import jasdl.asSemantics.parsing.URIEntityChecker;
import jasdl.asSyntax.JasdlPlanLibrary;
import jasdl.bb.JasdlBeliefBase;
import jasdl.bb.revision.BeliefBaseSemiRevisor;
@@ -21,11 +19,14 @@
import jasdl.bridge.mapping.label.LabelManager;
import jasdl.bridge.mapping.label.OntologyURIManager;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.DuplicateMappingException;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
-import jasdl.util.NotEnrichedException;
-import jasdl.util.UnknownMappingException;
+import jasdl.util.exception.DuplicateMappingException;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.NotEnrichedException;
+import jasdl.util.exception.UnknownMappingException;
+import jasdl.util.owlapi.parsing.NSPrefixOWLEntityChecker;
+import jasdl.util.owlapi.parsing.URIOWLEntityChecker;
+import jasdl.util.owlapi.rendering.URIOWLObjectRenderer;
import jason.JasonException;
import jason.RevisionFailedException;
import jason.architecture.AgArch;
@@ -66,7 +67,6 @@
import org.semanticweb.owl.model.OWLOntologyChangeException;
import org.semanticweb.owl.model.OWLOntologyCreationException;
import org.semanticweb.owl.model.OWLOntologyManager;
-import org.semanticweb.owl.util.ShortFormProvider;
import uk.ac.manchester.cs.owl.mansyntaxrenderer.ManchesterOWLSyntaxOWLObjectRendererImpl;
@@ -119,16 +119,10 @@
trustMap = new HashMap<Atom, Float>();
manchesterObjectRenderer = new ManchesterOWLSyntaxOWLObjectRendererImpl();
- manchesterObjectRenderer.setShortFormProvider(new ShortFormProvider(){
- public void dispose() {
- }
- public String getShortForm(OWLEntity entity) {
- return entity.getURI().toString();
- }
- }); // we want fully qualified entity references
+ manchesterObjectRenderer.setShortFormProvider(new URIOWLObjectRenderer());
- manchesterNsPrefixDescriptionParser = new ManchesterOWLSyntaxDescriptionParser(ontologyManager.getOWLDataFactory(), new NSPrefixEntityChecker(this));
- manchesterURIDescriptionParser = new ManchesterOWLSyntaxDescriptionParser(ontologyManager.getOWLDataFactory(), new URIEntityChecker(this));
+ manchesterNsPrefixDescriptionParser = new ManchesterOWLSyntaxDescriptionParser(ontologyManager.getOWLDataFactory(), new NSPrefixOWLEntityChecker(this));
+ manchesterURIDescriptionParser = new ManchesterOWLSyntaxDescriptionParser(ontologyManager.getOWLDataFactory(), new URIOWLEntityChecker(this));
// override plan library
setPL( new JasdlPlanLibrary(this) );
Modified: trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/JasdlConfigurator.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,23 +1,25 @@
package jasdl.asSemantics;
import static jasdl.util.Common.DELIM;
+import static jasdl.util.Common.getCurrentDir;
import static jasdl.util.Common.strip;
import jasdl.bridge.factory.AliasFactory;
import jasdl.bridge.mapping.aliasing.Alias;
import jasdl.bridge.mapping.aliasing.DecapitaliseMappingStrategy;
import jasdl.bridge.mapping.aliasing.MappingStrategy;
-import jasdl.util.JasdlConfigurationException;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlConfigurationException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Atom;
import jason.runtime.Settings;
import java.lang.reflect.Constructor;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List;
import java.util.Vector;
+import java.util.logging.Level;
-import org.apache.log4j.Level;
import org.semanticweb.owl.inference.OWLReasoner;
import org.semanticweb.owl.model.OWLEntity;
import org.semanticweb.owl.model.OWLOntology;
@@ -60,17 +62,13 @@
}
public void configure(Settings stts) throws JasdlException{
- try{
- loadReasoner(stts);
- loadDefaultMappingStrategies(stts);
- setUseBeliefRevision(stts);
- loadOntologies(stts);
- applyManualMappings(stts);
- loadKnownAgents(stts);
- loadTrustRatings(stts);
- }catch(JasdlException e){
- throw new JasdlException("JASDL agent encountered error during configuration. Reason: "+e);
- }
+ loadReasoner(stts);
+ loadDefaultMappingStrategies(stts);
+ setUseBeliefRevision(stts);
+ loadOntologies(stts);
+ applyManualMappings(stts);
+ loadKnownAgents(stts);
+ loadTrustRatings(stts);
}
@SuppressWarnings("unchecked")
@@ -89,7 +87,7 @@
throw new JasdlException("Unknown reasoner class: "+reasonerClass);
}else{
agent.setReasoner(reasoner);
- agent.setReasonerLogLevel(Level.FATAL);
+ agent.setReasonerLogLevel(org.apache.log4j.Level.FATAL);
}
}catch (Throwable e) {
throw new JasdlException("Error instantiating reasoner "+reasonerClass+". Reason: "+e);
@@ -116,19 +114,30 @@
* @param stts .mas2j settings
* @throws JasdlException if instantiation of an ontology fails
*/
- private void loadOntologies(Settings stts) throws JasdlException{
+ private void loadOntologies(Settings stts) throws JasdlConfigurationException{
String[] labels = splitUserParameter( stts, MAS2J_PREFIX + MAS2J_ONTOLOGIES );
for(String label : labels){
if(reservedOntologyLabels.contains(label)){
- throw new JasdlException(label+" is a reserved ontology label");
+ throw new JasdlConfigurationException(label+" is a reserved ontology label");
}
String _uri = prepareUserParameter( stts, MAS2J_PREFIX + "_" + label + MAS2J_URI );
URI uri = null;
try {
- uri = new URI(_uri);
+ try{
+ uri = new URI(_uri);
+ if(!uri.isAbsolute()){
+ throw new URISyntaxException("", "");
+ }
+ }catch(URISyntaxException urie){
+ _uri = "file://"+getCurrentDir()+_uri;
+ uri = new URI(_uri); // try relative path
+ agent.getLogger().fine("Loaded ontology "+_uri+" from relative uri");
+ }
agent.loadOntology(new Atom(label), uri, getMappingStrategies(stts, new Atom(label)));
} catch (Exception e) {
- throw new JasdlException("Unable to instantiate ontology "+_uri+" (\""+label+"\"). Reason: "+e);
+ String msg = "Unable to instantiate ontology \""+_uri+"\" ("+label+")";
+ agent.getLogger().log(Level.SEVERE, msg, e);
+ throw new JasdlConfigurationException(msg+" - "+e);
}
}
}
Modified: trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/JasdlPlanLibrary.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/JasdlPlanLibrary.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/JasdlPlanLibrary.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -22,9 +22,9 @@
import static jasdl.util.Common.getTEOp;
import jasdl.asSemantics.JasdlAgent;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.JasdlException;
-import jasdl.util.NotEnrichedException;
-import jasdl.util.UnknownMappingException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.NotEnrichedException;
+import jasdl.util.exception.UnknownMappingException;
import jason.JasonException;
import jason.asSyntax.Literal;
import jason.asSyntax.Plan;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/asSyntax/SEPlan.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -20,7 +20,7 @@
package jasdl.asSyntax;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSemantics.Unifier;
import jason.asSyntax.Plan;
import jason.asSyntax.Trigger;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bb/JasdlBeliefBase.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bb/JasdlBeliefBase.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bb/JasdlBeliefBase.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -7,8 +7,8 @@
import jasdl.bb.revision.TBoxAxiomKernelsetFilter;
import jasdl.bridge.seliteral.SELiteral;
import jasdl.bridge.seliteral.SELiteralAllDifferentAssertion;
-import jasdl.util.JasdlException;
-import jasdl.util.NotEnrichedException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.NotEnrichedException;
import jason.asSemantics.Unifier;
import jason.asSyntax.Literal;
import jason.asSyntax.Term;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bb/revision/JasdlIncisionFunction.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bb/revision/JasdlIncisionFunction.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bb/revision/JasdlIncisionFunction.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -2,7 +2,7 @@
import jasdl.asSemantics.JasdlAgent;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Atom;
import jason.asSyntax.ListTerm;
import jason.asSyntax.Term;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AliasFactory.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AliasFactory.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AliasFactory.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -2,7 +2,7 @@
import jasdl.bridge.mapping.aliasing.Alias;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Atom;
/**
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AxiomToSELiteralConverter.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AxiomToSELiteralConverter.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/AxiomToSELiteralConverter.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -4,11 +4,11 @@
import jasdl.bridge.mapping.aliasing.Alias;
import jasdl.bridge.mapping.aliasing.AllDifferentPlaceholder;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
-import jasdl.util.UnknownMappingException;
-import jasdl.util.xsd.XSDDataType;
-import jasdl.util.xsd.XSDDataTypeUtils;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.UnknownMappingException;
+import jasdl.util.owlapi.xsd.XSDDataType;
+import jasdl.util.owlapi.xsd.XSDDataTypeUtils;
import jason.asSyntax.Atom;
import jason.asSyntax.DefaultTerm;
import jason.asSyntax.Literal;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralFactory.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -8,8 +8,8 @@
import jasdl.bridge.mapping.aliasing.Alias;
import jasdl.bridge.mapping.aliasing.AllDifferentPlaceholder;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Atom;
import jason.asSyntax.DefaultTerm;
import jason.asSyntax.ListTerm;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralToAxiomConverter.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralToAxiomConverter.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/factory/SELiteralToAxiomConverter.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -27,8 +27,8 @@
import jasdl.bridge.seliteral.SELiteralClassAssertion;
import jasdl.bridge.seliteral.SELiteralDataPropertyAssertion;
import jasdl.bridge.seliteral.SELiteralObjectPropertyAssertion;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
import java.util.HashSet;
import java.util.Set;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/MappingManager.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/MappingManager.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/MappingManager.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,7 +1,7 @@
package jasdl.bridge.mapping;
-import jasdl.util.DuplicateMappingException;
-import jasdl.util.UnknownMappingException;
+import jasdl.util.exception.DuplicateMappingException;
+import jasdl.util.exception.UnknownMappingException;
import java.util.HashMap;
import java.util.Set;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/aliasing/AliasFactory.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,7 +1,7 @@
package jasdl.bridge.mapping.aliasing;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Atom;
/**
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/label/LabelManager.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/label/LabelManager.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/mapping/label/LabelManager.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,7 +1,7 @@
package jasdl.bridge.mapping.label;
import jasdl.bridge.mapping.MappingManager;
-import jasdl.util.DuplicateMappingException;
+import jasdl.util.exception.DuplicateMappingException;
import jason.asSyntax.Atom;
import java.util.HashSet;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteral.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -3,10 +3,10 @@
import jasdl.asSemantics.JasdlAgent;
import jasdl.bridge.factory.AliasFactory;
import jasdl.bridge.mapping.aliasing.Alias;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
-import jasdl.util.NotEnrichedException;
-import jasdl.util.UnknownMappingException;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.exception.NotEnrichedException;
+import jasdl.util.exception.UnknownMappingException;
import jason.asSyntax.Atom;
import jason.asSyntax.ListTerm;
import jason.asSyntax.Literal;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralAllDifferentAssertion.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralAllDifferentAssertion.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralAllDifferentAssertion.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,8 +1,8 @@
package jasdl.bridge.seliteral;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.ListTerm;
import jason.asSyntax.Literal;
import jason.asSyntax.Term;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralClassAssertion.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralClassAssertion.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralClassAssertion.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -2,7 +2,7 @@
import static jasdl.util.Common.DOMAIN;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Literal;
import org.semanticweb.owl.model.OWLDescription;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralDataPropertyAssertion.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralDataPropertyAssertion.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralDataPropertyAssertion.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -4,10 +4,10 @@
import static jasdl.util.Common.strip;
import static jasdl.util.Common.surroundedBy;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.InvalidSELiteralException;
-import jasdl.util.JasdlException;
-import jasdl.util.xsd.XSDDataType;
-import jasdl.util.xsd.XSDDataTypeUtils;
+import jasdl.util.exception.InvalidSELiteralException;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.owlapi.xsd.XSDDataType;
+import jasdl.util.owlapi.xsd.XSDDataTypeUtils;
import jason.asSyntax.Literal;
import jason.asSyntax.Term;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralObjectPropertyAssertion.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralObjectPropertyAssertion.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralObjectPropertyAssertion.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -3,7 +3,7 @@
import static jasdl.util.Common.DOMAIN;
import static jasdl.util.Common.RANGE;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Literal;
import org.semanticweb.owl.model.OWLIndividual;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralPropertyAssertion.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralPropertyAssertion.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/bridge/seliteral/SELiteralPropertyAssertion.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -6,7 +6,7 @@
import jasdl.asSemantics.JasdlAgent;
import jasdl.bridge.factory.AliasFactory;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSyntax.Literal;
public abstract class SELiteralPropertyAssertion extends SELiteral{
Modified: trunk/applications/jasdl-owlapi/src/jasdl/ia/define_class.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/ia/define_class.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/ia/define_class.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -21,7 +21,7 @@
import static jasdl.util.Common.strip;
import jasdl.asSemantics.JasdlAgent;
-import jasdl.util.JasdlException;
+import jasdl.util.exception.JasdlException;
import jason.asSemantics.DefaultInternalAction;
import jason.asSemantics.TransitionSystem;
import jason.asSemantics.Unifier;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/test/JasdlBeliefBaseTest.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/test/JasdlBeliefBaseTest.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/test/JasdlBeliefBaseTest.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -10,9 +10,9 @@
import jasdl.bridge.factory.AliasFactory;
import jasdl.bridge.mapping.aliasing.Alias;
import jasdl.bridge.seliteral.SELiteral;
-import jasdl.util.JasdlException;
-import jasdl.util.xsd.XSDDataType;
-import jasdl.util.xsd.XSDDataTypeUtils;
+import jasdl.util.exception.JasdlException;
+import jasdl.util.owlapi.xsd.XSDDataType;
+import jasdl.util.owlapi.xsd.XSDDataTypeUtils;
import jason.architecture.AgArch;
import jason.architecture.AgArchInfraTier;
import jason.asSyntax.Atom;
Modified: trunk/applications/jasdl-owlapi/src/jasdl/util/Common.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/Common.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/Common.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -19,10 +19,11 @@
*/
package jasdl.util;
-import jason.asSyntax.Literal;
import jason.asSyntax.Trigger;
+import java.io.File;
+
public class Common {
public static String DELIM=",";
@@ -59,5 +60,18 @@
}
}
+ public static String getCurrentDir()
+ {
+ File dir1 = new File (".");
+ String strCurrentDir = "";
+ try {
+ strCurrentDir = dir1.getCanonicalPath();
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ return strCurrentDir;
+ }
+
}
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/DuplicateMappingException.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/DuplicateMappingException.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/DuplicateMappingException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
- *
- * This file is part of JASDL.
- *
- * JASDL is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * JASDL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser GNU General Public License for more details.
- *
- * You should have received a copy of the Lesser GNU General Public License
- * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package jasdl.util;
-
-import jason.JasonException;
-
-
-public class DuplicateMappingException extends JasdlException {
- public DuplicateMappingException(String message){
- super(message);
- }
-}
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/InvalidSELiteralException.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/InvalidSELiteralException.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/InvalidSELiteralException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
- *
- * This file is part of JASDL.
- *
- * JASDL is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * JASDL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser GNU General Public License for more details.
- *
- * You should have received a copy of the Lesser GNU General Public License
- * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package jasdl.util;
-
-import jason.JasonException;
-
-
-public class InvalidSELiteralException extends JasdlException {
- public InvalidSELiteralException(String message){
- super(message);
- }
-}
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlConfigurationException.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlConfigurationException.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlConfigurationException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
- *
- * This file is part of JASDL.
- *
- * JASDL is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * JASDL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser GNU General Public License for more details.
- *
- * You should have received a copy of the Lesser GNU General Public License
- * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package jasdl.util;
-
-import jason.JasonException;
-
-
-public class JasdlConfigurationException extends JasdlException {
- public JasdlConfigurationException(String message){
- super(message);
- }
-}
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlException.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlException.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
- *
- * This file is part of JASDL.
- *
- * JASDL is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * JASDL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser GNU General Public License for more details.
- *
- * You should have received a copy of the Lesser GNU General Public License
- * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package jasdl.util;
-
-import jason.JasonException;
-
-
-public class JasdlException extends JasonException {
- public JasdlException(String message){
- super(message);
- }
-}
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/NotEnrichedException.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/NotEnrichedException.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/NotEnrichedException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
- *
- * This file is part of JASDL.
- *
- * JASDL is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * JASDL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser GNU General Public License for more details.
- *
- * You should have received a copy of the Lesser GNU General Public License
- * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package jasdl.util;
-
-import jason.JasonException;
-
-
-public class NotEnrichedException extends JasdlException {
- public NotEnrichedException(String message){
- super(message);
- }
-}
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/UnknownMappingException.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/UnknownMappingException.java 2008-04-02 17:26:44 UTC (rev 1194)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/UnknownMappingException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
- *
- * This file is part of JASDL.
- *
- * JASDL is free software: you can redistribute it and/or modify
- * it under the terms of the Lesser GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * JASDL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Lesser GNU General Public License for more details.
- *
- * You should have received a copy of the Lesser GNU General Public License
- * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package jasdl.util;
-
-import jason.JasonException;
-
-
-public class UnknownMappingException extends JasdlException {
- public UnknownMappingException(String message){
- super(message);
- }
-}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/exception/DuplicateMappingException.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/util/DuplicateMappingException.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/exception/DuplicateMappingException.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/exception/DuplicateMappingException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
+ *
+ * This file is part of JASDL.
+ *
+ * JASDL is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JASDL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package jasdl.util.exception;
+
+import jason.JasonException;
+
+
+public class DuplicateMappingException extends JasdlException {
+ public DuplicateMappingException(String message){
+ super(message);
+ }
+}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/exception/InvalidSELiteralException.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/util/InvalidSELiteralException.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/exception/InvalidSELiteralException.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/exception/InvalidSELiteralException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
+ *
+ * This file is part of JASDL.
+ *
+ * JASDL is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JASDL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package jasdl.util.exception;
+
+import jason.JasonException;
+
+
+public class InvalidSELiteralException extends JasdlException {
+ public InvalidSELiteralException(String message){
+ super(message);
+ }
+}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlConfigurationException.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlConfigurationException.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlConfigurationException.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlConfigurationException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
+ *
+ * This file is part of JASDL.
+ *
+ * JASDL is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JASDL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package jasdl.util.exception;
+
+import jason.JasonException;
+
+
+public class JasdlConfigurationException extends JasdlException {
+ public JasdlConfigurationException(String message){
+ super(message);
+ }
+}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlException.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/util/JasdlException.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlException.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/exception/JasdlException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
+ *
+ * This file is part of JASDL.
+ *
+ * JASDL is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JASDL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package jasdl.util.exception;
+
+import jason.JasonException;
+
+
+public class JasdlException extends JasonException {
+ public JasdlException(String message){
+ super(message);
+ }
+}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/exception/NotEnrichedException.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/util/NotEnrichedException.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/exception/NotEnrichedException.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/exception/NotEnrichedException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
+ *
+ * This file is part of JASDL.
+ *
+ * JASDL is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JASDL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package jasdl.util.exception;
+
+import jason.JasonException;
+
+
+public class NotEnrichedException extends JasdlException {
+ public NotEnrichedException(String message){
+ super(message);
+ }
+}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/exception/UnknownMappingException.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/util/UnknownMappingException.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/exception/UnknownMappingException.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/exception/UnknownMappingException.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 Thomas Klapiscak (t.g...@du...)
+ *
+ * This file is part of JASDL.
+ *
+ * JASDL is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JASDL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with JASDL. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package jasdl.util.exception;
+
+import jason.JasonException;
+
+
+public class UnknownMappingException extends JasdlException {
+ public UnknownMappingException(String message){
+ super(message);
+ }
+}
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/parsing)
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixEntityChecker.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/parsing/NSPrefixEntityChecker.java 2008-04-02 17:09:55 UTC (rev 1193)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixEntityChecker.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,106 +0,0 @@
-package jasdl.asSemantics.parsing;
-import jasdl.asSemantics.JasdlAgent;
-import jasdl.bridge.factory.AliasFactory;
-import jasdl.bridge.mapping.aliasing.Alias;
-import jason.asSyntax.Atom;
-
-import org.semanticweb.owl.expression.OWLEntityChecker;
-import org.semanticweb.owl.model.OWLClass;
-import org.semanticweb.owl.model.OWLDataProperty;
-import org.semanticweb.owl.model.OWLDataType;
-import org.semanticweb.owl.model.OWLEntity;
-import org.semanticweb.owl.model.OWLIndividual;
-import org.semanticweb.owl.model.OWLObjectProperty;
-
-/**
- * For parsing class-expressions defined with entities in the alias label:functor format.
- * E.g. "(travel:hotel and travel:hasActivity some travel:museums) and owl:thing"
- * @author Tom Klapiscak
- *
- */
-public class NSPrefixEntityChecker implements OWLEntityChecker{
-
- private JasdlAgent agent;
-
- public NSPrefixEntityChecker(JasdlAgent agent){
- this.agent = agent;
- }
-
- public OWLClass getOWLClass(String name) {
- OWLEntity entity = convert(name);
- if(entity == null){
- return null;
- }
- if(entity.isOWLClass()){
- return entity.asOWLClass();
- }else{
- return null;
- }
- }
-
- public OWLDataProperty getOWLDataProperty(String name) {
- OWLEntity entity = convert(name);
- if(entity == null){
- return null;
- }
- if(entity.isOWLDataProperty()){
- return entity.asOWLDataProperty();
- }else{
- return null;
- }
- }
-
- public OWLDataType getOWLDataType(String name) {
- OWLEntity entity = convert(name);
- if(entity == null){
- return null;
- }
- if(entity.isOWLDataType()){
- return entity.asOWLDataType();
- }else{
- return null;
- }
- }
-
- public OWLIndividual getOWLIndividual(String name) {
- OWLEntity entity = convert(name);
- if(entity == null){
- // TODO: instantiate individuals?
- return null;
- }
- if(entity.isOWLIndividual()){
- return entity.asOWLIndividual();
- }else{
- return null;
- }
- }
-
- public OWLObjectProperty getOWLObjectProperty(String name) {
- OWLEntity entity = convert(name);
- if(entity == null){
- return null;
- }
- if(entity.isOWLObjectProperty()){
- return entity.asOWLObjectProperty();
- }else{
- return null;
- }
- }
-
- private OWLEntity convert(String name){
- String[] tokens = name.split(":");
- try {
- Atom functor = new Atom(tokens[1]);
- Atom label = new Atom(tokens[0]);
- Alias alias = AliasFactory.INSTANCE.create(functor, label);
- return (OWLEntity)agent.getAliasManager().getRight(alias); // guaranteed to be an entity? Not for anonymous classes!
- }catch(ClassCastException e){
- // we are dealing with an anonymous class description
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
-
- }
\ No newline at end of file
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixOWLEntityChecker.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/parsing/NSPrefixEntityChecker.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixOWLEntityChecker.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/NSPrefixOWLEntityChecker.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,106 @@
+package jasdl.util.owlapi.parsing;
+import jasdl.asSemantics.JasdlAgent;
+import jasdl.bridge.factory.AliasFactory;
+import jasdl.bridge.mapping.aliasing.Alias;
+import jason.asSyntax.Atom;
+
+import org.semanticweb.owl.expression.OWLEntityChecker;
+import org.semanticweb.owl.model.OWLClass;
+import org.semanticweb.owl.model.OWLDataProperty;
+import org.semanticweb.owl.model.OWLDataType;
+import org.semanticweb.owl.model.OWLEntity;
+import org.semanticweb.owl.model.OWLIndividual;
+import org.semanticweb.owl.model.OWLObjectProperty;
+
+/**
+ * For parsing class-expressions defined with entities in the alias label:functor format.
+ * E.g. "(travel:hotel and travel:hasActivity some travel:museums) and owl:thing"
+ * @author Tom Klapiscak
+ *
+ */
+public class NSPrefixOWLEntityChecker implements OWLEntityChecker{
+
+ private JasdlAgent agent;
+
+ public NSPrefixOWLEntityChecker(JasdlAgent agent){
+ this.agent = agent;
+ }
+
+ public OWLClass getOWLClass(String name) {
+ OWLEntity entity = convert(name);
+ if(entity == null){
+ return null;
+ }
+ if(entity.isOWLClass()){
+ return entity.asOWLClass();
+ }else{
+ return null;
+ }
+ }
+
+ public OWLDataProperty getOWLDataProperty(String name) {
+ OWLEntity entity = convert(name);
+ if(entity == null){
+ return null;
+ }
+ if(entity.isOWLDataProperty()){
+ return entity.asOWLDataProperty();
+ }else{
+ return null;
+ }
+ }
+
+ public OWLDataType getOWLDataType(String name) {
+ OWLEntity entity = convert(name);
+ if(entity == null){
+ return null;
+ }
+ if(entity.isOWLDataType()){
+ return entity.asOWLDataType();
+ }else{
+ return null;
+ }
+ }
+
+ public OWLIndividual getOWLIndividual(String name) {
+ OWLEntity entity = convert(name);
+ if(entity == null){
+ // TODO: instantiate individuals?
+ return null;
+ }
+ if(entity.isOWLIndividual()){
+ return entity.asOWLIndividual();
+ }else{
+ return null;
+ }
+ }
+
+ public OWLObjectProperty getOWLObjectProperty(String name) {
+ OWLEntity entity = convert(name);
+ if(entity == null){
+ return null;
+ }
+ if(entity.isOWLObjectProperty()){
+ return entity.asOWLObjectProperty();
+ }else{
+ return null;
+ }
+ }
+
+ private OWLEntity convert(String name){
+ String[] tokens = name.split(":");
+ try {
+ Atom functor = new Atom(tokens[1]);
+ Atom label = new Atom(tokens[0]);
+ Alias alias = AliasFactory.INSTANCE.create(functor, label);
+ return (OWLEntity)agent.getAliasManager().getRight(alias); // guaranteed to be an entity? Not for anonymous classes!
+ }catch(ClassCastException e){
+ // we are dealing with an anonymous class description
+ return null;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+ }
\ No newline at end of file
Deleted: trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIEntityChecker.java
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/parsing/URIEntityChecker.java 2008-04-02 17:09:55 UTC (rev 1193)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIEntityChecker.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -1,99 +0,0 @@
-package jasdl.asSemantics.parsing;
-
-import jasdl.asSemantics.JasdlAgent;
-
-import java.net.URI;
-
-import org.semanticweb.owl.expression.OWLEntityChecker;
-import org.semanticweb.owl.model.OWLClass;
-import org.semanticweb.owl.model.OWLDataProperty;
-import org.semanticweb.owl.model.OWLDataType;
-import org.semanticweb.owl.model.OWLEntity;
-import org.semanticweb.owl.model.OWLIndividual;
-import org.semanticweb.owl.model.OWLObjectProperty;
-
-/**
- * For parsing class-expressions where entities are defined by their fully-qualified URIs.
- * E.g. "http://www.dur.ac.uk.t.g.klapiscak/travel.owl#Hotel and http://www.dur.ac.uk.t.g.klapiscak/travel.owl#Accommodation".
- * @author tom
- *
- */
-public class URIEntityChecker implements OWLEntityChecker{
-
- private JasdlAgent agent;
-
- public URIEntityChecker(JasdlAgent agent){
- this.agent = agent;
- }
-
- public OWLClass getOWLClass(String uri) {
- OWLEntity entity = convert(uri);
- if(entity == null){
- return null;
- }
- if(entity.isOWLClass()){
- return entity.asOWLClass();
- }else{
- return null;
- }
- }
-
- public OWLDataProperty getOWLDataProperty(String uri) {
- OWLEntity entity = convert(uri);
- if(entity == null){
- return null;
- }
- if(entity.isOWLDataProperty()){
- return entity.asOWLDataProperty();
- }else{
- return null;
- }
- }
-
- public OWLDataType getOWLDataType(String uri) {
- OWLEntity entity = convert(uri);
- if(entity == null){
- return null;
- }
- if(entity.isOWLDataType()){
- return entity.asOWLDataType();
- }else{
- return null;
- }
- }
-
- public OWLIndividual getOWLIndividual(String uri) {
- OWLEntity entity = convert(uri);
- if(entity == null){
- return null;
- }
- if(entity.isOWLIndividual()){
- return entity.asOWLIndividual();
- }else{
- return null;
- }
- }
-
- public OWLObjectProperty getOWLObjectProperty(String uri) {
- OWLEntity entity = convert(uri);
- if(entity == null){
- return null;
- }
- if(entity.isOWLObjectProperty()){
- return entity.asOWLObjectProperty();
- }else{
- return null;
- }
- }
-
- private OWLEntity convert(String _uri){
- try {
- URI uri = new URI(_uri);
- return agent.toEntity(uri);
- } catch (Exception e) {
- return null;
- }
- }
-
-
-}
\ No newline at end of file
Copied: trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIOWLEntityChecker.java (from rev 1193, trunk/applications/jasdl-owlapi/src/jasdl/asSemantics/parsing/URIEntityChecker.java)
===================================================================
--- trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIOWLEntityChecker.java (rev 0)
+++ trunk/applications/jasdl-owlapi/src/jasdl/util/owlapi/parsing/URIOWLEntityChecker.java 2008-04-02 18:55:20 UTC (rev 1195)
@@ -0,0 +1,99 @@
+package jasdl.util.owlapi.parsing;
+
+import jasdl.asSemantics.JasdlAgent;
+
+import java.net.URI;
+
+import org.semanticweb.owl.expression.OWLEntityChecker;
+import org.semanticweb.owl.model.OWLClass;
+import org.semanticweb.owl.model.OWLDataProperty;
+import org.semanticweb.owl.model.OWLDataType;
+import org.semanticweb.owl.model.OWLEntity;
+import org.semanticweb.owl.model.OWLIndividual;
+import org.semanticweb.owl.model.OWLObjectProperty;
+
+/**
+ * For parsing class-expressions where entities are defined by their fully-qualified URIs.
+ * E.g. "http://www.dur.ac.uk.t.g.klapiscak/travel.owl#Hotel and http://www.dur.ac.uk.t.g.klapiscak/travel.owl#Accommodation"...
[truncated message content] |
