Index: acinclude.m4 =================================================================== RCS file: /share/darwin/darwin4/cvs/java/acinclude.m4,v retrieving revision 1.4 diff -u -3 -p -u -r1.4 acinclude.m4 --- acinclude.m4 2005/02/21 23:56:13 1.4 +++ acinclude.m4 2005/03/27 14:53:20 @@ -93,18 +93,18 @@ AC_DEFUN([CLASSPATH_CHECK_GCJ], GCJ_VERSION_MAJOR=`echo "$GCJ_VERSION" | cut -d '.' -f 1` GCJ_VERSION_MINOR=`echo "$GCJ_VERSION" | cut -d '.' -f 2` - if expr "$GCJ_VERSION_MAJOR" \< 3 > /dev/null; then + if expr "$GCJ_VERSION_MAJOR" \< 4 > /dev/null; then GCJ="" fi - if expr "$GCJ_VERSION_MAJOR" = 3 > /dev/null; then - if expr "$GCJ_VERSION_MINOR" \< 3; then + if expr "$GCJ_VERSION_MAJOR" = 4 > /dev/null; then + if expr "$GCJ_VERSION_MINOR" \< 0; then GCJ="" fi fi if test "x$GCJ" != x; then AC_MSG_RESULT($GCJ_VERSION) else - AC_MSG_WARN($GCJ_VERSION: gcj 3.3 or higher required) + AC_MSG_WARN($GCJ_VERSION: gcj 4.0 or higher required) fi fi ]) Index: doc/api/Makefile.am =================================================================== RCS file: /share/darwin/darwin4/cvs/java/doc/api/Makefile.am,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 Makefile.am --- doc/api/Makefile.am 2005/01/31 03:37:40 1.1 +++ doc/api/Makefile.am 2005/03/27 14:53:20 @@ -2,7 +2,7 @@ if CREATE_API_DOCS noinst_DATA = html endif -sourcepath = $(top_builddir):$(top_srcdir) +sourcepath = $(top_builddir):$(top_srcdir)/src classpathbox = "CASheW-S Editor ($(VERSION))" @@ -30,12 +30,13 @@ uninstall-local: html: create_html clean: - -rm -rf html create_html + rm -rf html create_html create_html: -$(MKDIR) html > /dev/null 2>&1 $(GJDOC) -public -use \ -sourcepath "$(sourcepath)" \ + -author \ -encoding UTF-8 \ -breakiterator \ -licensetext \ @@ -45,5 +46,8 @@ create_html: -doctitle "CASheW-s Editor $(VERSION)" \ -windowtitle "CASheW-s Editor $(VERSION) Documentation" \ -header $(classpathbox) -footer $(classpathbox) \ - -subpackages java:javax:org + -subpackages nongnu \ + -stylesheetfile ./resources/gjdochtml-clean-color1.css \ + -source 1.4 +#-source 1.5 touch create_html Index: lib/Makefile.am =================================================================== RCS file: /share/darwin/darwin4/cvs/java/lib/Makefile.am,v retrieving revision 1.7 diff -u -3 -p -u -r1.7 Makefile.am --- lib/Makefile.am 2005/03/18 13:50:43 1.7 +++ lib/Makefile.am 2005/03/27 14:53:20 @@ -76,17 +76,23 @@ endif # INSTALL_CLASS_FILES rdf.jar: classes compile-classes # resources if test "$(JAR)" != ""; then rm rdf.jar; $(JAR) cf rdf.jar `find nongnu -path '*rdf*' -name '*class'` > /dev/null; fi - gcj -shared -fjni -findirect-dispatch -o rdf.jar.so rdf.jar +#if FOUND_GCJ +#$(GCJ) -shared -fjni -findirect-dispatch -o rdf.jar.so rdf.jar +#endif owls.jar: classes compile-classes # resources if test "$(JAR)" != ""; then rm owls.jar; $(JAR) cf owls.jar `find nongnu -path '*owls*' -name '*class'` > /dev/null; fi - gcj -shared -fjni -findirect-dispatch -o owls.jar.so owls.jar +#if FOUND GCJ +#$(GCJ) -shared -fjni -findirect-dispatch -o owls.jar.so owls.jar +#endif if FOUND_ECLIPSE eclipse.jar: classes compile-classes # resources if test "$(JAR)" != ""; then rm eclipse.jar; $(JAR) cf eclipse.jar `find nongnu -path '*eclipse*' -name '*class'` > /dev/null; fi -#gcj -shared -fjni -findirect-dispatch -o eclipse.jar.so eclipse.jar +#if FOUND GCJ +#$(GCJ) -shared -fjni -findirect-dispatch -o eclipse.jar.so eclipse.jar +#endif endif Index: src/nongnu/cashews/owls/expression/Condition.java =================================================================== RCS file: /share/darwin/darwin4/cvs/java/src/nongnu/cashews/owls/expression/Condition.java,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 Condition.java --- src/nongnu/cashews/owls/expression/Condition.java 2005/03/24 23:29:26 1.3 +++ src/nongnu/cashews/owls/expression/Condition.java 2005/03/27 14:53:20 @@ -23,7 +23,8 @@ package nongnu.cashews.owls.expression; /** * This interface represents an OWL-S condition in a particular logical - * language. + * language. A condition is an expression with variables to be bound + * in a knowledge context, in order to determine its value in that context. * * @author Andrew John Hughes (address@hidden) */ Index: src/nongnu/cashews/owls/expression/DRSCondition.java =================================================================== RCS file: DRSCondition.java diff -N DRSCondition.java --- /dev/null Sun Mar 27 15:50:45 2005 +++ DRSCondition.java Sun Mar 27 15:53:20 2005 @@ -0,0 +1,36 @@ +/* DRSCondition.java -- Representation of a DRS condition. + Copyright (C) 2005 The University of Sheffield. + + This file is part of the CASheW-s editor. + + The CASheW-s editor 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 2, or (at your option) + any later version. + + The CASheW-s editor 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 The CASheW-s editor; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. +*/ + +package nongnu.cashews.owls.expression; + +/** + * This interface represents an OWL-S condition in the DRS logical + * language. A condition is an expression with variables to be bound + * in a knowledge context, in order to determine its value in that context. + * + * @author Andrew John Hughes (address@hidden) + */ +public class DRSCondition + extends DRSExpression + implements Condition +{ + +} Index: src/nongnu/cashews/owls/expression/DRSExpression.java =================================================================== RCS file: DRSExpression.java diff -N DRSExpression.java --- /dev/null Sun Mar 27 15:50:45 2005 +++ DRSExpression.java Sun Mar 27 15:53:20 2005 @@ -0,0 +1,56 @@ +/* DRSExpression.java -- Representation of a DRS expression. + Copyright (C) 2005 The University of Sheffield. + + This file is part of the CASheW-s editor. + + The CASheW-s editor 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 2, or (at your option) + any later version. + + The CASheW-s editor 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 The CASheW-s editor; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. +*/ + +package nongnu.cashews.owls.expression; + +/** + * This class represents an OWL-S expression in DRS. + * + * @author Andrew John Hughes (address@hidden) + */ +public class DRSExpression + extends Expression +{ + + /** + * This is the default constructor, which creates a new expression using the + * DRS logical formalism and an empty body. + */ + public DRSExpression() + { + super(); + setLanguage(LogicLanguage.DRS); + } + + /** + * This method always throws an exception in this subclass in order to + * prevent changes to the expression language. + * + * @throws UnsupportedOperationException + * as the language can not be modified. + */ + public void setLanguage() + { + throw new UnsupportedOperationException("The logic language of this " + + "class can not be changed."); + } + +} Index: src/nongnu/cashews/owls/expression/KIFCondition.java =================================================================== RCS file: KIFCondition.java diff -N KIFCondition.java --- /dev/null Sun Mar 27 15:50:45 2005 +++ KIFCondition.java Sun Mar 27 15:53:20 2005 @@ -0,0 +1,36 @@ +/* KIFCondition.java -- Representation of a KIF condition. + Copyright (C) 2005 The University of Sheffield. + + This file is part of the CASheW-s editor. + + The CASheW-s editor 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 2, or (at your option) + any later version. + + The CASheW-s editor 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 The CASheW-s editor; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. +*/ + +package nongnu.cashews.owls.expression; + +/** + * This interface represents an OWL-S condition in the KIF logical + * language. A condition is an expression with variables to be bound + * in a knowledge context, in order to determine its value in that context. + * + * @author Andrew John Hughes (address@hidden) + */ +public class KIFCondition + extends KIFExpression + implements Condition +{ + +} Index: src/nongnu/cashews/owls/expression/KIFExpression.java =================================================================== RCS file: KIFExpression.java diff -N KIFExpression.java --- /dev/null Sun Mar 27 15:50:45 2005 +++ KIFExpression.java Sun Mar 27 15:53:20 2005 @@ -0,0 +1,56 @@ +/* KIFExpression.java -- Representation of a KIF expression. + Copyright (C) 2005 The University of Sheffield. + + This file is part of the CASheW-s editor. + + The CASheW-s editor 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 2, or (at your option) + any later version. + + The CASheW-s editor 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 The CASheW-s editor; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. +*/ + +package nongnu.cashews.owls.expression; + +/** + * This class represents an OWL-S expression in KIF. + * + * @author Andrew John Hughes (address@hidden) + */ +public class KIFExpression + extends Expression +{ + + /** + * This is the default constructor, which creates a new expression using the + * KIF logical formalism and an empty body. + */ + public KIFExpression() + { + super(); + setLanguage(LogicLanguage.KIF); + } + + /** + * This method always throws an exception in this subclass in order to + * prevent changes to the expression language. + * + * @throws UnsupportedOperationException + * as the language can not be modified. + */ + public void setLanguage() + { + throw new UnsupportedOperationException("The logic language of this " + + "class can not be changed."); + } + +} Index: src/nongnu/cashews/owls/expression/SWRLCondition.java =================================================================== RCS file: SWRLCondition.java diff -N SWRLCondition.java --- /dev/null Sun Mar 27 15:50:45 2005 +++ SWRLCondition.java Sun Mar 27 15:53:20 2005 @@ -0,0 +1,36 @@ +/* SWRLCondition.java -- Representation of a SWRL condition. + Copyright (C) 2005 The University of Sheffield. + + This file is part of the CASheW-s editor. + + The CASheW-s editor 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 2, or (at your option) + any later version. + + The CASheW-s editor 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 The CASheW-s editor; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. +*/ + +package nongnu.cashews.owls.expression; + +/** + * This interface represents an OWL-S condition in the SWRL logical + * language. A condition is an expression with variables to be bound + * in a knowledge context, in order to determine its value in that context. + * + * @author Andrew John Hughes (address@hidden) + */ +public class SWRLCondition + extends SWRLExpression + implements Condition +{ + +} Index: src/nongnu/cashews/rdf/Graph.java =================================================================== RCS file: /share/darwin/darwin4/cvs/java/src/nongnu/cashews/rdf/Graph.java,v retrieving revision 1.6 diff -u -3 -p -u -r1.6 Graph.java --- src/nongnu/cashews/rdf/Graph.java 2005/03/24 23:29:26 1.6 +++ src/nongnu/cashews/rdf/Graph.java 2005/03/27 14:53:20 @@ -47,7 +47,7 @@ public class Graph * @see Triple * @serial the graph of RDF triples. */ - private Set graph; + private Set graph; /** * Returns true if the specified object is either of type Graph, @@ -87,7 +87,7 @@ public class Graph * * @return a graph of RDF triples. */ - public Set getGraph() + public Set getGraph() { return graph; }