Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [801] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-04-21 07:07:20
|
Revision: 801
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=801&view=rev
Author: jenslehmann
Date: 2008-04-21 00:06:53 -0700 (Mon, 21 Apr 2008)
Log Message:
-----------
- added Manchester OWL syntax parser based on OWL API 2.2.0
- fixed all warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/examples/KRK.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java
trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java
trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/LeftPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/WizardPanelNotFoundException.java
trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassButton.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassView.java
trunk/src/dl-learner/org/dllearner/utilities/OntologyCloserOWLAPI.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/utilities/ManchesterOWLSyntaxParser.java
Modified: trunk/src/dl-learner/org/dllearner/examples/KRK.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/KRK.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/examples/KRK.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -130,7 +130,7 @@
+ ".");
}
- // Datei \xF6ffnen
+ // Datei �ffnen
BufferedReader in = null;
try {
in = new BufferedReader(new FileReader(fileIn));
@@ -155,7 +155,7 @@
try {
String line = "";
String[] ar = new String[6];
- String currentclass="";
+// String currentclass="";
int x = 0;
while ((line = in.readLine()) != null) {
@@ -164,7 +164,7 @@
System.out.println("Currently at line" + x);
ar = tokenize(line);
- currentclass = ar[6];
+// currentclass = ar[6];
gameind = getIndividual("game" + x);
wkingind = getIndividual("wking_" + ar[0] + ar[1] + "_" + x);
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -592,7 +592,7 @@
@WebMethod
public void SparqlRetrievalThreaded(int id, int componentID, String conceptString) throws ClientNotKnownException, ParseException {
- ClientState state = getState(id);
+// ClientState state = getState(id);
// call parser to parse concept
String sparqlQuery = SparqlQueryDescriptionConvertVisitor.getSparqlQuery(conceptString);
sparqlQueryThreaded(id, componentID,sparqlQuery);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -9,6 +9,8 @@
public class ColorListCellRenderer extends JLabel implements ListCellRenderer {
+ private static final long serialVersionUID = -7592805113197759247L;
+
public ColorListCellRenderer() {
setOpaque(true);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -13,6 +13,7 @@
public class ColumnListCellRenderer extends JPanel implements ListCellRenderer {
+ private static final long serialVersionUID = 3024913291199515567L;
private ORE ore;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -19,8 +19,8 @@
public class ConceptPanel extends JPanel{
+ private static final long serialVersionUID = 3026319637264844550L;
-
private javax.swing.JList conceptList;
private JPanel contentPanel;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanel.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanel.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -15,6 +15,7 @@
public class IntroductionPanel extends JPanel {
+ private static final long serialVersionUID = 7184544803724152044L;
private JTextArea instructionsField;
private JScrollPane jScrollPane1;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -12,7 +12,7 @@
public class KnowledgeSourcePanel extends JPanel{
-
+ private static final long serialVersionUID = -3997200565180270088L;
private javax.swing.JTextField fileURL;
private javax.swing.JButton browseButton;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -24,6 +24,7 @@
public class LearningPanel extends JPanel{
+ private static final long serialVersionUID = -7411197973240429632L;
private JPanel contentPanel;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LeftPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LeftPanel.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LeftPanel.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -10,6 +10,7 @@
public class LeftPanel extends JPanel{
+ private static final long serialVersionUID = -1205252523136710091L;
private JLabel[] jLabel;
public LeftPanel(int i){
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/WizardPanelNotFoundException.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/WizardPanelNotFoundException.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/WizardPanelNotFoundException.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -4,7 +4,9 @@
public class WizardPanelNotFoundException extends RuntimeException {
- public WizardPanelNotFoundException() {
+ private static final long serialVersionUID = -5211930098094599993L;
+
+ public WizardPanelNotFoundException() {
super();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -11,7 +11,8 @@
{
private static final long serialVersionUID = 728362819273927L;
private OWLFrameList2<OWLClass> list;
-
+
+ @Override
public void initialiseClassView() throws Exception {
list = new OWLFrameList2<OWLClass>(getOWLEditorKit(), new ButtonList(getOWLEditorKit()));
setLayout(new BorderLayout());
@@ -21,13 +22,13 @@
}
-
+ @Override
protected OWLClass updateView(OWLClass selectedClass) {
list.setRootObject(selectedClass);
return selectedClass;
}
-
+ @Override
public void disposeView() {
list.dispose();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassButton.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassButton.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassButton.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -25,17 +25,18 @@
this.frame = frame;
}
+ @Override
protected void clear() {
}
-
+ @Override
protected void refill(OWLOntology ontology) {
}
-
+ @Override
protected void refillInferred() {
}
@@ -46,12 +47,12 @@
}
-
+ @Override
protected OWLEquivalentClassesAxiom createAxiom(OWLDescription object) {
return getOWLDataFactory().getOWLEquivalentClassesAxiom(CollectionFactory.createSet(getRootObject(), object));
}
-
+ @Override
public OWLFrameSectionRowObjectEditor<OWLDescription> getObjectEditor() {
view = new SuggestEquivalentClassView(getOWLEditorKit(), null, frame);
view.setView(view);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassView.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestEquivalentClassView.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -207,7 +207,7 @@
-
+ @Override
public Set<OWLDescription> getEditedObjects()
{
return super.getEditedObjects();
Added: trunk/src/dl-learner/org/dllearner/utilities/ManchesterOWLSyntaxParser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/ManchesterOWLSyntaxParser.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/utilities/ManchesterOWLSyntaxParser.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -0,0 +1,48 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner 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
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.utilities;
+
+import org.coode.manchesterowlsyntax.ManchesterOWLSyntaxEditorParser;
+import org.semanticweb.owl.apibinding.OWLManager;
+import org.semanticweb.owl.expression.ParserException;
+import org.semanticweb.owl.model.OWLDescription;
+import org.semanticweb.owl.model.OWLOntologyManager;
+
+/**
+ * Parser for Manchester Syntax strings (interface to OWL API parser).
+ * TODO: Currently, this outputs an OWL API OWLDescription, but there
+ * is no converter from OWL API descriptions to DL-Learner descriptions
+ * at the moment.
+ *
+ * @author Jens Lehmann
+ *
+ */
+public class ManchesterOWLSyntaxParser {
+
+ public OWLDescription getDescription(String manchesterSyntaxDescription) throws ParserException {
+ OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
+
+ ManchesterOWLSyntaxEditorParser parser = new
+ ManchesterOWLSyntaxEditorParser(manager.getOWLDataFactory(), manchesterSyntaxDescription);
+
+ return parser.parseDescription();
+ }
+
+}
Modified: trunk/src/dl-learner/org/dllearner/utilities/OntologyCloserOWLAPI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/OntologyCloserOWLAPI.java 2008-04-21 06:44:04 UTC (rev 800)
+++ trunk/src/dl-learner/org/dllearner/utilities/OntologyCloserOWLAPI.java 2008-04-21 07:06:53 UTC (rev 801)
@@ -15,7 +15,6 @@
import org.dllearner.parser.KBParser;
import org.dllearner.reasoning.OWLAPIReasoner;
import org.semanticweb.owl.apibinding.OWLManager;
-import org.semanticweb.owl.io.OWLXMLOntologyFormat;
import org.semanticweb.owl.io.RDFXMLOntologyFormat;
import org.semanticweb.owl.model.AddAxiom;
import org.semanticweb.owl.model.OWLAxiom;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
