[Mulgara-svn] r1647 - in trunk/src/jar: content-n3/java/org/mulgara/content/n3 content-rlog/java/org/mulgara/content/rlog content-rlog/java/org/mulgara/krule/rlog/ast/output content-rlog/java/org/mulgara/krule/rlog/rdf query/java/org/jrdf/graph query/java/org/mulgara/connection query/java/org/mulgara/query query/java/org/mulgara/query/filter query/java/org/mulgara/query/filter/arithmetic query/java/org/mulgara/query/filter/value query/java/org/mulgara/query/operation querylang/java/org/mulgara/itql querylang/java/org/mulgara/sparql querylang/java/org/mulgara/sparql/parser querylang/java/org/mulgara/sparql/parser/cst resolver/java/org/mulgara/resolver resolver-gis/java/org/mulgara/resolver/gis resolver-gis/java/org/mulgara/resolver/gis/tools resolver-lucene/java/org/mulgara/resolver/lucene resolver-spi/java/org/mulgara/content resolver-spi/java/org/mulgara/resolver/spi resolver-store/java/org/mulgara/store/statement/xa resolver-store/java/org/mulgara/store/statement/xa11 resolver-url/java/org/mulgara/resolver/url resolver-xsd/java/org/mulgara/resolver/xsd server/java/org/mulgara/server server-rmi/java/org/mulgara/server/rmi store-stringpool/java/org/mulgara/store/stringpool store-stringpool/java/org/mulgara/store/stringpool/xa store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11 store-xa/java/org/mulgara/store/xa tuples/java/org/mulgara/store/tuples util/java/org/mulgara/util util/java/org/mulgara/util/functional web/java/org/mulgara/webquery web/java/org/mulgara/webquery/html
pag at mulgara.org
pag at mulgara.org
Thu Mar 26 20:31:10 UTC 2009
Author: pag
Date: 2009-03-26 13:31:07 -0700 (Thu, 26 Mar 2009)
New Revision: 1647
Modified:
trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3Statements.java
trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3WriterUnitTest.java
trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java
trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatements.java
trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatementsUnitTest.java
trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStructure.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomGenerator.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomWriter.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/KruleWriter.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceGenerator.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceWriter.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleGenerator.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleWriter.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/rdf/URIReference.java
trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java
trunk/src/jar/query/java/org/jrdf/graph/Literal.java
trunk/src/jar/query/java/org/mulgara/connection/Connection.java
trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java
trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java
trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java
trunk/src/jar/query/java/org/mulgara/query/ConstraintOperation.java
trunk/src/jar/query/java/org/mulgara/query/GraphAnswer.java
trunk/src/jar/query/java/org/mulgara/query/GraphVariable.java
trunk/src/jar/query/java/org/mulgara/query/Query.java
trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/And.java
trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java
trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java
trunk/src/jar/query/java/org/mulgara/query/filter/BoundFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/IsIriFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/IsUriFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/LangMatches.java
trunk/src/jar/query/java/org/mulgara/query/filter/Not.java
trunk/src/jar/query/java/org/mulgara/query/filter/Or.java
trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFn.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/IRI.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java
trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java
trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java
trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java
trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java
trunk/src/jar/query/java/org/mulgara/query/operation/TxOp.java
trunk/src/jar/querylang/java/org/mulgara/itql/CommandSplitter.java
trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBean.java
trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterException.java
trunk/src/jar/querylang/java/org/mulgara/itql/SableCCInterpreter.java
trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java
trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
trunk/src/jar/querylang/java/org/mulgara/itql/TqlSessionUI.java
trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java
trunk/src/jar/querylang/java/org/mulgara/sparql/PatternMapper.java
trunk/src/jar/querylang/java/org/mulgara/sparql/PatternTransformer.java
trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/QueryStructureImpl.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AnnotatedNode.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicLangMatches.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicSameTerm.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BlankNode.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DoubleLiteral.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IntegerLiteral.java
trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/RDFLiteral.java
trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISDistanceStatements.java
trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java
trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/tools/GEO.java
trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java
trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneTransformer.java
trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentHandler.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ReresolvableResolution.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/SystemResolver.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java
trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/LiteralGraphTuples.java
trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/XA11StatementStoreImpl.java
trunk/src/jar/resolver-url/java/org/mulgara/resolver/url/URLStatements.java
trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/BackupOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/BuildRulesOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/CreateDefaultGraphOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/CreateGraphOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseFactoryInitializer.java
trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSecurityAdapterInitializer.java
trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
trunk/src/jar/resolver/java/org/mulgara/resolver/InternalResolverFactory.java
trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyGraphOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
trunk/src/jar/resolver/java/org/mulgara/resolver/Operation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/RestoreOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/SetGraphOperation.java
trunk/src/jar/resolver/java/org/mulgara/resolver/StreamContent.java
trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
trunk/src/jar/resolver/java/org/mulgara/resolver/SystemGraphSecurityAdapter.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResourceWrapperXAResource.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
trunk/src/jar/server/java/org/mulgara/server/AbstractServer.java
trunk/src/jar/server/java/org/mulgara/server/ServerInfo.java
trunk/src/jar/server/java/org/mulgara/server/ServerMBean.java
trunk/src/jar/server/java/org/mulgara/server/ServiceListingServlet.java
trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/BlankNodeAllocator.java
trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/DataStruct.java
trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/XA11StringPoolImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPNumber.java
trunk/src/jar/store-xa/java/org/mulgara/store/xa/XAStatementStore.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/PartialColumnComparator.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/TuplesOperations.java
trunk/src/jar/util/java/org/mulgara/util/LongMapper.java
trunk/src/jar/util/java/org/mulgara/util/QueryParams.java
trunk/src/jar/util/java/org/mulgara/util/Rmi.java
trunk/src/jar/util/java/org/mulgara/util/StringUtil.java
trunk/src/jar/util/java/org/mulgara/util/functional/C.java
trunk/src/jar/web/java/org/mulgara/webquery/QueryResponsePage.java
trunk/src/jar/web/java/org/mulgara/webquery/QueryServlet.java
trunk/src/jar/web/java/org/mulgara/webquery/html/Anchor.java
trunk/src/jar/web/java/org/mulgara/webquery/html/Break.java
trunk/src/jar/web/java/org/mulgara/webquery/html/HtmlElement.java
trunk/src/jar/web/java/org/mulgara/webquery/html/Span.java
trunk/src/jar/web/java/org/mulgara/webquery/html/TableRow.java
Log:
Fixed javadoc. This included: using absolute packaged references where needed, adding descriptions to param and return statements, updating param names (sometimes the name hand changed, sometimes the params were a totally different list to what was present), and updated possibly special characters to html entities (especially lt and gt)
Modified: trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3Statements.java
===================================================================
--- trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3Statements.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3Statements.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -51,7 +51,7 @@
import org.mulgara.store.tuples.Tuples;
/**
- * Parses an {@link InputStream} into {@link Statements}.
+ * Parses an {@link java.io.InputStream} into {@link Statements}.
*
* This particular implementation is complicated by the need to adapt the Jena
* N3 <q>push</q> parser to be a <q>pull</q> parser instead.
Modified: trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3WriterUnitTest.java
===================================================================
--- trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3WriterUnitTest.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3WriterUnitTest.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -49,7 +49,7 @@
*/
public class N3WriterUnitTest extends TestCase {
/**
- * Test {@link N3Wrtier} writing.
+ * Test {@link N3Writer} writing.
*
* @throws Exception if there's an error running the test (note that if the test
* merely fails, this should <em>not</em> throw any exception
Modified: trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java
===================================================================
--- trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-n3/java/org/mulgara/content/n3/Parser.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -70,24 +70,19 @@
import org.mulgara.util.TempDir;
/**
- * This class parses N3 data. It is implemented as a {@link Runnable} to allow it to be running in
- * the background filling a queue, while a consumer thread drains the queue.
+ * <p>This class parses N3 data. It is implemented as a {@link Runnable} to allow it to be running in
+ * the background filling a queue, while a consumer thread drains the queue.</p>
*
* <p>Because ResolverSession (and the underlying StringPoolSession) may not be accessed
* concurrently from multiple threads, there is some extra complication when creating blank nodes,
* whereby blank-node instances are created in the parser thread but their id's are allocated later
- * in the app-thread.
+ * in the app-thread.</p>
*
* @created 2004-04-02
* @author <a href="http://staff.pisoftware.com/anewman">Andrew Newman</a>
* @author <a href="http://staff.pisoftware.com/davidm">David Makepeace</a>
* @author <a href="http://staff.pisoftware.com/raboczi">Simon Raboczi</a>
- * @version $Revision: 1.8 $
- * @modified $Date: 2005/01/05 04:58:02 $ @maintenanceAuthor $Author: newmana $
- * @company <a href="mailto:info at PIsoftware.com">Plugged In Software</a>
- * @copyright © 2004 <a href="http://www.PIsoftware.com/">Plugged In
- * Software Pty Ltd</a>
- * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
+ * @copyright © 2004 <a href="http://www.PIsoftware.com/">Plugged In Software Pty Ltd</a>
*/
class Parser extends Thread implements N3ParserEventHandler {
/** Logger. */
@@ -156,7 +151,7 @@
private URI baseURI;
/**
- * Map of <code>@prefix</code> directives.
+ * Map of <code>prefix</code> directives.
*
* Keys are {@link String}s of the form <code>p3p:</code>.
* Values are also {@link String}s, and of the form
Modified: trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatements.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatements.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatements.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -52,7 +52,7 @@
import org.mulgara.krule.rlog.parser.URIParseException;
/**
- * Parses an {@link InputStream} into {@link Statements}.
+ * Parses an {@link java.io.InputStream} into {@link Statements}.
* This parser uses memory and does not stream.
*
* @created Feb 24, 2009
Modified: trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatementsUnitTest.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatementsUnitTest.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStatementsUnitTest.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -62,7 +62,7 @@
/**
- * Test {@link N3Statements} parsing the file <tt>test0014.rdf</tt>..
+ * Test {@link RlogStatements} parsing a file.
*
* @throws Exception if there's an error running the test (note that if the
* test merely fails, this should <em>not</em> throw any exception
Modified: trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStructure.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStructure.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogStructure.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -683,7 +683,7 @@
/**
* Scans nodes that are URIReferences, and adds them to the list of namespaces if not already there.
- * @param r A node that may be a reference to be scanned.
+ * @param n A node that may be a reference to be scanned.
*/
void addToNamespace(Node n) {
if (!(n instanceof URIReference)) return;
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomGenerator.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomGenerator.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomGenerator.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -59,8 +59,8 @@
/**
- * Creates a new writer for a collection of variables.
- * @param vars The variables to be written.
+ * Creates a new writer for a collection of axioms.
+ * @param axioms The axioms to be written.
* @throws LocalizeException If localized nodes could not be accessed.
*/
public AxiomGenerator(Collection<Axiom> axioms, ResolverSession resolverSession) throws LocalizeException {
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomWriter.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomWriter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/AxiomWriter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -35,8 +35,8 @@
public Collection<Axiom> axioms;
/**
- * Creates a new writer for a collection of variables.
- * @param vars The variables to be written.
+ * Creates a new writer for a collection of axioms.
+ * @param axioms The axioms to be written.
*/
public AxiomWriter(Collection<Axiom> axioms) {
this.axioms = axioms;
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/KruleWriter.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/KruleWriter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/KruleWriter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -34,8 +34,7 @@
/**
* Construct a writer for writing Krule RDF/XML files.
- * @param varWriter The object to write the variables.
- * @param ruleWriter The object to write the rules.
+ * @param interpreter The object used for parsing the RLog text.
*/
public KruleWriter(Interpreter interpreter) {
this.interpreter = interpreter;
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceGenerator.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceGenerator.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceGenerator.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -41,7 +41,8 @@
/**
* Creates a new writer for a collection of references.
- * @param vars The variables to be written.
+ * @param refs The references to be written.
+ * @param resolverSession The session used for globalizing data.
* @throws LocalizeException If localized nodes could not be accessed.
*/
public ReferenceGenerator(Collection<URIReference> refs, ResolverSession resolverSession) throws LocalizeException {
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceWriter.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceWriter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/ReferenceWriter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -34,8 +34,8 @@
public Collection<URIReference> refs;
/**
- * Creates a new writer for a collection of variables.
- * @param vars The variables to be written.
+ * Creates a new writer for a collection of references.
+ * @param refs The references to be written.
*/
public ReferenceWriter(Collection<URIReference> refs) {
this.refs = refs;
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleGenerator.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleGenerator.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleGenerator.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -287,8 +287,9 @@
/**
* Prints the body for a rule to a PrintStream.
- * @param out The PrintStream to send the where clause to.
- * @param body The where clause that makes up the body of the rule.
+ * @param triples The list of triples to append to.
+ * @param query The node that represents the query that makes up the body.
+ * @param body The list of predicates that makes up the body.
* @param subs The part of a where clause to be removed from the body.
* @throws URIParseException If one of the URIs in the constraint expression has an invalid syntax.
* @throws LocalizeException Unable to localize some of the URIs in the constraints.
@@ -306,7 +307,7 @@
/**
* Emit the operation for the difference between the body and the subtractions as a set of triples.
- * @param triples The
+ * @param triples The list of triples to append to.
* @param body The main body to be selected (the minuend).
* @param subs The constraints to be subtracted from the body (the subtrahends).
* @throws URIParseException The constraints contain URIs that are invalid.
@@ -337,7 +338,7 @@
/**
* Adds a list of constraints as the arguments to a single ConstraintConjunction.
* @param triples The list of triples to add the statements to.
- * @param conj The node representing the conjunction being emitted.
+ * @param conjNode The node representing the conjunction being emitted.
* @param conjunction The list of constraints that form the conjunction to be added.
* @throws URIParseException If one of the URIs in the constraint has an invalid syntax.
* @throws LocalizeException Unable to localize a URI in the expression.
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleWriter.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleWriter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/output/RuleWriter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -44,8 +44,8 @@
public Collection<Rule> rules;
/**
- * Creates a new writer for a collection of variables.
- * @param vars The variables to be written.
+ * Creates a new writer for a collection of rules.
+ * @param rules The rules to be written.
*/
public RuleWriter(Collection<Rule> rules) {
this.rules = rules;
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/rdf/URIReference.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/rdf/URIReference.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/rdf/URIReference.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -104,7 +104,7 @@
* Creates a URIReference. This requires the URI to be pre-built.
* @param prefix A namespace prefix.
* @param value The value within the namespace.
- * @param uri The string for the URI to wrap, and that is represented by prefix:value
+ * @param uriStr The string for the URI to wrap, and that is represented by prefix:value
* @return A new URIReference.
*/
public static URIReference create(String prefix, String value, String uriStr) {
Modified: trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/jrdf/graph/AbstractLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -205,10 +205,8 @@
* Provide a legible representation of a literal, following the N-Triples
* format defined in
* <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntrip_strings">§3.2</a>
- * of the <a href="http://www.w3.org/">
- * <acronym title="World Wide Web Consortium">W3C</acronym></a>'s
- * <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210">RDF Test
- * Cases</a> Recommendation.
+ * of the <a href="http://www.w3.org/">W3C</a>'s (World Wide Web Consortium)
+ * <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210">RDF Test Cases</a> Recommendation.
*
* Well-formed Unicode surrogate pairs in the lexical form are escaped as a
* single 8-digit hexadecimal <code>\U</code> escape sequence rather than a
Modified: trunk/src/jar/query/java/org/jrdf/graph/Literal.java
===================================================================
--- trunk/src/jar/query/java/org/jrdf/graph/Literal.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/jrdf/graph/Literal.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -134,10 +134,8 @@
* Provide a legible representation of a literal, following the N-Triples
* format defined in
* <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntrip_strings">§3.2</a>
- * of the <a href="http://www.w3.org/">
- * <acronym title="World Wide Web Consortium">W3C</acronym></a>'s
- * <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210">RDF Test
- * Cases</a> Recommendation.
+ * of the <a href="http://www.w3.org/">W3C</a>'s (World Wide Web Consortium)
+ * <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210">RDF Test Cases</a> Recommendation.
*
* Well-formed Unicode surrogate pairs in the lexical form are escaped as a
* single 8-digit hexadecimal <code>\U</code> escape sequence rather than a
Modified: trunk/src/jar/query/java/org/mulgara/connection/Connection.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/Connection.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/connection/Connection.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -125,7 +125,7 @@
/**
* Starts and commits transactions on this connection, by turning the autocommit
* flag on and off.
- * @param autocommit <code>true</code> if the flag is to be on.
+ * @param autoCommit <code>true</code> if the flag is to be on.
* @throws QueryException The session could not change state.
*/
public void setAutoCommit(boolean autoCommit) throws QueryException;
@@ -152,7 +152,7 @@
/**
* Generic command execution method.
- * @param The command to execute.
+ * @param cmd The command to execute.
* @return A status message
* @throws Exception A general exception catchall
*/
Modified: trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/connection/DummyConnection.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -73,7 +73,7 @@
/**
* Starts and commits transactions on this connection, by turning the autocommit
* flag on and off.
- * @param autocommit <code>true</code> if the flag is to be on.
+ * @param autoCommit <code>true</code> if the flag is to be on.
* @throws QueryException The session could not change state.
*/
public void setAutoCommit(boolean autoCommit) throws QueryException {
Modified: trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/connection/SessionConnection.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -165,7 +165,7 @@
/**
* Starts and commits transactions on this connection, by turning the autocommit
* flag on and off.
- * @param autocommit <code>true</code> if the flag is to be on.
+ * @param autoCommit <code>true</code> if the flag is to be on.
* @throws QueryException The session could not change state.
*/
public void setAutoCommit(boolean autoCommit) throws QueryException {
@@ -246,7 +246,8 @@
/**
* Sets the session information for this connection
* @param session The session to set to.
- * @param securityDomainURI The security domain to use for the session.
+ * @param securityDomainUri The security domain to use for the session.
+ * @param serverUri The server the session is connected to.
*/
private void setSession(Session session, URI securityDomainUri, URI serverUri) {
this.session = session;
Modified: trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -73,7 +73,9 @@
return constraint;
}
- /** {@inheritDoc} */
+ /**
+ * @return The graph described in this constraint
+ */
public ConstraintElement getModel() {
return graph;
}
@@ -85,7 +87,9 @@
}
- /** {@inheritDoc} */
+ /**
+ * @return <code>true</code> If the constraint wrapped by this constraint is a ConstraintIs.
+ */
public boolean isInnerConstraintIs() {
return constraint instanceof ConstraintIs;
}
Modified: trunk/src/jar/query/java/org/mulgara/query/ConstraintOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstraintOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstraintOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -35,7 +35,7 @@
/**
* A constraint expression composed of two subexpressions and a dyadic operator.
- * Implements {@link Transformable}.
+ * Can be transformed.
*
* @created 2001-08-12
*
Modified: trunk/src/jar/query/java/org/mulgara/query/GraphAnswer.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/GraphAnswer.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/GraphAnswer.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -62,7 +62,7 @@
/**
* Constructs a new BooleanAnswer.
- * @param result The result this answer represents.
+ * @param rawAnswer The result this answer represents.
*/
public GraphAnswer(Answer rawAnswer) {
int cols = rawAnswer.getNumberOfVariables();
Modified: trunk/src/jar/query/java/org/mulgara/query/GraphVariable.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/GraphVariable.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/GraphVariable.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -46,7 +46,7 @@
/**
* Construct a model from a {@link URL}.
*
- * @param uri the {@link URI} of the model to query
+ * @param variable The variable this expression represents.
* @throws IllegalArgumentException if <var>url</var> is <code>null</code>
*/
public GraphVariable(Variable variable) {
Modified: trunk/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/Query.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/Query.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -269,7 +269,7 @@
/**
* Accessor for the <code>variableList</code> property.
*
- * @return a {@link List} containing one or more {@link Variable}s, {@link ContantValue}s,
+ * @return a {@link List} containing one or more {@link Variable}s, {@link ConstantValue}s,
* {@link Count}s or {@link Subquery}
*/
public List<SelectElement> getVariableList() {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/AbstractBooleanFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -33,7 +33,7 @@
/**
* Create a function for testing a term
- * @param The term to test
+ * @param operand The term to test
*/
public AbstractBooleanFn(RDFTerm operand) {
super(operand);
@@ -41,7 +41,7 @@
}
/**
- * @see org.mulgara.query.filter.Filter#test()
+ * @see org.mulgara.query.filter.Filter#test(Context)
*/
public boolean test(Context context) throws QueryException {
setCurrentContext(context);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/And.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/And.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/And.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -41,7 +41,7 @@
* Returns the head of the list ANDed with the product of the remainder of the list.
* <code>false</code> and Exception is <code>false</code>.
* <code>true</code> and Exception is Exception.
- * @see org.mulgara.query.filter.Filter#test()
+ * @see org.mulgara.query.filter.Filter#test(Context)
*/
boolean testList(Context context, List<Filter> filters) throws QueryException {
Filter head = filters.get(0);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/BinaryComparisonFilter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -47,7 +47,7 @@
}
/**
- * @see org.mulgara.query.filter.Filter#test()
+ * @see org.mulgara.query.filter.Filter#test(Context)
*/
public boolean test(Context context) throws QueryException {
setCurrentContext(context);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/BinaryTestFilter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -46,7 +46,7 @@
}
/**
- * @see org.mulgara.query.filter.Filter#test()
+ * @see org.mulgara.query.filter.Filter#test(Context)
*/
public boolean test(Context context) throws QueryException {
setCurrentContext(context);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/BoundFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/BoundFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/BoundFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -30,7 +30,7 @@
/**
* Create a function for testing a variable
- * @param The variable to test
+ * @param operand The variable to test
*/
public BoundFn(Var operand) {
super(operand);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/IsBlankFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -29,7 +29,7 @@
/**
* Create a function for testing a variable
- * @param The variable to test
+ * @param operand The variable to test
*/
public IsBlankFn(RDFTerm operand) {
super(operand);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/IsIriFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/IsIriFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/IsIriFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -29,7 +29,7 @@
/**
* Create a function for testing a variable
- * @param The variable to test
+ * @param operand The variable to test
*/
public IsIriFn(RDFTerm operand) {
super(operand);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/IsLiteralFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -29,7 +29,7 @@
/**
* Create a function for testing if a value it a Literal
- * @param The variable to test
+ * @param operand The variable to test
*/
public IsLiteralFn(RDFTerm operand) {
super(operand);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/IsUriFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/IsUriFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/IsUriFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -29,7 +29,7 @@
/**
* Create a function for testing a variable
- * @param The variable to test
+ * @param operand The variable to test
*/
public IsUriFn(RDFTerm operand) {
super(operand);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/LangMatches.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/LangMatches.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/LangMatches.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -18,7 +18,7 @@
/**
* The lang matches a language pattern.
* This is a rudimentary implementation that is equivalent to the Jena langMatch test.
- * TODO: fully implement RFC 4647: {@link http://www.ietf.org/rfc/rfc4647.txt}
+ * TODO: fully implement RFC 4647: <a href="http://www.ietf.org/rfc/rfc4647.txt">http://www.ietf.org/rfc/rfc4647.txt</a>
*
* @created Mar 8, 2008
* @author Paul Gearon
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/Not.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/Not.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/Not.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -33,7 +33,7 @@
/**
* Create an inversion of a filter
- * @param filter The filter to invert
+ * @param operand The filter to invert
*/
public Not(Filter operand) {
super(operand);
@@ -41,7 +41,7 @@
}
/**
- * @see org.mulgara.query.filter.Filter#test()
+ * @see org.mulgara.query.filter.Filter#test(Context)
*/
public boolean test(Context context) throws QueryException {
setCurrentContext(context);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/Or.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/Or.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/Or.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -41,7 +41,7 @@
* Returns the head of the list ORed with the sum of the remainder of the list.
* <code>true</code> or Exception is <code>true</code>.
* <code>false</code> or Exception is Exception.
- * @see org.mulgara.query.filter.Filter#test()
+ * @see org.mulgara.query.filter.Filter#test(Context)
*/
boolean testList(Context context, List<Filter> filters) throws QueryException {
Filter head = filters.get(0);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -42,18 +42,19 @@
private String oldFlags = null;
/**
- * Creates an equality test operation with default flags
- * @param lhs The first term to compare
- * @param rhs The second term to compare
+ * Creates an RegEx test operation with default flags.
+ * @param str The string value to be tested.
+ * @param patternStr The pattern to match the string against.
*/
public RegexFn(ValueLiteral str, ValueLiteral patternStr) {
super(str, patternStr);
}
/**
- * Creates an equality test operation with default flags
- * @param lhs The first term to compare
- * @param rhs The second term to compare
+ * Creates an RegEx test operation with specified flags.
+ * @param str The string value to be tested.
+ * @param patternStr The pattern to match the string against.
+ * @param flagExpression The flags to be used in the expression.
*/
public RegexFn(ValueLiteral str, ValueLiteral patternStr, ValueLiteral flagExpression) {
super(str, patternStr);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -36,7 +36,7 @@
/** @see org.mulgara.query.filter.value.ComparableExpression#getValue() */
public Number getValue() throws QueryException { return getNumber(); }
- /** @see org.mulgara.query.filter.RDFTerm#equals() */
+ /** @see org.mulgara.query.filter.RDFTerm#equals(RDFTerm) */
public boolean equals(RDFTerm v) throws QueryException { return compare(getNumber(), v.getValue()) == 0; }
/** @see org.mulgara.query.filter.RDFTerm#isBlank() */
@@ -51,10 +51,10 @@
/** @see org.mulgara.query.filter.RDFTerm#isURI() */
public boolean isURI() throws QueryException { return false; }
- /** @see org.mulgara.query.filter.RDFTerm#sameTerm() */
+ /** @see org.mulgara.query.filter.RDFTerm#sameTerm(RDFTerm) */
public boolean sameTerm(RDFTerm v) throws QueryException { return getNumber().equals(v.getValue()); }
- /** @see org.mulgara.query.filter.Filter#test() */
+ /** @see org.mulgara.query.filter.Filter#test(Context) */
public boolean test(Context context) throws QueryException {
setCurrentContext(context);
return getNumber().doubleValue() != 0.0;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -57,7 +57,7 @@
/**
* A recursive method to build a NumericExpression that represents the addition of all addends in the list.
- * @param operands The list of addends to sum.
+ * @param ops The list of addends to sum.
* @return A NumericExpression which represents the addition of everything in the ops list.
*/
private static NumericExpression createNestedAdd(List<NumericExpression> ops) {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -58,7 +58,7 @@
/**
* A recursive method to build a NumericExpression that represents the division of all values in the list.
* This constructs a linked list of divisions.
- * @param operands The list of values to divide.
+ * @param ops The list of values to divide.
* @return A NumericExpression which represents the ordered division of everything in the ops list.
*/
private static NumericExpression createNestedDivision(List<NumericExpression> ops) {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -57,7 +57,7 @@
/**
* A recursive method to build a NumericExpression that represents the subtraction of all values in the list.
- * @param operands The list of values to subtract.
+ * @param ops The list of values to subtract.
* @return A NumericExpression which represents the ordered subtraction of everything in the ops list.
*/
private static NumericExpression createNestedSubtraction(List<NumericExpression> ops) {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -57,7 +57,7 @@
/**
* A recursive method to build a NumericExpression that represents the product of all multipliers in the list.
- * @param operands The list of multipliers to multiply.
+ * @param ops The list of multipliers to multiply.
* @return A NumericExpression which represents the product of everything in the ops list.
*/
private static NumericExpression createNestedMultiply(List<NumericExpression> ops) {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -52,7 +52,9 @@
return !lessThan(v);
}
- /** {@inheritDoc} */
+ /**
+ * Equality comparison used for other objects that are explicitly comparable.
+ */
public boolean equals(ComparableExpression v) throws QueryException {
return compare(getValue(), v.getValue()) == 0;
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -84,7 +84,7 @@
* {@inheritDoc}
* This method will only return <code>true</code> when the elements are identical.
* Since this object is a literal, then an incorrect comparison will throw an exception.
- * {@link http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal}
+ * See: <a href="http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal">http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal</a>
* <em>produces a type error if the arguments are both literal but are not the same RDF term</em>
*/
public boolean equals(RDFTerm v) throws QueryException {
@@ -115,7 +115,7 @@
* <li>XSD strings</li>
* </ul>
* Simple strings and numbers are handled elsewhere.
- * @param vl The other value literal to be compared against.
+ * @param term The other value literal to be compared against.
* @return <code>true</code> if direct comparison is allowed between these types.
* @throws QueryException If there is a data error accessing the types.
*/
@@ -134,7 +134,7 @@
/**
* Compares the type of this object to the type of another object. This takes into account
* that Simple Literals claim to have a string type, when they have no type at all.
- * @param vl The object to test.
+ * @param term The object to test.
* @return <code>true</code> if the types are exactly the same. If both types are strings,
* then both objects have to be typed literals, or untyped literals.
* @throws QueryException If there is an error accessing the type data.
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -36,7 +36,7 @@
/**
* Creates the value to wrap the string
- * @param s The string to wrap
+ * @param node The string to wrap
*/
public BlankNodeValue(BlankNode node) {
this.node = node;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -44,7 +44,7 @@
/**
* Creates the value to wrap the boolean
- * @param n The boolean to wrap
+ * @param b The boolean to wrap
*/
public Bool(Boolean b) {
super(b, TYPE);
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFn.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/DataTypeFn.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -42,7 +42,7 @@
return false;
}
- /** @see org.mulgara.query.filter.RDFTerm#isIri() */
+ /** @see org.mulgara.query.filter.RDFTerm#isIRI() */
public boolean isIRI() throws QueryException {
return true;
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/IRI.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/IRI.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/IRI.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -37,8 +37,8 @@
private final URI value;
/**
- * Creates the value to wrap the string
- * @param s The string to wrap
+ * Creates the value to wrap the uri.
+ * @param u The URI to wrap
*/
public IRI(URI u) {
value = u;
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -44,6 +44,7 @@
* Creates the value to wrap a number. This is the same as the previous
* constructor, but allows the caller to provide a hint for the URI.
* @param n The number to wrap
+ * @param typeUri The XSD URI for the type of number.
*/
public NumericLiteral(Number n, URI typeUri) {
super(getValueFor(n, typeUri), typeUri);
@@ -65,7 +66,7 @@
/**
* Tests if a URI represents a numeric type.
- * @param The URI to test.
+ * @param type The URI to test.
* @return <code>true</code> iff type represents a numeric type.
*/
public static boolean isNumeric(URI type) {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -85,7 +85,7 @@
}
/**
- * @see org.mulgara.query.filter.value.ComparableExpression#test()
+ * @see org.mulgara.query.filter.value.ComparableExpression#test(Context)
*/
public boolean test(Context context) throws QueryException {
return value != null && ((String)value).length() != 0;
@@ -108,7 +108,7 @@
* This method will only return <code>true</code> when the elements are identical, and
* <code>false</code> when they are the same type, but different values.
* Since this object is a literal, then a comparison with another type will throw an exception.
- * {@link http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal}
+ * See: <a href="http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal">http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal</a>
* <em>produces a type error if the arguments are both literal but are not the same RDF term</em>
*/
public boolean equals(RDFTerm v) throws QueryException {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -55,7 +55,7 @@
/**
* Instantiate a variable.
- * @param n The boolean to wrap
+ * @param name The boolean to wrap
*/
public Var(String name) {
this.name = name;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -24,7 +24,7 @@
* commits through a different method to the standard call path, while the normal
* call will pass in a {@link org.mulgara.connection.DummyConnection}.
*
- * After performing a commit, all connections are left in place {@link #cleanup(Iterator)} and
+ * After performing a commit, all connections are left in place and
* the transaction is kept open {@link #stayInTx()}.
*
* @created 2007-08-09
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -75,7 +75,7 @@
/**
* Perform the action of creating the graph.
- * @param The connection to a session to create the graph in.
+ * @param conn The connection to a session to create the graph in.
* @return Text describing the outcome.
*/
public Object execute(Connection conn) throws QueryException {
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -85,7 +85,6 @@
* and receive over the connection. Delegates to the {@link #doTx(Connection, OutputStream)}
* abstract method to send the data over the connection.
* @param conn The connection to the server.
- * @return The number of statements inserted.
* @throws QueryException There was an error working with data at the server end.
* @throws IOException There was an error transferring data over the network.
*/
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Load.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Load.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -78,7 +78,7 @@
* @param graphURI The URI of the graph to receive the data.
* @param stream The local input stream that is the source of data to load.
* @param contentType the content type for the stream.
- * @param fileUri
+ * @param file A string form of the uri of the file to load.
*/
public Load(URI graphURI, InputStream stream, MimeType contentType, String file) {
this(toUri(file), graphURI, true);
@@ -140,8 +140,8 @@
/**
* Attempt to turn a filename into a URI. If unsuccessful return null.
- * @param filename
- * @return
+ * @param filename The path for a file.
+ * @return The URI for the file, or null if the filename could not be converted.
*/
private static URI toUri(String filename) {
if (filename == null) return null;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/NullOp.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -24,7 +24,7 @@
public class NullOp extends LocalCommand {
/**
- * @see org.mulgara.operation.Command#isUICommand()
+ * @see org.mulgara.query.operation.Command#isUICommand()
*/
public boolean isUICommand() {
return false;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -63,7 +63,7 @@
* constructor for API calls that use their own server connections. The server URI
* is not an argument for the restore operation, and will be specified by the existing
* connection.
- * @param source The input stream that will provide the restore contents.
+ * @param inputStream The input stream that will provide the restore contents.
*/
public Restore(InputStream inputStream) {
this(null, null, true);
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -26,7 +26,7 @@
* rollbacks through a different method to the standard call path, while the normal
* call will pass in a {@link org.mulgara.connection.DummyConnection}.
*
- * After performing a rollback, all connections are removed {@link #cleanup(Iterator)} and
+ * After performing a rollback, all connections are removed and
* the transaction is closed {@link #stayInTx()}.
*
* @created 2007-08-09
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/TxOp.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/TxOp.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/TxOp.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -27,7 +27,7 @@
/**
* Perform the operation for manipulating this transaction.
- * @param s The session to perform the operation on.
+ * @param conn The connection to perform the operation on.
* @return The resulting message.
* @throws QueryException The operation failed.
*/
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/CommandSplitter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/CommandSplitter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/CommandSplitter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -28,7 +28,7 @@
/**
* Split the given string into an array of strings containing individual elements.
- * @param All the commands in a long string.
+ * @param commands All the commands in a long string.
* @return An array of individual commands.
*/
List<String> split(String commands);
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBean.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBean.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBean.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -78,7 +78,7 @@
* This class provides a simple interface for the execution of iTQL queries.
* </p>
* <p>
- * Note. This class will be deprecated and is going away in favour of {@link org.mulgara.connection.MulgaraConnection}
+ * Note. This class will be deprecated and is going away in favour of {@link org.mulgara.connection.Connection}
* based interfaces.
* </p>
*
@@ -86,8 +86,6 @@
* @author Tate Jones
* @author Ben Warren
* @author Tom Adams
- * @version $Revision: 1.11 $
- * @modified $Date: 2005/04/04 11:30:11 $ by $Author: tomadams $
* @copyright ©2001-2004 <a href="http://www.tucanatech.com/">Tucana Technology, Inc</a>
* @copyright ©2005 <a href="mailto:tomjadams at gmail.com">Tom Adams</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterException.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterException.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterException.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -29,7 +29,7 @@
/**
- * Exception thrown by {@link ItqlInterpreter} operations when the query returns
+ * Exception thrown by {@link TqlInterpreter} operations when the query returns
* an expection.
*
* @created 2002-01-10
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/SableCCInterpreter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/SableCCInterpreter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/SableCCInterpreter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -67,11 +67,11 @@
*
* Resolution will treat the token as an XML
* <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">qualified
- * names</a> if the {@link #aliasMap} <code>aliasMap</code> contains a key
+ * names</a> if the <code>aliasMap</code> contains a key
* for the URI scheme part that can be treated as an XML namespace prefix.
* For example, <kbd>dc:title</kbd> is treated as a qname and mapped to the
* to the URI <kbd>http://purl.org/dc/elements/1.1/title</kbd>, assuming the
- * {@link #aliasMap} had an entry mapping <code>"dc"</code> to the Dublin
+ * aliasMap had an entry mapping <code>"dc"</code> to the Dublin
* Core namespace.
*
* @param token the token to be converted, which should actually be a
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -924,7 +924,7 @@
/**
- * @see org.mulgara.itql.QueryInterpreter#toLiteralImpl(org.mulgara.itql.node.PLiteral)
+ * @see org.mulgara.itql.SableCCInterpreter#toLiteralImpl(PLiteral)
* Despite onyl being accessed from within this package (both locally and from
* {@link VariableBuilder}) this method must be public, as it has to appear in
* the {@link Interpreter} interface.
@@ -950,7 +950,7 @@
/**
- * @see org.mulgara.itql.QueryInterpreter#toURI(org.mulgara.itql.node.Token)
+ * @see org.mulgara.itql.SableCCInterpreter#toURI(Token)
*/
public URI toURI(Token token) {
@@ -960,7 +960,7 @@
/**
- * @see org.mulgara.itql.QueryInterpreter#nextAnonVariable()
+ * @see org.mulgara.itql.SableCCInterpreter#nextAnonVariable()
* Called by {@link ConstraintExpressionBuilder}
*/
public Variable nextAnonVariable() {
@@ -1120,7 +1120,7 @@
* the <code>rawVariableList</code> and the returned list will <strong>not
* </strong> contain the variable prefix <code>$</code> in their name.
*
- * @param rawOrderList The SableCC list of elements to order by.
+ * @param orderClause The SableCC list of elements to order by.
* @return a list of {@link org.mulgara.query.Variable}s, suitable for use
* in creating a {@link org.mulgara.query.Query}, or an empty list if
* there are no elements to be ordered by.
@@ -1183,7 +1183,7 @@
* to resolve aliases. To comply with a HAVING clause the predicate must be one of:
* mulgara:occurs mulgara:occursLessThan mulgara:occursMoreThan.
*
- * @param expression a constraint expression from the parser
+ * @param havingClause a constraint expression from the parser
* @return A new ConstraintExpression representing the HAVING condition
* @throws QueryException if <code>rawConstraintExpression</code> does not
* represent a valid query
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -294,7 +294,7 @@
}
/**
- * Executes a script given by URL name. {@see executeScript} for implementation.
+ * Executes a script given by URL name. See {@link #executeScript(URL)} for implementation.
* @param script The string for the script URL.
* @throws MalformedURLException The given script name cannot be represented as a URL.
*/
@@ -483,9 +483,6 @@
/**
* Initiates a session using the given <code>session</code>
- * @param session the interactive session to issue commands to
- * @param in the stream to read commands from
- * @param out the stream to print responses to
*/
private void motdInitialization() {
gui.print("TQL Command Line Interface" + EOL);
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlSessionUI.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlSessionUI.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlSessionUI.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -102,8 +102,10 @@
/**
* Create a new UI representation.
- * @param newItqlSession the itql session to call when we receive commands and
+ * @param newTqlSession the itql session to call when we receive commands and
* when we want to display them.
+ * @param inStream The console input for this session.
+ * @param outStream The console output for this session.
*/
public TqlSessionUI(TqlSession newTqlSession, InputStream inStream, OutputStream outStream) {
super();
@@ -517,7 +519,7 @@
/**
* Adds a text to the UI. Sends a little "closure" to the UI thread.
- * @param message the message to display.
+ * @param cmd the command to send.
*/
public void injectCommand(final String cmd) {
invokeAndWait(new Runnable() {
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -216,15 +216,14 @@
/** Defines an interface for mapping expressions into an equivalent Filter operation. */
private static interface ExpressionToTerm<T extends Expression> {
/**
- * A main entry point for the mapper, which will do the casting into {@link #typedMap(Expression, FilterMapper)}.
+ * A main entry point for the mapper, which will do the casting into {@link #typedMap(Expression)}.
* @param expr The expression to map to an RDFTerm.
- * @param parent The surrounding FilterMapper class.
* @return A {@link RDFTerm} that is the equivalent to the given expression.
*/
public RDFTerm map(Expression expr) throws MulgaraParserException;
/**
* Convert an Expression to a RDFTerm for Mulgara.
- * @param expr The Expression to convert. Should be specific to the mapper.
+ * @param pattern The Expression to convert. Should be specific to the mapper.
* @return The RDFTerm relevant to the mapper.
*/
RDFTerm typedMap(T pattern) throws MulgaraParserException;
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/PatternMapper.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/PatternMapper.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/PatternMapper.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -56,7 +56,7 @@
import org.mulgara.query.rdf.XSD;
/**
- * This object maps a {@link GroupGraphPattern} into a {@link ConstraintExpresion}.
+ * This object maps a {@link GroupGraphPattern} into a {@link ConstraintExpression}.
*
* @created Apr 21, 2008
* @author Paul Gearon
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/PatternTransformer.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/PatternTransformer.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/PatternTransformer.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -28,7 +28,7 @@
import org.mulgara.query.filter.value.Bool;
/**
- * This object transforms a {@link ConstraintExpression} into a minimized {@link ConstraintExpresion}.
+ * This object transforms a {@link ConstraintExpression} into a minimized {@link ConstraintExpression}.
*
* @created May 06, 2008
* @author Paul Gearon
@@ -66,7 +66,7 @@
/**
* Utility method to add a transformer to the map, keyed on the class it transforms.
- * @param mapper The mapper to add to the map.
+ * @param tx The transformer to add to the map.
*/
static void addToMap(Transformer<?> tx) {
txMap.put(tx.getTxType(), tx);
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -114,7 +114,7 @@
/**
* Sets the default graphs to use in parsed queries.
- * @param graph The graph URIs to use as the default graphs. A <code>null</code> value
+ * @param graphUris The graph URIs to use as the default graphs. A <code>null</code> value
* is treated the same as an empty list.
*/
public SparqlInterpreter setDefaultGraphUris(List<URI> graphUris) {
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/QueryStructureImpl.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/QueryStructureImpl.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/QueryStructureImpl.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -269,7 +269,7 @@
* Create a new IRI based on a prefixed name.Note that this implementation
* only accepts URIs, and not the more complete IRI.
* @param r The string containing the image of the IRI
- * @returnA new {@link org.mulgara.sparql.parser.cst.IRIReference} for the string image.
+ * @return A new {@link org.mulgara.sparql.parser.cst.IRIReference} for the string image.
* @throws ParseException The r parameter was not a syntactically valid URI.
*/
IRIReference newPrefixedName(String r) throws ParseException {
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AnnotatedNode.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AnnotatedNode.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AnnotatedNode.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -57,8 +57,9 @@
}
/**
- * Create an annotated subject node from a collection.
- * @param list The RDF collection.
+ * Create an annotated subject node from a set of properties.
+ * @param subject The subject for every triple in the list.
+ * @param properties The properties and values for the subject.
*/
public AnnotatedNode(Node subject, PropertyList properties) {
this.subject = subject;
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicLangMatches.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicLangMatches.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicLangMatches.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -27,7 +27,8 @@
/**
* Construct an invocation to the STR function
- * @param operand The operand for the function
+ * @param op1 The first operand for the function
+ * @param op2 The second operand for the function
*/
public BicLangMatches(Expression op1, Expression op2) {
super(op1, op2);
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicSameTerm.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicSameTerm.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicSameTerm.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -27,7 +27,8 @@
/**
* Construct an invocation to the STR function
- * @param operand The operand for the function
+ * @param op1 The first operand for the function
+ * @param op2 The second operand for the function
*/
public BicSameTerm(Expression op1, Expression op2) {
super(op1, op2);
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BlankNode.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BlankNode.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BlankNode.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -38,7 +38,7 @@
/**
* Get the label for this node.
- * @return
+ * @return The label for this node.
*/
public String getLabel() {
return label;
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -32,7 +32,7 @@
/**
* Constructs the literal from a string image.
- * @param value The string image of the value for this literal
+ * @param s The string image of the value for this literal
*/
public DecimalLiteral(String s) {
this.value = new BigDecimal(s);
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DoubleLiteral.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DoubleLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DoubleLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -30,7 +30,7 @@
/**
* Constructs the literal from a string image.
- * @param value The string image of the value for this literal
+ * @param s The string image of the value for this literal
*/
public DoubleLiteral(String s) {
this.value = Double.parseDouble(s);
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IntegerLiteral.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IntegerLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IntegerLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -30,7 +30,7 @@
/**
* Constructs the literal from a string image.
- * @param value The string image of the value for this literal
+ * @param s The string image of the value for this literal
*/
public IntegerLiteral(String s) {
this.value = Integer.parseInt(s);
Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/RDFLiteral.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/RDFLiteral.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/RDFLiteral.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -75,7 +75,7 @@
/**
* Constructor for a typed literal.
* @param value The literal data.
- * @param datatype The type of the literal.
+ * @param language The language code for the literal.
*/
public RDFLiteral(String value, String language) {
this.value = unescape(value);
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -60,7 +60,7 @@
}
/**
- * @see org.mulgara.resolver.Operation#execute(org.mulgara.resolver.OperationContext, org.mulgara.resolver.spi.SystemResolver, org.mulgara.resolver.spi.ResolverSessionFactory, org.mulgara.resolver.spi.DatabaseMetadata)
+ * @see org.mulgara.resolver.Operation#execute(OperationContext, SystemResolver, DatabaseMetadata)
* Runs the rules over the configured data.
*/
public void execute(OperationContext operationContext,
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/BackupOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/BackupOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/BackupOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -122,11 +122,10 @@
/**
* Dumps the entire database to the specified Writer.
*
- * @param stringPool StringPool
- * @param resolver Resolver
- * @param metadata DatabaseMetadata
- * @param writer Writer
- * @throws Exception
+ * @param systemResolver The system resolver for the database.
+ * @param metadata The Metadata for the database.
+ * @param writer Writer The output to write to.
+ * @throws Exception Due to any error accessing the database or writing to the writer.
*/
private void backupDatabase(SystemResolver systemResolver, DatabaseMetadata metadata, Writer writer)
throws Exception {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/BuildRulesOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/BuildRulesOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/BuildRulesOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -71,7 +71,7 @@
}
/**
- * @see org.mulgara.resolver.Operation#execute(org.mulgara.resolver.OperationContext, org.mulgara.resolver.spi.SystemResolver, org.mulgara.resolver.spi.ResolverSessionFactory, org.mulgara.resolver.spi.DatabaseMetadata)
+ * @see org.mulgara.resolver.Operation#execute(OperationContext, SystemResolver, DatabaseMetadata)
*/
public void execute(OperationContext operationContext,
SystemResolver systemResolver,
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/CreateDefaultGraphOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/CreateDefaultGraphOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/CreateDefaultGraphOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -26,7 +26,8 @@
import org.mulgara.store.nodepool.NodePool;
/**
- * An {@link Operation} that implements the {@link Session#createDefaultGraph} method.
+ * An {@link Operation} that implements the
+ * {@link org.mulgara.resolver.DatabaseSession#createDefaultGraph(URI, URI)} method.
*
* @created May 8, 2008
* @author Paul Gearon
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/CreateGraphOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/CreateGraphOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/CreateGraphOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -43,8 +43,7 @@
import org.mulgara.util.QueryParams;
/**
- * An {@link Operation} that implements the {@link Session#createModel} method.
- * TODO: Rename to CreateGraphOperation.
+ * An {@link Operation} that implements the {@link org.mulgara.server.Session#createModel(URI, URI)} method.
*
* @created 2004-11-24
* @author <a href="http://staff.pisoftware.com/raboczi">Simon Raboczi</a>
@@ -246,7 +245,7 @@
/**
* Test if the given URI is in a scheme which differentiates graphs based on fragments
* and there is no sub-graph name encoded in the URI.
- * @param graphUri The URI to test for the graph.
+ * @param u The URI to test for the graph.
* @return <code>true</code> only of the URI is in the known graph schemes.
*/
private static boolean fragmentScheme(URI u) {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/Database.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -83,7 +83,7 @@
* A database capable of managing and querying RDF models using a collection of
* {@link ResolverFactory} instances.
*
- * This class is essentially a transaction manager for the {@link Resolver}s.
+ * This class is essentially a transaction manager for the {@link org.mulgara.resolver.spi.Resolver}s.
*
* @created 2004-04-26
* @author <a href="http://www.pisoftware.com/raboczi">Simon Raboczi</a>
@@ -95,11 +95,10 @@
* Technology, Inc</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class Database implements SessionFactory
-{
+public class Database implements SessionFactory {
+
/** Logger. */
- private static final Logger logger =
- Logger.getLogger(Database.class.getName());
+ private static final Logger logger = Logger.getLogger(Database.class.getName());
/** Startup Logger - will always have info enabled */
private static final Logger startupLogger = Logger.getLogger("Startup");
@@ -108,7 +107,7 @@
* Placeholder indicating a nonexistent local node.
*
* This is a stopgap measure to deal with the lack of a defined negative
- * return value from {@link StringPool#findGNode}.
+ * return value from {@link org.mulgara.store.stringpool.StringPool#findGNode(org.mulgara.store.stringpool.SPObject)}.
*/
@SuppressWarnings("unused")
private final long NONE = NodePool.NONE;
@@ -174,7 +173,7 @@
Collections.unmodifiableMap(externalResolverFactoryMap);
/**
- * Keyed on model type {@link LocalNode}s, mapping to an
+ * Keyed on model type {@link org.mulgara.query.LocalNode}s, mapping to an
* {@link InternalResolverFactory} instance that wraps the actual
* {@link ResolverFactory} instance which manages that model type.
*/
@@ -371,7 +370,7 @@
* @param securityDomainURI the {@link URI} of the security domain this
* database is within, or <code>null</code> if this database is unsecured
* @param transactionManagerFactory the source for the
- * {@link TransactionManager}, never <code>null</code>
+ * {@link javax.transaction.TransactionManager}, never <code>null</code>
* @param transactionTimeout the default number of seconds before transactions
* time out, or zero to take the <var>transactionManagerFactory</var>'s default;
* never negative
@@ -379,25 +378,25 @@
* it is timed out, or zero to take the <var>transactionManagerFactory</var>'s
* default; never negative
* @param persistentNodePoolFactoryClassName the name of a
- * {@link NodePoolFactory} implementation which will be used to generate
+ * {@link org.mulgara.store.nodepool.NodePoolFactory} implementation which will be used to generate
* persistent local nodes, never <code>null</code>
* @param persistentStringPoolFactoryClassName the name of a
- * {@link StringPoolFactory} implementation which will be used to manage
+ * {@link org.mulgara.store.stringpool.StringPoolFactory} implementation which will be used to manage
* persistent RDF literals, never <code>null</code>
* @param systemResolverFactoryClassName the name of a
* {@link ResolverFactory} implementation which will be used to store
* system models; this class is required to register a model type
* @param temporaryNodePoolFactoryClassName the name of a
- * {@link NodePoolFactory} implementation which will be used to generate
+ * {@link org.mulgara.store.nodepool.NodePoolFactory} implementation which will be used to generate
* temporary local nodes, never <code>null</code>
* @param temporaryStringPoolFactoryClassName the name of a
- * {@link StringPoolFactory} implementation which will be used to manage
+ * {@link org.mulgara.store.stringpool.StringPoolFactory} implementation which will be used to manage
* temporary RDF literals, never <code>null</code>
* @param temporaryResolverFactoryClassName the name of a
* {@link ResolverFactory} implementation which will be used to store
* temporary statements, never <code>null</code>
* @param ruleLoaderClassName the name of a
- * {@link RuleLoader} implementation which will be used for loading
+ * {@link org.mulgara.rules.RuleLoader} implementation which will be used for loading
* rule frameworks, never <code>null</code>
* @param defaultContentHandlerClassName the name of the class that should be
* used to parse external content of unknown MIME type, or
@@ -405,8 +404,8 @@
* @throws IllegalArgumentException if <var>uri</var>,
* <var>systemResolverFactory</var> are <code>null</code>, or if the
* <var>uri</var> has a fragment part
- * @throws InitializerException if the {@link NodePoolFactory},
- * {@link ResolverFactory}, or {@link StringPoolFactory} instances
+ * @throws InitializerException if the {@link org.mulgara.store.nodepool.NodePoolFactory},
+ * {@link ResolverFactory}, or {@link org.mulgara.store.stringpool.StringPoolFactory} instances
* generated from the various class names can't be initialized
* @throws SystemException if <var>transactionTimeout</var> is negative
*/
@@ -462,12 +461,12 @@
* @param uri the unique {@link URI} naming this database, never
* <code>null</code>; this mustn't have a fragment part, because the
* fragment is used to represent models within the database
- * @param directory an area on the filesystem for the database's use; if this
+ * @param directories an array of areas on the filesystem for the database's use; if this
* is <code>null</code>, resolvers which require a filesystem can't be added
* @param securityDomainURI the {@link URI} of the security domain this
* database is within, or <code>null</code> if this database is unsecured
* @param transactionManagerFactory the source for the
- * {@link TransactionManager}, never <code>null</code>
+ * {@link javax.transaction.TransactionManager}, never <code>null</code>
* @param transactionTimeout the default number of seconds before transactions
* time out, or zero to take the <var>transactionManagerFactory</var>'s default;
* never negative
@@ -475,25 +474,25 @@
* it is timed out, or zero to take the <var>transactionManagerFactory</var>'s
* default; never negative
* @param persistentNodePoolFactoryClassName the name of a
- * {@link NodePoolFactory} implementation which will be used to generate
+ * {@link org.mulgara.store.nodepool.NodePoolFactory} implementation which will be used to generate
* persistent local nodes, never <code>null</code>
* @param persistentStringPoolFactoryClassName the name of a
- * {@link StringPoolFactory} implementation which will be used to manage
+ * {@link org.mulgara.store.stringpool.StringPoolFactory} implementation which will be used to manage
* persistent RDF literals, never <code>null</code>
* @param systemResolverFactoryClassName the name of a
* {@link ResolverFactory} implementation which will be used to store
* system models; this class is required to register a model type
* @param temporaryNodePoolFactoryClassName the name of a
- * {@link NodePoolFactory} implementation which will be used to generate
+ * {@link org.mulgara.store.nodepool.NodePoolFactory} implementation which will be used to generate
* temporary local nodes, never <code>null</code>
* @param temporaryStringPoolFactoryClassName the name of a
- * {@link StringPoolFactory} implementation which will be used to manage
+ * {@link org.mulgara.store.stringpool.StringPoolFactory} implementation which will be used to manage
* temporary RDF literals, never <code>null</code>
* @param temporaryResolverFactoryClassName the name of a
* {@link ResolverFactory} implementation which will be used to store
* temporary statements, never <code>null</code>
* @param ruleLoaderClassName the name of a
- * {@link RuleLoader} implementation which will be used for loading
+ * {@link org.mulgara.rules.RuleLoader} implementation which will be used for loading
* rule frameworks, never <code>null</code>
* @param defaultContentHandlerClassName the name of the class that should be
* used to parse external content of unknown MIME type, or
@@ -501,8 +500,8 @@
* @throws IllegalArgumentException if <var>uri</var>,
* <var>systemResolverFactory</var> are <code>null</code>, or if the
* <var>uri</var> has a fragment part
- * @throws InitializerException if the {@link NodePoolFactory},
- * {@link ResolverFactory}, or {@link StringPoolFactory} instances
+ * @throws InitializerException if the {@link org.mulgara.store.nodepool.NodePoolFactory},
+ * {@link ResolverFactory}, or {@link org.mulgara.store.stringpool.StringPoolFactory} instances
* generated from the various class names can't be initialized
* @throws SystemException if <var>transactionTimeout</var> is negative
*/
@@ -827,11 +826,11 @@
/**
- * Register a new kind of {@link Content} with this database.
+ * Register a new kind of {@link org.mulgara.content.Content} with this database.
*
- * @param className the name of a class implementing {@link ContentHandler}
+ * @param className the name of a class implementing {@link org.mulgara.content.ContentHandler}
* @throws IllegalArgumentException if <var>className</var> is
- * <code>null</code> or isn't a valid {@link ContentHandler}
+ * <code>null</code> or isn't a valid {@link org.mulgara.content.ContentHandler}
*/
public void addContentHandler(String className) {
if (logger.isDebugEnabled()) {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseFactoryInitializer.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseFactoryInitializer.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseFactoryInitializer.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -40,7 +40,7 @@
/**
* The database initialiser used to provide configuration information to
- * {@link NodePool} and {@link StringPool} instances.
+ * {@link org.mulgara.store.nodepool.NodePool} and {@link org.mulgara.store.stringpool.StringPool} instances.
*
* The {@link #close} method can be called after initialization to prevent
* access to the interface.
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -441,8 +441,8 @@
*
* @param graph the local node of a graph
* @return the local node representing the type of the <var>graph</var>, or
- * {@link NodePool#NONE} if the <var>graph</var> isn't stored within the
- * system
+ * {@link org.mulgara.store.nodepool.NodePool#NONE} if the <var>graph</var>
+ * isn't stored within the system
* @throws QueryException if the graph type can't be determined
*/
private URI findGraphTypeURI(long graph) throws QueryException, GlobalizeException {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSecurityAdapterInitializer.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSecurityAdapterInitializer.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSecurityAdapterInitializer.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -52,16 +52,15 @@
* Technology, Inc</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class DatabaseSecurityAdapterInitializer extends DatabaseInitializer
- implements SecurityAdapterInitializer
-{
+class DatabaseSecurityAdapterInitializer extends DatabaseInitializer implements SecurityAdapterInitializer {
+
/** The {@link Database} to initialize. */
private final Database database;
/** The metadata of the {link Database} to initialize. */
private final DatabaseMetadata databaseMetadata;
- /** A {@link SessionFactory} which produces unsecured {@link Session}s. */
+ /** A {@link SessionFactory} which produces unsecured {@link org.mulgara.server.Session}s. */
private final SessionFactory unsecuredSessionFactory;
/**
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -135,7 +135,7 @@
/** A fallback rule loader */
private static final String DUMMY_RULE_LOADER = "org.mulgara.rules.DummyRuleLoader";
- /** The registered {@link ContentHandler} instances. */
+ /** The registered {@link org.mulgara.content.ContentHandler} instances. */
private ContentHandlerManager contentHandlers;
/** The temporary model type-URI. */
@@ -321,7 +321,7 @@
*
* @param node an RDF node
* @return the preallocated local node number corresponding to the
- * <var>node</var>, never {@link NodePool#NONE}
+ * <var>node</var>, never {@link org.mulgara.store.nodepool.NodePool#NONE}
* @throws QueryException if the local node number can't be obtained
*/
long preallocate(Node node) throws QueryException {
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/InternalResolverFactory.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/InternalResolverFactory.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/InternalResolverFactory.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -49,8 +49,8 @@
* Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class InternalResolverFactory implements ResolverFactory
-{
+class InternalResolverFactory implements ResolverFactory {
+
/**
* The preallocated node for <code>rdf:type</code>.
*/
@@ -78,9 +78,9 @@
*
* @param resolverFactory the instance to wrap, never <code>null</code>
* @param rdfType the preallocated node for <code>rdf:type</code>, or
- * {@link NodePool#NONE} if unavailable
+ * {@link org.mulgara.store.nodepool.NodePool#NONE} if unavailable
* @param systemModel the preallocated node for the system model
- * (<code>#</code>), or {@link NodePool#NONE} if unavailable
+ * (<code>#</code>), or {@link org.mulgara.store.nodepool.NodePool#NONE} if unavailable
*/
InternalResolverFactory(ResolverFactory resolverFactory,
long rdfType,
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyGraphOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyGraphOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyGraphOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -41,38 +41,23 @@
import org.mulgara.resolver.spi.*;
/**
- * An {@link Operation} that implements the {@link Session#insert} and
- * {@link Session#delete} methods.
+ * An {@link Operation} that implements the {@link org.mulgara.server.Session#insert(URI, Query)} and
+ * {@link org.mulgara.server.Session#delete(URI, Query)} methods.
*
* The operation is really two closely-related operations combined into one
* class: modification by a specified set of {@link Triple}s, and modification
* by the result of a specified {@link Query}.
*
* @created 2004-11-24
- *
* @author <a href="http://staff.pisoftware.com/raboczi">Simon Raboczi</a>
- *
- * @version $Revision: 1.8 $
- *
- * @modified $Date: 2005/01/05 04:58:24 $ by $Author: newmana $
- *
- * @maintenanceAuthor $Author: newmana $
- *
- * @copyright ©2004 <a href="http://www.tucanatech.com/">Tucana
- * Technology, Inc</a>
- *
+ * @copyright ©2004 <a href="http://www.tucanatech.com/">Tucana Technology, Inc</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class ModifyGraphOperation implements Operation
-{
- /**
- * Logger.
- *
- * This is named after the class.
- */
- private static final Logger logger =
- Logger.getLogger(ModifyGraphOperation.class.getName());
+class ModifyGraphOperation implements Operation {
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(ModifyGraphOperation.class.getName());
+
/**
* The URI of the model to be removed.
*/
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -250,7 +250,7 @@
}
}
- /**
+ /**
* Acquire the mutex. The mutex is re-entrant, but {@link #releaseMutex} must be called as many
* times as this is called.
*
@@ -258,8 +258,9 @@
* can reliably get the current mutex-owner, and we use a lock around the mutex acquisition and
* release to do atomic tests and settting of additional variables associated with the mutex.
*
+ * @param <T> the type of exception to throw on failure
* @param timeout how many milliseconds to wait for the mutex, or 0 to wait indefinitely
- * @param T the type of exception to throw on failure
+ * @param exc An exception class that is the type that will be thrown in case of failure.
* @throws T if the mutex could not be acquired, either due to a timeout or due to an interrupt
*/
public final <T extends Throwable> void acquireMutex(long timeout, Class<T> exc) throws T {
@@ -294,8 +295,9 @@
/**
* Acquire the mutex, interrupting the existing holder if there is one.
*
+ * @param <T> the type of exception to throw on failure
* @param timeout how many milliseconds to wait for the mutex, or 0 to wait indefinitely
- * @param T the type of exception to throw on failure
+ * @param exc An exception class that is the type that will be thrown in case of failure.
* @throws T if the mutex could not be acquired, either due to a timeout or due to an interrupt
* @see #acquireMutex
*/
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/Operation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/Operation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/Operation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -32,7 +32,7 @@
import org.mulgara.resolver.spi.SystemResolver;
/**
- * {@link Operation}s correspond to methods of the {@link Session} interface
+ * {@link Operation}s correspond to methods of the {@link org.mulgara.server.Session} interface
* which need to be performed in a transactional context.
*
* They are created and used by {@link DatabaseSession}.
@@ -46,8 +46,7 @@
* Technology, Inc</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-interface Operation
-{
+interface Operation {
/**
* Perform a transactional operation.
*
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -39,7 +39,7 @@
import org.mulgara.resolver.spi.*;
/**
- * An {@link Operation} that implements the {@link Session#query} method.
+ * An {@link Operation} that implements the {@link org.mulgara.server.Session#query(Query)} method.
*
* @created 2004-11-25
*
@@ -50,8 +50,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class QueryOperation implements Operation
-{
+class QueryOperation implements Operation {
/** Logger. */
// private static final Logger logger = Logger.getLogger(QueryOperation.class.getName());
@@ -75,7 +74,7 @@
//
/**
- * Constructor for {@link Session#query(Query)} calls.
+ * Constructor for {@link org.mulgara.server.Session#query(Query)} calls.
*
* @param query the query to be evaluated, never <code>null</code>
* @param databaseSession never <code>null</code>
@@ -100,16 +99,14 @@
}
/**
- * Constructor for {@link Session#query(List)} calls.
+ * Constructor for {@link org.mulgara.server.Session#query(List)} calls.
*
- * @param queryList the {@link Query} instances to be evaluated, never
- * <code>null</code>
+ * @param queryList the {@link Query} instances to be evaluated, never <code>null</code>
* @param databaseSession never <code>null</code>
* @throws IllegalArgumentException if <var>queryList</var> or
* <var>databaseSession</var> are <code>null</code>
*/
- QueryOperation(List<Query> queryList, DatabaseSession databaseSession)
- {
+ QueryOperation(List<Query> queryList, DatabaseSession databaseSession) {
// Validate "query" parameter
if (queryList == null) {
throw new IllegalArgumentException("Null \"query\" parameter");
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/RestoreOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/RestoreOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/RestoreOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -649,7 +649,7 @@
* @param n2nMap the IntFile that maps from backup file node IDs to current
* store node IDs.
* @param oldNode the backup file node ID.
- * @param ResolverSession Used to allocate new nodes.
+ * @param resolverSession Used to allocate new nodes.
* @return the new node ID that the specified backup file node ID maps to.
* @throws Exception EXCEPTION TO DO
*/
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/SetGraphOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/SetGraphOperation.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/SetGraphOperation.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -48,7 +48,9 @@
import org.mulgara.resolver.spi.*;
/**
- * An {@link Operation} that implements the {@link Session#setModel} method.
+ * An {@link Operation} that implements the
+ * {@link org.mulgara.server.Session#setModel(URI, GraphExpression)} and
+ * {@link org.mulgara.server.Session#setModel(InputStream, URI, GraphExpression, MimeType)} methods.
*
* @created 2004-11-04
*
@@ -65,16 +67,11 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class SetGraphOperation implements Operation
-{
- /**
- * Logger.
- *
- * This is named after the class.
- */
- private static final Logger logger =
- Logger.getLogger(SetGraphOperation.class.getName());
+class SetGraphOperation implements Operation {
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(SetGraphOperation.class.getName());
+
private final URI srcModelURI;
private final URI destModelURI;
private final InputStream inputStream;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/StreamContent.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/StreamContent.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/StreamContent.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -121,7 +121,7 @@
/**
* @return {@inheritDoc}; always returns <code>null</code> because Java
- * {@link File}s don't have any inherent MIME type
+ * {@link java.io.File}s don't have any inherent MIME type
*/
public MimeType getContentType() {
return contentType;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/StringPoolSession.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -76,7 +76,7 @@
Logger.getLogger(StringPoolSession.class.getName());
/**
- * Stopgap to deal with the lack of a <q>no match</q> return value from the
+ * Stopgap to deal with the lack of a "no match" return value from the
* string pool.
*/
private static final long NONE = NodePool.NONE;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/SystemGraphSecurityAdapter.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/SystemGraphSecurityAdapter.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/SystemGraphSecurityAdapter.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -33,10 +33,10 @@
import org.mulgara.store.nodepool.NodePool;
/**
- * This {@link SecurityAdapter} enforces the sanctity of the system model
+ * This {@link org.mulgara.resolver.spi.SecurityAdapter} enforces the sanctity of the system model
* (<code>#</code>).
*
- * A {@link Session} may only modify the contents of the system model
+ * A {@link org.mulgara.server.Session} may only modify the contents of the system model
* indirectly, via the <code>backup</code>, <code>create</code>,
* <code>drop</code> and <code>restore</code> methods.
*
@@ -51,8 +51,7 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class SystemGraphSecurityAdapter extends NullSecurityAdapter
-{
+class SystemGraphSecurityAdapter extends NullSecurityAdapter {
/**
* The preallocated node representing the system model.
*/
Modified: trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISDistanceStatements.java
===================================================================
--- trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISDistanceStatements.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISDistanceStatements.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -49,8 +49,8 @@
* generates the following distance statements for each row:
* $x $z $y
* $y $z $x
- * $z <:type> <:distance>
- * $z <:magnitude> "f($xlat,$xlong,$ylat,$ylong)"^^xsd:double
+ * $z <:type> <:distance>
+ * $z <:magnitude> "f($xlat,$xlong,$ylat,$ylong)"^^xsd:double
*
* @created 2004-11-17
*
@@ -71,11 +71,9 @@
*/
public class GISDistanceStatements implements Statements {
- /**
- * Logger. This is named after the class.
- */
- private final static Logger log = Logger.getLogger(GISDistanceStatements.class.
- getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private final static Logger logger = Logger.getLogger(GISDistanceStatements.class.getName());
/** Number of statements generated per row of the Tuples */
private static final int STATEMENTS_PER_ROW = 4;
Modified: trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java
===================================================================
--- trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -397,7 +397,7 @@
}
/**
- * Resolves the constraint: $var <rdf:type> <geo:Point> <model>
+ * Resolves the constraint: $var <rdf:type> <geo:Point> <model>
*
* @param var Variable
* @param model long
@@ -441,7 +441,7 @@
}
/**
- * Resolves the constraint: $var <geo:lat> $lat <model>
+ * Resolves the constraint: $var <geo:lat> $lat <model>
*
* @param var Variable
* @param lat Variable
@@ -463,7 +463,7 @@
}
/**
- * Resolves the constraint: $var <geo:long> $lon <model>
+ * Resolves the constraint: $var <geo:long> $lon <model>
*
* @param var Variable
* @param lon Variable
Modified: trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/tools/GEO.java
===================================================================
--- trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/tools/GEO.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/tools/GEO.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -38,15 +38,15 @@
*
* <p>RDF Vocabulary for describing points:
* <code>
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
* xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#">
- * <geo:Point>
- * <geo:lat>54.5722</geo:lat>
- * <geo:long>0.014024</geo:long>
- * </geo:Point>
- * </rdf:RDF>
+ * <geo:Point>
+ * <geo:lat>54.5722</geo:lat>
+ * <geo:long>0.014024</geo:long>
+ * </geo:Point>
+ * </rdf:RDF>
*
- * (eg. <geo:Point geo:lat="54.5722" geo:long="0.014024"/> )
+ * (eg. <geo:Point geo:lat="54.5722" geo:long="0.014024"/> )
* </code>
*
* @created 2004-11-17
Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -149,7 +149,8 @@
* Create a new FullTextStringIndex object.
*
* @param indexerCache the indexer-cache to use to get the indexers
- * @param newEnableReverseTextIndex true if you can begin Lucene queries with wildcards.
+ * @param forWrites whether to acquire an index writer
+ * @param enableReverseTextIndex true if you can begin Lucene queries with wildcards.
* @throws FullTextStringIndexException on failure to obtain an index reader or writer
*/
public FullTextStringIndex(LuceneIndexerCache indexerCache, boolean forWrites,
@@ -657,7 +658,7 @@
*
* @param subject the subject; may be null
* @param predicate the predicate; may be null
- * @param literal literal to be searched via the analyzer; may be null
+ * @param object literal to be searched via the analyzer; may be null
* @return the maximum number of documents
* @throws FullTextStringIndexException if an error occurred
*/
Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneTransformer.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneTransformer.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneTransformer.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -44,9 +44,9 @@
* A query transformer for lucene. This accept constraints like in the following example:
* <pre>
* select $x $score from ... where
- * $x <mulgara:search> $s in <lucene> and
- * $s <foo> 'story' in <lucene> and
- * $s <mulgara:score> $score in <lucene>
+ * $x <mulgara:search> $s in <lucene> and
+ * $s <foo> 'story' in <lucene> and
+ * $s <mulgara:score> $score in <lucene>
* </pre>
*
* @created 2008-09-28
@@ -64,8 +64,8 @@
* Create a new tranformer to rewrite lucene queries.
*
* @param modelTypeURI the uri of the lucene model type
- * @param searchPredURI the uri of the search predicate
- * @param scorePredURI the uri of the score predicate
+ * @param searchPredUri the uri of the search predicate
+ * @param scorePredUri the uri of the score predicate
*/
public LuceneTransformer(URI modelTypeURI, URI searchPredUri, URI scorePredUri) {
this.modelTypeURI = modelTypeURI;
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentHandler.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentHandler.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentHandler.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -47,8 +47,7 @@
* Technology Inc</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public interface ContentHandler
-{
+public interface ContentHandler {
/**
* Parse {@link Content} into {@link Statements}.
*
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/BackupRestoreSession.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -11,7 +11,7 @@
* under the License.
*
* This file is an original work developed by Andrae Muys
- * Copyright (c) 2008 Andrae Muys <andrae at muys.id.au>
+ * Copyright (c) 2008 Andrae Muys andrae at muys.id.au
* All Rights Reserved.
*/
package org.mulgara.resolver.spi;
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ReresolvableResolution.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ReresolvableResolution.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ReresolvableResolution.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -52,7 +52,7 @@
/**
* Reresolve resolution given additional knowledge derived from other constraints in the query.
*
- * Note: assign/x and Resolution <=> assign/x and Resolution.reresolve(x).
+ * Note: assign/x and Resolution <=> assign/x and Resolution.reresolve(x).
*
* Reresolve is analogous to beta-reduction in the lambda calculus, it is defined as
* project({this.vars - bindings.vars}, restrict(bindings, this))
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/SystemResolver.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/SystemResolver.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/SystemResolver.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -53,7 +53,7 @@
/**
* Informs the system resolver of the metadata it uses for managing data.
* @param systemGraphNode The node for the system graph.
- * @param rdfTypeNode The node representing <rdf:type>.
+ * @param rdfTypeNode The node representing rdf:type.
* @param systemGraphTypeNode The node used for the SystemResolver graph type.
*/
public void initializeSystemNodes(long systemGraphNode, long rdfTypeNode, long systemGraphTypeNode);
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -53,7 +53,7 @@
/**
* Creates a new context for processing a filter, based on an existing context and a new Tuples.
* @param tuples The variables and bindings to use in filtering. Not all variables need be bound.
- * @param TuplesContext An existing context to get session information from.
+ * @param otherContext An existing context to get session information from.
*/
public TuplesContext(Tuples tuples, TuplesContext otherContext) {
this.tuples = tuples;
Modified: trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -2286,7 +2286,7 @@
* Constructs the Tuples to come from the store.
* @param startTriple The first triple for this tuples.
* @param endTriple The first triple pattern that is NOT part of this tuples.
- * This may not appear in the store, but if anything is <= this triple
+ * This may not appear in the store, but if anything is <= this triple
* then it is NOT in the tuples.
* @param prefixLength The number of elements used to identify the requires triples.
* @throws IOException If there was an I/O error accessing the triples data in the store.
Modified: trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/LiteralGraphTuples.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/LiteralGraphTuples.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/LiteralGraphTuples.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -39,7 +39,7 @@
/**
* Creates a new literal tuples containing graphs.
- * @param sorted
+ * @param graph The localnode for the graph to be represented.
*/
public LiteralGraphTuples(long graph) {
super(META_NAMES, true);
Modified: trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/XA11StatementStoreImpl.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/XA11StatementStoreImpl.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa11/XA11StatementStoreImpl.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -1501,9 +1501,9 @@
/**
* Iterates over all graphs, finding requested tuples, and joining all the results together into a single tuples.
* @param variableMask Pre-calculated from the bound node parameters.
- * @param node0 The bound value for node0, or < 0 if not bound.
- * @param node1 The bound value for node1, or < 0 if not bound.
- * @param node2 The bound value for node2, or < 0 if not bound.
+ * @param node0 The bound value for node0, or < 0 if not bound.
+ * @param node1 The bound value for node1, or < 0 if not bound.
+ * @param node2 The bound value for node2, or < 0 if not bound.
* @return A StoreTuples with all the intermediate tuples appended.
* @throws StatementStoreException On an error accessing the store.
*/
@@ -1770,7 +1770,7 @@
* @see org.mulgara.store.xa.XAStatementStore#initializeSystemNodes(long, long, long)
* Set the various system graph nodes. These may only be set once, but will allow duplicate calls if the values are the same.
* @param systemGraphNode The new system graph node.
- * @param rdfTypeNode The node for <rdf:graph>.
+ * @param rdfTypeNode The node for rdf:graph.
* @param systemGraphTypeNode The node for the system graph type.
*/
public void initializeSystemNodes(long systemGraphNode, long rdfTypeNode, long systemGraphTypeNode) {
Modified: trunk/src/jar/resolver-url/java/org/mulgara/resolver/url/URLStatements.java
===================================================================
--- trunk/src/jar/resolver-url/java/org/mulgara/resolver/url/URLStatements.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-url/java/org/mulgara/resolver/url/URLStatements.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -61,7 +61,7 @@
* Parses an {@link InputStream} into {@link Statements}.
*
* This particular implementation is complicated by the need to adapt the Jena
- * ARP RDF/XML <q>push</q> parser to be a <q>pull</q> parser instead.
+ * ARP RDF/XML "push" parser to be a "pull" parser instead.
*
* @created 2004-04-02
* @author <a href="http://staff.pisoftware.com/raboczi">Simon Raboczi</a>
Modified: trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
===================================================================
--- trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -321,7 +321,7 @@
/**
* @return a legible representation of the constraint, for instance
- * <pre>[1.5 < $x <= 2.5]</pre>
+ * <code>[1.5 < $x <= 2.5]</code>
*/
public String toString() {
StringBuffer buffer = new StringBuffer("[");
Modified: trunk/src/jar/server/java/org/mulgara/server/AbstractServer.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/AbstractServer.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server/java/org/mulgara/server/AbstractServer.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -218,8 +218,9 @@
/**
* Allow access by subclasses to the session factory.
- * @return <code>null</code> in the {@link #UNINITIALIZED} state, the {@link SessionFactory}
- * instance otherwise
+ * @return <code>null</code> in the
+ * {@link org.mulgara.server.ServerMBean.ServerState#UNINITIALIZED} state,
+ * the {@link SessionFactory} instance otherwise
*/
public SessionFactory getSessionFactory() {
return sessionFactory;
@@ -286,7 +287,7 @@
/**
* Make the server available over the network. If successful the new state
- * should be {@link #STARTED}.
+ * should be {@link org.mulgara.server.ServerMBean.ServerState#STARTED}.
* @throws IllegalStateException The service is not configured, or is already running.
* @throws Exception A service specific error occurred during startup.
*/
@@ -335,7 +336,7 @@
/**
* Make the server unavailable over the network. If successful the new state
- * will be {@link #STOPPED}.
+ * will be {@link org.mulgara.server.ServerMBean.ServerState#STOPPED}.
* @throws IllegalStateException If the server is not running
* @throws Exception There was a service specific error in shutting down.
*/
Modified: trunk/src/jar/server/java/org/mulgara/server/ServerInfo.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/ServerInfo.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server/java/org/mulgara/server/ServerInfo.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -93,7 +93,7 @@
* Session session = EmbeddedMulgaraServer.getLocalSessionFactory().newSession();
* ItqlInterpreterBean interpreter = new ItqlInterpreterBean(session);
* String answer = interpreter.executeQueryToString(
- * "select $s $p $o from <rmi://localhost/server1#model> where $s $p $o;");
+ * "select $s $p $o from <rmi://localhost/server1#model> where $s $p $o;");
* </pre>
*
* @return the local {@link org.mulgara.server.SessionFactory} of this
Modified: trunk/src/jar/server/java/org/mulgara/server/ServerMBean.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/ServerMBean.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server/java/org/mulgara/server/ServerMBean.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -130,8 +130,8 @@
* using the {@link #init}, {@link #start}, {@link #stop} and {@link #destroy}
* methods.
*
- * @return The current server state, always one of the values {@link
- * #UNINITIALIZED}, {@link #STOPPED} or {@link #STARTED}
+ * @return The current server state, always one of the values
+ * {@link ServerState#UNINITIALIZED}, {@link ServerState#STOPPED} or {@link ServerState#STARTED}
*/
public ServerState getState();
Modified: trunk/src/jar/server/java/org/mulgara/server/ServiceListingServlet.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/ServiceListingServlet.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server/java/org/mulgara/server/ServiceListingServlet.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -43,7 +43,7 @@
/**
* Creates the servlet for listing the given paths.
* @param servicePaths The names of all the services.
- * @param servername The name of the current server.
+ * @param defaultPath The default path to use when not using this servlet.
*/
public ServiceListingServlet(Map<String,String> servicePaths, String defaultPath) throws IOException {
this.servicePaths = servicePaths;
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -112,7 +112,7 @@
/**
* Wrap a remote session to make it appear as a local session.
* @param remoteSession the wrapped remote session.
- * @param The server the session is connecting to.
+ * @param serverURI The server the session is connecting to.
* @throws IllegalArgumentException if <var>remoteSession</var> is <code>null</code>
*/
protected RemoteSessionWrapperSession(RemoteSession remoteSession, URI serverURI) {
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResourceWrapperXAResource.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResourceWrapperXAResource.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteXAResourceWrapperXAResource.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -47,9 +47,9 @@
private RemoteXAResource remoteResource;
/**
- * Wrap a {@link RemoteAnswer} to make it into an {@link Answer}.
+ * Wrap a {@link RemoteAnswer} to make it into an {@link org.mulgara.query.Answer}.
*
- * @param remoteAnswer the instance to wrap
+ * @param remoteResource the instance to wrap
* @throws IllegalArgumentException if <var>remoteAnswer</var> is <code>null</code>
*/
RemoteXAResourceWrapperXAResource(RemoteXAResource remoteResource) throws RemoteException {
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -170,8 +170,8 @@
}
/**
- * Factory method. The session generated will be an unauthenticated (<q>guest
- * </q>) session. To authenticate it, the {@link Session#login} method must be
+ * Factory method. The session generated will be an unauthenticated ("guest
+ * ") session. To authenticate it, the {@link Session#login} method must be
* used.
*
* @return an unauthenticated session
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/AbstractSPObject.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -209,7 +209,7 @@
* Utility for long comparisons
* @param a The first long value
* @param b The second long value
- * @return +1 if a > b, -1 if a < b, 0 if a == b
+ * @return +1 if a > b, -1 if a < b, 0 if a == b
*/
public static final int compare(long a, long b) {
return a == b ? 0 : (a < b ? -1 : 1);
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/AbstractSPGDateTime.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -156,7 +156,7 @@
* Compares this gDay representation to another object to see if they are
* the same values. First the typing is checked and then the value.
* @param object The object we are comparing against
- * @return Whether the gDay value is greater than (> 0), less than (< 0), or equal to (0) this value
+ * @return Whether the gDay value is greater than (> 0), less than (< 0), or equal to (0) this value
*/
public int compareTo(SPObject object) {
// Compare types.
@@ -310,7 +310,7 @@
/**
* Calculate an encoding byte for the timezone.
- * @return A code for the presence of a timezone.
+ * Sets a code for the presence of a timezone.
*/
private void setTzByte(byte tzData) {
tz = null;
@@ -345,7 +345,7 @@
* @param d2 The second gDay's byte buffer
* @param d2Size The number of bytes to compare
*
- * @return Whether the first prefix is greater than (> 0), less than (< 0),
+ * @return Whether the first prefix is greater than (> 0), less than (< 0),
* or equal to (0) the other
*/
public int comparePrefix(ByteBuffer d1, ByteBuffer d2, int d2Size) {
@@ -358,8 +358,8 @@
*
* @param d1 The first byte buffer
* @param d2 The second byte buffer
- * @return Whether the first buffer's content is greater than (> 0), less
- * than (< 0), or equal to (0) the other
+ * @return Whether the first buffer's content is greater than (> 0), less
+ * than (< 0), or equal to (0) the other
*/
public int compare(ByteBuffer d1, int st1, ByteBuffer d2, int st2) {
int c = AbstractSPObject.compare(d1.getLong(), d2.getLong());
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateTimeImpl.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -70,7 +70,7 @@
/**
* Creates a dateTime using a LexicalDateTime.
- * @param date A {@link java.util.Date} representing the dateTime.
+ * @param dateTime A {@link java.util.Date} representing the dateTime.
*/
SPDateTimeImpl(LexicalDateTime dateTime) {
super(TYPE_ID, TYPE_URI);
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDecimalImpl.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -302,7 +302,7 @@
}
/**
- * @see org.mulgara.store.stringpool.SPComparator#compare(java.nio.ByteBuffer, java.nio.ByteBuffer)
+ * @see org.mulgara.store.stringpool.SPComparator#compare(ByteBuffer, int, ByteBuffer, int)
* This comparator WILL compare between xsd:decimal and the extending types
*/
public int compare(ByteBuffer d1, int subtypeId1, ByteBuffer d2, int subtypeId2) {
@@ -452,7 +452,7 @@
}
/**
- * @see org.mulgara.store.stringpool.SPComparator#compare(java.nio.ByteBuffer, java.nio.ByteBuffer)
+ * @see org.mulgara.store.stringpool.SPComparator#compare(ByteBuffer, int, ByteBuffer, int)
* This comparator WILL compare between xsd:decimal and the extending types
*/
public int compare(ByteBuffer d1, int subtypeId1, ByteBuffer d2, int subtypeId2) {
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDoubleImpl.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -170,7 +170,7 @@
/**
- * @see org.mulgara.store.stringpool.xa.SPNumber#numericalCompareTo(java.math.BigInteger)
+ * @see org.mulgara.store.stringpool.xa.SPNumber#numericalCompareTo(BigDecimal)
*/
public int numericalCompareTo(BigDecimal n) {
double dn = n.doubleValue();
Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPNumber.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPNumber.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPNumber.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -33,14 +33,14 @@
/**
* Compare the value of current object to a BigInteger.
- * @param n The double to compare to.
+ * @param d The double to compare to.
* @return -1 if the value of this object is smaller, +1 if larger, 0 if equal.
*/
public int numericalCompareTo(double d);
/**
* Compare the current object to a long.
- * @param n The long to compare to.
+ * @param l The long to compare to.
* @return -1 if the value of this object is smaller, +1 if larger, 0 if equal.
*/
public int numericalCompareTo(long l);
Modified: trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/BlankNodeAllocator.java
===================================================================
--- trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/BlankNodeAllocator.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/BlankNodeAllocator.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -152,8 +152,8 @@
/**
* Convert a blank node code to a counter value.
- * @param blankGNode The blank node value.
- * @return A value with the blank node bit turned off.
+ * @param counter The blank node value, with the blank node bit turned off.
+ * @return A value with the blank node bit turned on.
*/
public static final long counterToNode(long counter) {
return counter | BLANK_NODE_BIT;
Modified: trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/DataStruct.java
===================================================================
--- trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/DataStruct.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/DataStruct.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -185,7 +185,7 @@
/**
* Write this object to a file. This will update the gNode for the object.
- * @param file The file to write to.
+ * @param fc The file channed of the file to write to.
* @return The number of bytes written.
* @throws IOException Caused by errors writing to the file.
*/
@@ -220,7 +220,6 @@
/**
* Writes this object to the payload in an AVLNode.
* @param node The node to write to.
- * @param gNode The gNode this object is associated with.
*/
public void writeTo(AVLNode node) {
node.putPayloadByte(IDX_TYPE_CATEGORY_B, typeCategoryId);
Modified: trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/XA11StringPoolImpl.java
===================================================================
--- trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/XA11StringPoolImpl.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-stringpool-xa11/java/org/mulgara/store/stringpool/xa11/XA11StringPoolImpl.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -987,7 +987,6 @@
/**
* Clears out a block holding metaroot information.
- * @param block The block to clear.
*/
public Metaroot clear() {
block.putInt(IDX_MAGIC, FILE_MAGIC);
@@ -1029,7 +1028,7 @@
/**
* Reads metaroot information out of a block and into this structure.
- * @param block The block to read.
+ * @param currentPool Unused.
*/
public Metaroot read(XA11StringPoolImpl currentPool) throws IOException {
valid = block.getInt(IDX_VALID);
@@ -1229,7 +1228,6 @@
/**
* A constructor from a block on disk.
* @param b The block to read from.
- * @param offset The offset into the block to read.
* @throws IOException Caused by an IO error reading the block.
*/
TreePhase(Block b) throws IOException {
@@ -1249,8 +1247,8 @@
/**
* Inserts a node into the tree, mapping data onto a long.
- * @param spObject The Data to use as the index key.
- * @param gNode The long to map the data to.
+ * @param objectData The node to insert.
+ * @param spComparator The comparison mechanism to use to search the tree.
*/
public void put(DataStruct objectData, SPComparator spComparator) throws StringPoolException {
if (objectData.getGNode() < NodePool.MIN_NODE) throw new IllegalArgumentException("gNode < MIN_NODE. Object = " + objectData);
@@ -1714,13 +1712,14 @@
* Constructs a GNodeTuplesImpl that represents nodes in the AVLFile
* index that range from lowAVLNode up to but not including the node with
* ID highAVLNodeId.
- * @param avlFilePhase The phase this tuples applies to.
* @param typeCategory The type of data this Tuples returns.
* @param typeId The ID of the data being returned.
+ * @param lowValue The lower bound of the sequence in this tuples.
+ * @param highValue The upper bound of the sequence in this tuples.
* @param lowAVLNode the AVLNode that has the first graph node that is
- * included in the Tuples.
+ * included in the Tuples.
* @param highAVLNodeId the ID of the AVLNode that has the first graph
- * node that is not included in the Tuples.
+ * node that is not included in the Tuples.
*/
GNodeTuplesImpl(
SPObject.TypeCategory typeCategory, int typeId,
Modified: trunk/src/jar/store-xa/java/org/mulgara/store/xa/XAStatementStore.java
===================================================================
--- trunk/src/jar/store-xa/java/org/mulgara/store/xa/XAStatementStore.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/store-xa/java/org/mulgara/store/xa/XAStatementStore.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -87,7 +87,7 @@
/**
* Informs the statement store of the metadata it uses for managing data.
* @param systemGraphNode The node for the system graph.
- * @param rdfTypeNode The node representing <rdf:type>.
+ * @param rdfTypeNode The node representing rdf:type.
* @param systemGraphTypeNode The node used for the SystemResolver graph type.
*/
public void initializeSystemNodes(long systemGraphNode, long rdfTypeNode, long systemGraphTypeNode);
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -42,7 +42,7 @@
* RHS for matching rows. For efficient searching, the RHS must be
* ordered according to the matching variables. This class is not responsible for
* ensuring the sort order of the RHS; that responsibility falls to
- * {@link TuplesOperations#optionalJoin(Tuples, Tuples)}.
+ * {@link TuplesOperations#optionalJoin(Tuples, Tuples, Filter, QueryEvaluationContext)}.
*
* @created 2008-04-04
* @author <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/PartialColumnComparator.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/PartialColumnComparator.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/PartialColumnComparator.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -45,7 +45,7 @@
* Compares the LHS and RHS parameters as tuples which are to be compared in column order.
* @param lhs The left hand side operand.
* @param rhs The right hand side operand.
- * @return -1 if lhs<rhs, +1 if lhs>rhs, 0 otherwise.
+ * @return -1 if lhs < rhs, +1 if lhs > rhs, 0 otherwise.
*/
public int compare(long[] lhs, long[] rhs) {
if (lhs.length != rhs.length) throw new IllegalArgumentException("Tuples must be the same length for comparison.");
@@ -65,7 +65,7 @@
* The lhs may be shorter than the rhs, as it can be for a beforeFirst search.
* @param lhs An array to be treated as a Tuples row.
* @param rhs A Tuples, with the current row to be compared.
- * @return -1 if lhs<rhs, +1 if lhs>rhs, 0 otherwise.
+ * @return -1 if lhs < rhs, +1 if lhs > rhs, 0 otherwise.
* @throws TuplesException If there is an error accessing the Tuples.
*/
public int compare(long[] lhs, Tuples rhs) throws TuplesException {
@@ -98,7 +98,7 @@
* Compares in column order the current rows of two Tuples.
* @param lhs A Tuples with the current row to be compared.
* @param rhs A Tuples with the current row to be compared.
- * @return -1 if lhs<rhs, +1 if lhs>rhs, 0 otherwise.
+ * @return -1 if lhs < rhs, +1 if lhs > rhs, 0 otherwise.
* @throws TuplesException If there is an error accessing the Tuples.
*/
public int compare(Tuples lhs, Tuples rhs) throws TuplesException {
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/TuplesOperations.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/TuplesOperations.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/TuplesOperations.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -422,7 +422,7 @@
/**
* Flattens any nested joins to allow polyadic join operations.
- * @param A list of Tuples which may in turn be nested operations.
+ * @param operands A list of Tuples which may in turn be nested operations.
* @return A flattened list of flattened Tuples.
*/
private static List<Tuples> flattenOperands(List<? extends Tuples> operands) throws TuplesException {
Modified: trunk/src/jar/util/java/org/mulgara/util/LongMapper.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/LongMapper.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/util/java/org/mulgara/util/LongMapper.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -18,7 +18,7 @@
/**
* Objects of this type are used for mapping longs to longs. This can be easily met
- * with a Map<Long,Long>, or an IntFile, but this interface abstracts the interface
+ * with a Map<Long,Long>, or an IntFile, but this interface abstracts the interface
* to allow manipulation of the number space if this is more efficient.
*
* @created Sep 26, 2008
Modified: trunk/src/jar/util/java/org/mulgara/util/QueryParams.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/QueryParams.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/util/java/org/mulgara/util/QueryParams.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -161,9 +161,8 @@
}
/**
- * Retrieves a value for a given parameter.
- * @param param The parameter name.
- * @return The decoded string for this value.
+ * Retrieves the names of the parameters in this query.
+ * @return A set of the decoded parameter names.
*/
public Set<String> getNames() {
return params.keySet();
Modified: trunk/src/jar/util/java/org/mulgara/util/Rmi.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/Rmi.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/util/java/org/mulgara/util/Rmi.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -26,7 +26,7 @@
/**
* A utility to centralize the port handling for RMI objects.
* This class is not set to handle different protocols. If this is needed, then the
- * super constructor {@link #UnicastRemoteObject(int,RMIClientSocketFactory,RMIServerSocketFactory)}
+ * super constructor for {@link UnicastRemoteObject} with socket factories
* would need to be overridden.
*
* @created Sep 23, 2008
Modified: trunk/src/jar/util/java/org/mulgara/util/StringUtil.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/StringUtil.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/util/java/org/mulgara/util/StringUtil.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -47,7 +47,7 @@
*
* Copyright © 2000 Plugged In Software Pty Ltd
* (http://www.pisoftware.com/) <BR>
- * License: <LGPL by default, or as assigned>
+ * License: LGPL by default, or as assigned
*/
public class StringUtil {
Modified: trunk/src/jar/util/java/org/mulgara/util/functional/C.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/functional/C.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/util/java/org/mulgara/util/functional/C.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -37,7 +37,7 @@
/**
* Creates a new list by applying an operator to each element of an initial list.
* The final result meets the condition:
- * <pre>result.get(i) == op( args.get(i) ) for 0 <= i < args.size()</pre>
+ * <pre>result.get(i) == op( args.get(i) ) for 0 <= i < args.size()</pre>
* The operation in op may throw an exception.
* @param <T1> The type of the elements in the arg list, which is also the
* argument type for the operation.
@@ -67,7 +67,7 @@
/**
* Creates a new list by applying an operator to each element of an initial list.
* The final result meets the condition:
- * <pre>result.get(i) == op( args.get(i) ) for 0 <= i < args.size()</pre>
+ * <pre>result.get(i) == op( args.get(i) ) for 0 <= i < args.size()</pre>
* The operation in op may <em>not</em> throw an exception.
* @param <T1> The type of the elements in the arg list, which is also the
* argument type for the operation.
Modified: trunk/src/jar/web/java/org/mulgara/webquery/QueryResponsePage.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/QueryResponsePage.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/QueryResponsePage.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -106,7 +106,7 @@
/**
* Construct this page for responsing to a particular request environment.
- * @param reqThe request that asked for this page.
+ * @param req The request that asked for this page.
* @param resp The structure for sending the page back to the client.
* @param tagMap A map of tags to the values that should replace them
*/
@@ -170,9 +170,8 @@
/**
* Write a summary for the results of all the executed commands.
- * @param out The stream to write the results to.
* @param time The time taken to execute the commands, in milliseconds.
- * @param size The number of commands executed.
+ * @param nrCommands The number of commands executed.
*/
private void writeResultSummary(long time, int nrCommands) throws IOException {
// short circuit if we don't have a summary
@@ -203,7 +202,6 @@
/**
* Write a simple result into a row of an existing table.
* @param cmd The command executed to give this result.
- * @param result The result for the command cmd.
* @throws IOException Occurs for an error writing the response.
*/
private void writeSimpleResult(Command cmd) throws IOException {
Modified: trunk/src/jar/web/java/org/mulgara/webquery/QueryServlet.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/QueryServlet.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/QueryServlet.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -127,9 +127,7 @@
/**
- * Creates the servlet for the named host.
- * @param hostname The host name to use, or <code>null</code> if this is not known.
- * @param servername The name of the current server.
+ * Creates the servlet for the current host.
*/
public QueryServlet() {
initialized = false;
@@ -608,7 +606,7 @@
/**
* Creates the default graph name for the sample data.
- * @param The graph name that the user has already set.
+ * @param graphParam The graph name that the user has already set.
* @return The default graph name to use when no graph has been set.
*/
private String defaultGraph(String graphParam) {
Modified: trunk/src/jar/web/java/org/mulgara/webquery/html/Anchor.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/html/Anchor.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/html/Anchor.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -100,7 +100,7 @@
* Creates an anchor with a given indent, and the text for a subelement.
* @param indent The amount to indent by.
* @param name The name of the anchor.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Anchor(int indent, String name, String text) {
super(indent, new Text(text));
@@ -111,7 +111,7 @@
/**
* Creates an anchor with no initial indenting, and the text for a subelement.
* @param name The name of the anchor.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Anchor(String name, String text) {
this(-1, name, new Text(text));
@@ -122,7 +122,7 @@
* Creates an anchor with a given indent, and the text for a subelement.
* @param indent The amount to indent by.
* @param ref The reference to point to.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Anchor(int indent, URL ref, String text) {
super(indent, new Text(text));
@@ -133,7 +133,7 @@
/**
* Creates an anchor with no initial indenting, the text for a subelement.
* @param ref The reference to point to.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Anchor(URL ref, String text) {
this(-1, ref, new Text(text));
@@ -144,7 +144,7 @@
* Creates an anchor with a given indent, and the text for a subelement.
* @param indent The amount to indent by.
* @param ref The reference to point to.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Anchor(int indent, URI ref, String text) {
super(indent, new Text(text));
@@ -155,7 +155,7 @@
/**
* Creates an anchor with no initial indenting, and the text for a subelement.
* @param ref The reference to point to.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Anchor(URI ref, String text) {
this(-1, ref, new Text(text));
Modified: trunk/src/jar/web/java/org/mulgara/webquery/html/Break.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/html/Break.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/html/Break.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -51,7 +51,7 @@
/**
- * @see org.mulgara.webquery.html.HtmlElement#addAttr(org.mulgara.webquery.html.HtmlElement.Attr, java.lang.String)
+ * @see org.mulgara.webquery.html.HtmlElement#addAttr(Attr, Object)
*/
public HtmlElement addAttr(Attr attr, String val) {
if (attr != Attr.ID && attr != Attr.CLASS && attr != Attr.STYLE && attr != Attr.TITLE) {
Modified: trunk/src/jar/web/java/org/mulgara/webquery/html/HtmlElement.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/html/HtmlElement.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/html/HtmlElement.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -211,7 +211,7 @@
* Create a string of spaces for indenting.
* @param i The number of indents to use.
* @return A string of spaces, equal to i * {@link #INDENT_CHARS}, or <code>null</code>
- * if i < 0.
+ * if i < 0.
*/
private static String generateIndent(int i) {
if (i < 0) return null;
Modified: trunk/src/jar/web/java/org/mulgara/webquery/html/Span.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/html/Span.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/html/Span.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -71,7 +71,7 @@
* Creates a span with a given indent, and a list of sub elements.
* @param indent The amount to indent by.
* @param spanClass The name of the class for the span.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Span(int indent, String spanClass, String text) {
super(indent, new Text(text));
@@ -82,7 +82,7 @@
/**
* Creates a span with no initial indenting, and a list of sub elements.
* @param spanClass The name of the class for the span.
- * @param test The text for a Text subElement.
+ * @param text The text for a Text subElement.
*/
public Span(String spanClass, String text) {
this(-1, spanClass, new Text(text));
Modified: trunk/src/jar/web/java/org/mulgara/webquery/html/TableRow.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/html/TableRow.java 2009-03-26 20:27:31 UTC (rev 1646)
+++ trunk/src/jar/web/java/org/mulgara/webquery/html/TableRow.java 2009-03-26 20:31:07 UTC (rev 1647)
@@ -55,7 +55,7 @@
/**
* Creates an row with no initial indenting, and a list of data elements.
- * @param subElements a list of data elements to go inside this row.
+ * @param rowData an array of data elements to go inside this row.
*/
public TableRow(HtmlElement... rowData) {
this(0, rowData);
More information about the Mulgara-svn
mailing list