Index: src/nongnu/cashews/owls/expression/Condition.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/expression/Condition.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 Condition.java --- src/nongnu/cashews/owls/expression/Condition.java 31 Mar 2005 16:50:14 -0000 1.1 +++ src/nongnu/cashews/owls/expression/Condition.java 31 Mar 2005 18:00:10 -0000 @@ -1,32 +1,34 @@ /* Condition.java -- Representation of a condition. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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 a particular - * logical language. - * + * This interface represents an OWL-S condition in a particular 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 interface Condition { + } Index: src/nongnu/cashews/owls/expression/DRSCondition.java =================================================================== RCS file: src/nongnu/cashews/owls/expression/DRSCondition.java diff -N src/nongnu/cashews/owls/expression/DRSCondition.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/nongnu/cashews/owls/expression/DRSCondition.java 31 Mar 2005 18:00:10 -0000 @@ -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: src/nongnu/cashews/owls/expression/DRSExpression.java diff -N src/nongnu/cashews/owls/expression/DRSExpression.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/nongnu/cashews/owls/expression/DRSExpression.java 31 Mar 2005 18:00:10 -0000 @@ -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/Expression.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/expression/Expression.java,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 Expression.java --- src/nongnu/cashews/owls/expression/Expression.java 31 Mar 2005 16:59:25 -0000 1.2 +++ src/nongnu/cashews/owls/expression/Expression.java 31 Mar 2005 18:00:10 -0000 @@ -1,22 +1,22 @@ /* Expression.java -- Representation of an expression. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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; @@ -24,9 +24,8 @@ package nongnu.cashews.owls.expression; import nongnu.cashews.rdf.XMLLiteral; /** - * This class represents an OWL-S expression in a particular - * logical language. - * + * This class represents an OWL-S expression in a particular logical language. + * * @author Andrew John Hughes (address@hidden) */ public class Expression @@ -41,14 +40,14 @@ public class Expression /** * The value of this expression, in the form of literal XML. - * + * * @see nongnu.cashews.rdf.XMLLiteral */ private XMLLiteral value; /** * Sets the logical formalism used by this expression. - * + * * @param newLang the new language to use. */ public void setLanguage(LogicLanguage newLang) Index: src/nongnu/cashews/owls/expression/KIFCondition.java =================================================================== RCS file: src/nongnu/cashews/owls/expression/KIFCondition.java diff -N src/nongnu/cashews/owls/expression/KIFCondition.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/nongnu/cashews/owls/expression/KIFCondition.java 31 Mar 2005 18:00:10 -0000 @@ -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: src/nongnu/cashews/owls/expression/KIFExpression.java diff -N src/nongnu/cashews/owls/expression/KIFExpression.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/nongnu/cashews/owls/expression/KIFExpression.java 31 Mar 2005 18:00:10 -0000 @@ -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/LogicLanguage.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/expression/LogicLanguage.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 LogicLanguage.java --- src/nongnu/cashews/owls/expression/LogicLanguage.java 31 Mar 2005 16:50:14 -0000 1.1 +++ src/nongnu/cashews/owls/expression/LogicLanguage.java 31 Mar 2005 18:00:10 -0000 @@ -1,22 +1,22 @@ /* LogicLanguage.java -- Representation of an OWL-S logic language. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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; @@ -27,46 +27,43 @@ import java.util.ArrayList; import java.util.List; /** - * This class represents a particular logical formalism, such - * as KIF, DRS or SWRL. At present, it simply allows for the specification - * of zero or more URIs, which point to the documentation for the - * formalism. - * + * This class represents a particular logical formalism, such as KIF, DRS or + * SWRL. At present, it simply allows for the specification of zero or more + * URIs, which point to the documentation for the formalism. + * * @author Andrew John Hughes (address@hidden) */ public class LogicLanguage { /** - * A representation of the logical formalism, SWRL, - * as defined by the W3C. + * A representation of the logical formalism, SWRL, as defined by the W3C. */ public static final LogicLanguage SWRL = new SWRL(); /** - * A representation of the logical formalism, DRS, - * as defined by the DAML team. + * A representation of the logical formalism, DRS, as defined by the DAML + * team. */ public static final LogicLanguage DRS = new DRS(); /** - * A representation of the logical formalism, KIF, - * as defined by Stanford University. + * A representation of the logical formalism, KIF, as defined by Stanford + * University. */ public static final LogicLanguage KIF = new KIF(); /** - * A list of URIs which specify the location - * of the documentation for this formalism. - * + * A list of URI s which specify the location of the + * documentation for this formalism. + * * @serial the URIs of this formalism's documentation. * @see java.net.URI */ private List uris; /** - * The default constructor for a LogicLanguage - * instance. + * The default constructor for a LogicLanguage instance. */ public LogicLanguage() { @@ -74,9 +71,9 @@ public class LogicLanguage } /** - * Adds a URI to the list specifying the documentation - * for this formalism. - * + * Adds a URI to the list specifying the documentation for this + * formalism. + * * @param uri the URI to add. * @see java.net.URI */ @@ -86,39 +83,37 @@ public class LogicLanguage } /** - * Returns the list of URIs for this logic - * formalism. - * - * @return a cloned list of the URIs of this formalism. + * Returns the list of URI s for this logic formalism. + * + * @return a cloned list of the URI s of this formalism. */ public List getURIs() { List clonedURIs = new ArrayList(); for (URI uri : uris) { - try - { - URI newURI = new URI(uri.toString()); - clonedURIs.add(newURI); - } - catch (URISyntaxException e) - { - throw new IllegalStateException("The list of URIs includes an "+ - "Âinvalid UR.", e); - } + try + { + URI newURI = new URI(uri.toString()); + clonedURIs.add(newURI); + } + catch (URISyntaxException e) + { + throw new IllegalStateException("The list of URIs includes " + + "an invalid URI.", e); + } } return clonedURIs; } - + /** - * A specific subclass of LogicLanguage, which represents - * the SWRL logic formalism. Instances of this are not modifiable. - * + * A specific subclass of LogicLanguage, which represents the + * SWRL logic formalism. Instances of this are not modifiable. + * * @author Andrew John Hughes (address@hidden) * @see LogicLanguage */ - private static final class SWRL - extends LogicLanguage + private static final class SWRL extends LogicLanguage { /** @@ -129,144 +124,139 @@ public class LogicLanguage } /** - * This method always throws an exception in this subclass - * in order to prevent derivations of the SWRL formalism. - * - * @throws UnsupportedOperationException as the formalism - * can not be modified. + * This method always throws an exception in this subclass in order to + * prevent derivations of the SWRL formalism. + * + * @throws UnsupportedOperationException as the formalism can + * not be modified. */ public void addURI(URI uri) { - throw new UnsupportedOperationException("The SWRL logic language "+ - "instance is not modifable."); + throw new UnsupportedOperationException("The SWRL logic language " + + "instance is not modifable."); } /** - * Returns the list of URIs for the SWRL logic - * formalism. - * + * Returns the list of URI s for the SWRL logic formalism. + * * @return the SWRL URIs. */ public List getURIs() { List swrl = new ArrayList(); try - { - swrl.add(new URI("http://www.w3.org/2003/11/swrl")); - } + { + swrl.add(new URI("http://www.w3.org/2003/11/swrl")); + } catch (URISyntaxException e) - { - throw new IllegalStateException("The SWRL URL is invalid.", e); - } + { + throw new IllegalStateException("The SWRL URL is invalid.", e); + } return swrl; } } /** - * A specific subclass of LogicLanguage, which represents - * the DRS logic formalism. Instances of this are not modifiable. - * + * A specific subclass of LogicLanguage, which represents the + * DRS logic formalism. Instances of this are not modifiable. + * * @author Andrew John Hughes (address@hidden) * @see LogicLanguage */ - private static final class DRS - extends LogicLanguage + private static final class DRS extends LogicLanguage { /** - * The default constructor for the DRS language, which stores - * the URIs for its specification documents. + * The default constructor for the DRS language, which stores the URIs for + * its specification documents. */ - public DRS() + public DRS() { } /** - * This method always throws an exception in this subclass - * in order to prevent derivations of the DRS formalism. - * - * @throws UnsupportedOperationException as the formalism - * can not be modified. + * This method always throws an exception in this subclass in order to + * prevent derivations of the DRS formalism. + * + * @throws UnsupportedOperationException as the formalism can + * not be modified. */ public void addURI(URI uri) { - throw new UnsupportedOperationException("The DRS logic language "+ - "instance is not modifable."); + throw new UnsupportedOperationException("The DRS logic language " + + "instance is not modifable."); } /** - * Returns the list of URIs for the DRS logic - * formalism. - * + * Returns the list of URI s for the DRS logic formalism. + * * @return the DRS URIs. */ public List getURIs() { List drs = new ArrayList(); try - { - drs.add(new URI("http://www.daml.org/services/owl-s/1.1/" + - "generic/drs.owl")); - } + { + drs.add(new URI("http://www.daml.org/services/owl-s/1.1/" + + "generic/drs.owl")); + } catch (URISyntaxException e) - { - throw new IllegalStateException("The DRS URL is invalid.", e); - } + { + throw new IllegalStateException("The DRS URL is invalid.", e); + } return drs; } } /** - * A specific subclass of LogicLanguage, which represents - * the KIF logic formalism. Instances of this are not modifiable. - * + * A specific subclass of LogicLanguage, which represents the + * KIF logic formalism. Instances of this are not modifiable. + * * @author Andrew John Hughes (address@hidden) * @see LogicLanguage */ - private static final class KIF - extends LogicLanguage + private static final class KIF extends LogicLanguage { /** - * The default constructor for the KIF language, which stores - * the URIs for its specification documents. + * The default constructor for the KIF language, which stores the URIs for + * its specification documents. */ - public KIF() + public KIF() { } /** - * This method always throws an exception in this subclass - * in order to prevent derivations of the KIF formalism. - * - * @throws UnsupportedOperationException as the formalism - * can not be modified. + * This method always throws an exception in this subclass in order to + * prevent derivations of the KIF formalism. + * + * @throws UnsupportedOperationException as the formalism can not be + * modified. */ public void addURI(URI uri) { - throw new UnsupportedOperationException("The KIF logic language "+ - "instance is not modifable."); + throw new UnsupportedOperationException("The KIF logic language " + + "instance is not modifable."); } /** - * Returns the list of URIs for the KIF logic - * formalism. - * + * Returns the list of URI s for the KIF logic formalism. + * * @return the KIF URIs. */ public List getURIs() { List kif = new ArrayList(); try - { - kif.add(new URI("http://logic.stanford.edu/kif/kif.html")); - } + { + kif.add(new URI("http://logic.stanford.edu/kif/kif.html")); + } catch (URISyntaxException e) - { - throw new IllegalStateException("The KIF URL is invalid.", e); - } + { + throw new IllegalStateException("The KIF URL is invalid.", e); + } return kif; } Index: src/nongnu/cashews/owls/expression/SWRLCondition.java =================================================================== RCS file: src/nongnu/cashews/owls/expression/SWRLCondition.java diff -N src/nongnu/cashews/owls/expression/SWRLCondition.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/nongnu/cashews/owls/expression/SWRLCondition.java 31 Mar 2005 18:00:10 -0000 @@ -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/owls/expression/SWRLExpression.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/expression/SWRLExpression.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 SWRLExpression.java --- src/nongnu/cashews/owls/expression/SWRLExpression.java 31 Mar 2005 16:59:25 -0000 1.1 +++ src/nongnu/cashews/owls/expression/SWRLExpression.java 31 Mar 2005 18:00:10 -0000 @@ -1,39 +1,37 @@ /* SWRLExpression.java -- Representation of a SWRL expression. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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 SWRL. - * + * * @author Andrew John Hughes (address@hidden) */ -public class SWRLExpression - extends Expression +public class SWRLExpression extends Expression { /** - * This is the default constructor, which creates a new - * expression using the SWRL logical formalism and an empty - * body. + * This is the default constructor, which creates a new expression using the + * SWRL logical formalism and an empty body. */ public SWRLExpression() { @@ -42,16 +40,16 @@ public class SWRLExpression } /** - * 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. + * 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."); + throw new UnsupportedOperationException("The logic language of this " + + "class can not be changed."); } } Index: src/nongnu/cashews/owls/process/Input.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/process/Input.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 Input.java --- src/nongnu/cashews/owls/process/Input.java 31 Mar 2005 15:25:30 -0000 1.1 +++ src/nongnu/cashews/owls/process/Input.java 31 Mar 2005 18:00:10 -0000 @@ -1,32 +1,34 @@ /* Input.java -- Representation of an OWL-S input. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.process; /** * This class represents an input to an OWL-S process. - * + * * @author Andrew John Hughes (address@hidden) */ -public class Input +public class Input extends Parameter { + } Index: src/nongnu/cashews/owls/process/Local.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/process/Local.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 Local.java --- src/nongnu/cashews/owls/process/Local.java 31 Mar 2005 15:25:30 -0000 1.1 +++ src/nongnu/cashews/owls/process/Local.java 31 Mar 2005 18:00:10 -0000 @@ -1,37 +1,37 @@ /* Local.java -- Representation of locally-defined AtomicProcess parameter. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.process; /** - * This class represents a local parameter, which is bound - * within the preconditions of an AtomicProcess. - * CompositeProcesses may not include Local + * This class represents a local parameter, which is bound within the + * preconditions of an AtomicProcess. + * CompositeProcess es may not include Local * parameters. - * + * * @author Andrew John Hughes (address@hidden) * @see AtomicProcess * @see CompositeProcess */ -public class Local - extends Parameter +public class Local extends Parameter { + } Index: src/nongnu/cashews/owls/process/Output.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/process/Output.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 Output.java --- src/nongnu/cashews/owls/process/Output.java 31 Mar 2005 15:25:30 -0000 1.1 +++ src/nongnu/cashews/owls/process/Output.java 31 Mar 2005 18:00:10 -0000 @@ -1,32 +1,33 @@ /* Output.java -- Representation of an OWL-S output. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.process; /** * This class represents an output from an OWL-S process. - * + * * @author Andrew John Hughes (address@hidden) */ -public class Output +public class Output extends Parameter { + } Index: src/nongnu/cashews/owls/process/Parameter.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/process/Parameter.java,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 Parameter.java --- src/nongnu/cashews/owls/process/Parameter.java 31 Mar 2005 16:50:14 -0000 1.2 +++ src/nongnu/cashews/owls/process/Parameter.java 31 Mar 2005 18:00:10 -0000 @@ -1,22 +1,22 @@ /* Parameter.java -- Representation of a OWL-S process model parameter. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.process; @@ -26,25 +26,25 @@ import nongnu.cashews.rdf.XMLLiteral; import java.net.URI; /** - * A Parameter is a generalization of the - * inputs and outputs found within an OWL-S process. - * + * A Parameter is a generalization of the inputs and outputs + * found within an OWL-S process. + * * @author Andrew John Hughes (address@hidden) */ public abstract class Parameter { /** - * A URI which specifies the OWL class - * from which the values of this parameter are taken. - * + * A URI which specifies the OWL class from which the values of + * this parameter are taken. + * * @see java.net.URI */ private URI type; /** * The value of this parameter, in the form of literal XML. - * + * * @see nongnu.cashews.rdf.XMLLiteral */ private XMLLiteral value; Index: src/nongnu/cashews/owls/process/Result.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/process/Result.java,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 Result.java --- src/nongnu/cashews/owls/process/Result.java 31 Mar 2005 17:06:13 -0000 1.3 +++ src/nongnu/cashews/owls/process/Result.java 31 Mar 2005 18:00:10 -0000 @@ -1,22 +1,22 @@ /* Result.java -- Representation of an OWL-S process result. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.process; @@ -27,28 +27,27 @@ import nongnu.cashews.owls.expression.Ex import java.util.List; /** - * This class represents the Result of an OWL-S - * process. It bundles the conditional effects and outputs - * of the process, as well as parameters that are used within - * this context. - * + * This class represents the Result of an OWL-S process. It + * bundles the conditional effects and outputs of the process, as well as + * parameters that are used within this context. + * * @author Andrew John Hughes (address@hidden) */ public class Result { /** - * A list of ResultVars used within the scope - * of this Result instance. - * + * A list of ResultVar s used within the scope of this + * Result instance. + * * @serial the result variables scoped over this instance. */ private List variables; /** - * A list of Conditions used within the scope - * of this Result instance. - * + * A list of Condition s used within the scope of this + * Result instance. + * * @serial the conditions scoped over this instance. */ private List conditions; @@ -56,7 +55,7 @@ public class Result /** * A list of Expressions used within the scope of this * Result instance to define the effects of this operation. - * + * * @serial the effects scoped over this instance. */ private List expressions; Index: src/nongnu/cashews/owls/process/ResultVar.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/owls/process/ResultVar.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 ResultVar.java --- src/nongnu/cashews/owls/process/ResultVar.java 31 Mar 2005 15:25:30 -0000 1.1 +++ src/nongnu/cashews/owls/process/ResultVar.java 31 Mar 2005 18:00:10 -0000 @@ -1,35 +1,35 @@ /* ResultVar.java -- Representation of a local result parameter. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.process; /** - * This class represents a universally quantified parameter declared in - * the result condition, which is not a process parameter. These parameters - * are scoped over the entire Result object, and may - * be referenced by Outputs and effects. - * + * This class represents a universally quantified parameter declared in the + * result condition, which is not a process parameter. These parameters are + * scoped over the entire Result object, and may be referenced by + * Output s and effects. + * * @author Andrew John Hughes (address@hidden) */ -public class ResultVar - extends Parameter +public class ResultVar extends Parameter { + } Index: src/nongnu/cashews/rdf/XMLLiteral.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/rdf/XMLLiteral.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 XMLLiteral.java --- src/nongnu/cashews/rdf/XMLLiteral.java 31 Mar 2005 16:42:12 -0000 1.1 +++ src/nongnu/cashews/rdf/XMLLiteral.java 31 Mar 2005 18:00:10 -0000 @@ -1,31 +1,32 @@ /* XMLLiteral.java -- Representation of an XML tree in literal form. - Copyright (C) 2005 The University of Sheffield. + Copyright (C) 2005 The University of Sheffield. -This file is part of the CASheW-s editor. + 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 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. + 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.rdf; /** * An XMLLiteral is an XML tree in literal form. - * + * * @author Andrew John Hughes (address@hidden) */ public class XMLLiteral { + }