You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/10/19 15:04:51 UTC
svn commit: r1186185 [1/3] - in /incubator/jena/Jena2/SDB/trunk: ./
.settings/ src-dev/dev/db/ src-dev/dev/inf/
src-test/com/hp/hpl/jena/sdb/test/junit/ src/com/hp/hpl/jena/sdb/compiler/
src/com/hp/hpl/jena/sdb/compiler/rewrite/ src/com/hp/hpl/jena/sdb...
Author: andy
Date: Wed Oct 19 13:04:47 2011
New Revision: 1186185
URL: http://svn.apache.org/viewvc?rev=1186185&view=rev
Log:
Set compiler level to Java 6 (Eclipse project). Add @Override to implementations of interfaces (Java 1.5 -> Java6)
Modified:
incubator/jena/Jena2/SDB/trunk/.classpath
incubator/jena/Jena2/SDB/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/FmtStdHash.java
incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/StoreFormatterStd.java
incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraph.java
incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraphNode.java
incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStoreDesc.java
incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStores.java
incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java
incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/StoreList.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/ConditionCompilerNone.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/PatternTable.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlock.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlockCompilerMain.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QueryCompilerMain.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SDB_QC.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SqlStageBasicQuad.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubProperty.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubType.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QuadBlockRewriteCompiler.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/AnnotationsBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Gensym.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Scope2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeEntry.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeNull.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeOptional.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeRename.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeStatus.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Like.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Regex.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlColumn.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlConstant.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr1.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprGenerateSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprVisitorBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprWalker.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlFunction1.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQLVisitor.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlCoalesce.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlDistinct.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoin.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinInner.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinLeftOuter.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase1.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeTextVisitor.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeVisitorBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeWalker.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlProject.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRename.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRestrict.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSelectBlock.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSlice.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTable.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformCopy.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformer.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlUnion.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/exprmatch/ActionMatchBind.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/exprmatch/ActionMatchNoBind.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/exprmatch/ExprMatcher.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/graph/TransactionHandlerSDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/CodecRDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/CodecSimple.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimple.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleDB2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleDerby.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleH2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleHSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleMySQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleOracle.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimplePGSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/FormatterSimpleSQLServer.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/QueryCompilerFactory1.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/SQLBridgeFactory1.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout1/StoreBase1.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/ConditionCompiler2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/FmtLayout2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/LoaderTuplesNodes.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/SQLBridgeFactory2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/StoreBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/TupleLoaderBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/ValueType.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/expr/RegexCompiler.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/expr/StringExprCompiler.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/QueryCompilerFactoryHash.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/StoreBaseHash.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/StoreTriplesNodesHashHSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashDB2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashDerby.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashH2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashHSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashMySQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashOracle.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashPGSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/hash/TupleLoaderHashSQLServer.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/QueryCompilerFactoryIndex.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/StoreBaseIndex.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/StoreTriplesNodesIndexHSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexDB2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexDerby.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexH2.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexHSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexMySQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexOracle.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexPGSQL.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/layout2/index/TupleLoaderIndexSQLServer.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/sql/DataSourceSDB.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatabaseType.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/Feature.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/FeatureSet.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/LayoutType.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/SQLBridgeBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/StoreFactory.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/StoreFormatterBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/TupleGraphLoader.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/TupleLoaderBase.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/TupleLoaderOne.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/ModConfig.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/ModData.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/ModDatasetStore.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/ModGraph.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/ModLogSQL.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/ModStore.java
incubator/jena/Jena2/SDB/trunk/src/sdb/sdbload.java
incubator/jena/Jena2/SDB/trunk/src/sdb/sdbtuple.java
incubator/jena/Jena2/SDB/trunk/src/sdb/test/Params.java
Modified: incubator/jena/Jena2/SDB/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/.classpath?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/.classpath (original)
+++ incubator/jena/Jena2/SDB/trunk/.classpath Wed Oct 19 13:04:47 2011
@@ -4,7 +4,6 @@
<classpathentry kind="src" path="src-test"/>
<classpathentry kind="src" path="src-dev"/>
<classpathentry kind="src" path="src-examples"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="lib" path="jdbc/postgresql-8.2dev-500.jdbc3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JRuby"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JDBC"/>
@@ -22,8 +21,7 @@
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="lib/arq-2.8.9-SNAPSHOT-tests.jar"/>
- <classpathentry kind="lib"
- path="lib/arq-2.8.9-SNAPSHOT.jar"
- sourcepath="lib-src/arq-2.8.9-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="lib/arq-2.8.9-SNAPSHOT.jar" sourcepath="lib-src/arq-2.8.9-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/SDB/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jena/Jena2/SDB/trunk/.settings/org.eclipse.jdt.core.prefs Wed Oct 19 13:04:47 2011
@@ -1,70 +1,70 @@
-#Wed Jan 07 15:54:38 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+#Wed Oct 19 13:38:42 BST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
Modified: incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/FmtStdHash.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/FmtStdHash.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/FmtStdHash.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/FmtStdHash.java Wed Oct 19 13:04:47 2011
@@ -73,6 +73,7 @@ public class FmtStdHash extends StoreFor
{
return
new Transform<String, String>() {
+ @Override
public String convert(String colName)
{ return col(colName, syntax.integer64(), NOT_NULL) ; }
};
Modified: incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/StoreFormatterStd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/StoreFormatterStd.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/StoreFormatterStd.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-dev/dev/db/StoreFormatterStd.java Wed Oct 19 13:04:47 2011
@@ -38,6 +38,7 @@ public abstract class StoreFormatterStd
// addIndexes() ;
// }
+ @Override
public void format()
{
formatTablePrefixes() ;
@@ -46,6 +47,7 @@ public abstract class StoreFormatterStd
formatTableQuads() ;
}
+ @Override
public void truncate()
{
truncateTablePrefixes() ;
@@ -54,12 +56,14 @@ public abstract class StoreFormatterStd
truncateTableQuads() ;
}
+ @Override
public void addIndexes()
{
addIndexesTableTriples() ;
addIndexesTableQuads() ;
}
+ @Override
public void dropIndexes()
{
dropIndexesTableTriples() ;
Modified: incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraph.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraph.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraph.java Wed Oct 19 13:04:47 2011
@@ -109,6 +109,7 @@ public class TransGraph<GNode> extends H
add(i,i) ;
}
+ @Override
public Iterator<Pair<GNode, GNode>>iterator()
{
List<Pair<GNode, GNode>> x = new ArrayList<Pair<GNode, GNode>>() ;
@@ -137,6 +138,7 @@ public class TransGraph<GNode> extends H
{
linkApply(new LinkApply<GNode>()
{
+ @Override
public void apply(GNode i, GNode j)
{
System.out.printf("%s %s\n", i, j) ;
Modified: incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraphNode.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraphNode.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraphNode.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-dev/dev/inf/TransGraphNode.java Wed Oct 19 13:04:47 2011
@@ -58,6 +58,7 @@ class TransGraphNode extends TransGraph<
top.getList().add(Item.createSymbol(tag)) ;
LinkApply<Node> x = new LinkApply<Node>() {
+ @Override
public void apply(Node i, Node j)
{
Item pair = pair(i,j) ;
Modified: incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStoreDesc.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStoreDesc.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStoreDesc.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStoreDesc.java Wed Oct 19 13:04:47 2011
@@ -36,6 +36,7 @@ public abstract class ParamAllStoreDesc
// Make into Object[]{String,Store} lists just for JUnit.
static Transform<Pair<String, StoreDesc>, Object[]> fix = new Transform<Pair<String, StoreDesc>, Object[]>()
{
+ @Override
public Object[] convert(Pair<String, StoreDesc> item)
{ return new Object[]{item.car(), item.cdr()} ; }
} ;
Modified: incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStores.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStores.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStores.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/ParamAllStores.java Wed Oct 19 13:04:47 2011
@@ -37,6 +37,7 @@ public abstract class ParamAllStores
// Make into Object[]{String,Store} lists just for JUnit.
static Transform<Pair<String, StoreDesc>, Object[]> fix = new Transform<Pair<String, StoreDesc>, Object[]>()
{
+ @Override
public Object[] convert(Pair<String, StoreDesc> item)
{ return new Object[]{item.car(), item.cdr()} ; }
} ;
Modified: incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java Wed Oct 19 13:04:47 2011
@@ -104,6 +104,7 @@ public class QueryTestSDB extends EarlTe
// Truncate outside a transaction.
store.getTableFormatter().truncate() ;
store.getConnection().executeInTransaction(new Command(){
+ @Override
public Object execute()
{
// Default graph
Modified: incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/StoreList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/StoreList.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/StoreList.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src-test/com/hp/hpl/jena/sdb/test/junit/StoreList.java Wed Oct 19 13:04:47 2011
@@ -65,6 +65,7 @@ public class StoreList
// Not Java's finest hour ...
static Transform<Pair<String, String>, Pair<String, StoreDesc>> t1 = new Transform<Pair<String, String>, Pair<String, StoreDesc>>()
{
+ @Override
public Pair<String, StoreDesc> convert(Pair<String, String> pair)
{
return new Pair<String, StoreDesc>(pair.car(), StoreDesc.read(pair.cdr())) ;
@@ -73,6 +74,7 @@ public class StoreList
static Transform<Pair<String, StoreDesc>, Pair<String, Store>> t2 = new Transform<Pair<String, StoreDesc>, Pair<String, Store>>()
{
+ @Override
public Pair<String, Store> convert(Pair<String, StoreDesc> pair)
{
Store store = testStore(pair.cdr()) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/ConditionCompilerNone.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/ConditionCompilerNone.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/ConditionCompilerNone.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/ConditionCompilerNone.java Wed Oct 19 13:04:47 2011
@@ -32,6 +32,7 @@ public class ConditionCompilerNone imple
private ConditionCompilerNone() {}
+ @Override
public SDBConstraint recognize(Expr expr)
{ return null ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/PatternTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/PatternTable.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/PatternTable.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/PatternTable.java Wed Oct 19 13:04:47 2011
@@ -121,6 +121,7 @@ public class PatternTable extends TableD
this.graphNode = graphNode ;
}
+ @Override
public SqlNode build(SDBRequest request, SlotCompiler slotCompiler)
{
SqlTable sqlTable = new SqlTable("ALIAS", "TABLE") ;
@@ -172,6 +173,7 @@ public class PatternTable extends TableD
@Override
public String toString() { return "PTable"; }
+ @Override
public void output(IndentedWriter out)
{ out.print("PTable") ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlock.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlock.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlock.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlock.java Wed Oct 19 13:04:47 2011
@@ -163,12 +163,14 @@ public class QuadBlock extends ArrayList
public String toString()
{ return PrintUtils.toString(this) ; }
+ @Override
public void output(final IndentedWriter out, SerializationContext sCxt)
{
final String sep = "\n" ;
final Action<Quad> strAction = new Action<Quad>() {
boolean first = true ;
+ @Override
public void apply(Quad quad)
{
if ( ! first )
@@ -180,9 +182,11 @@ public class QuadBlock extends ArrayList
apply(this, strAction) ;
}
+ @Override
public String toString(PrefixMapping prefixMapping)
{ return QueryOutputUtils.toString(this, prefixMapping) ; }
+ @Override
public void output(IndentedWriter out)
{
String x = QueryOutputUtils.toString(this) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlockCompilerMain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlockCompilerMain.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlockCompilerMain.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QuadBlockCompilerMain.java Wed Oct 19 13:04:47 2011
@@ -38,10 +38,12 @@ public class QuadBlockCompilerMain imple
this.slotCompiler = slotCompiler ;
}
+ @Override
public SlotCompiler getSlotCompiler()
{ return slotCompiler ; }
//@Override
+ @Override
final
public SqlNode compile(QuadBlock quads)
{
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QueryCompilerMain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QueryCompilerMain.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QueryCompilerMain.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/QueryCompilerMain.java Wed Oct 19 13:04:47 2011
@@ -55,6 +55,7 @@ public abstract class QueryCompilerMain
this.request = request ;
}
+ @Override
public Op compile(final Op op)
{
QuadBlockCompiler quadCompiler = createQuadBlockCompiler() ;
@@ -110,6 +111,7 @@ public abstract class QueryCompilerMain
public abstract QuadBlockCompiler createQuadBlockCompiler() ;
+ @Override
public ConditionCompiler getConditionCompiler()
{
return null ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SDB_QC.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SDB_QC.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SDB_QC.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SDB_QC.java Wed Oct 19 13:04:47 2011
@@ -149,6 +149,7 @@ public class SDB_QC
private static Transform<String, Var> StringToVar = new Transform<String, Var>(){
+ @Override
public Var convert(String varName)
{
return Var.alloc(varName) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SqlStageBasicQuad.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SqlStageBasicQuad.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SqlStageBasicQuad.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/SqlStageBasicQuad.java Wed Oct 19 13:04:47 2011
@@ -55,6 +55,7 @@ public class SqlStageBasicQuad implement
// SDB.unionDefaultGraph.
+ @Override
public SqlNode build(SDBRequest request, SlotCompiler slotCompiler)
{
SqlExprList conditions = new SqlExprList() ;
@@ -134,6 +135,7 @@ public class SqlStageBasicQuad implement
@Override
public String toString() { return "Table: "+quad ; }
+ @Override
public void output(IndentedWriter out)
{ out.print(toString()) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubProperty.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubProperty.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubProperty.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubProperty.java Wed Oct 19 13:04:47 2011
@@ -30,6 +30,7 @@ public class QBR_SubProperty implements
{
private static final Node rdfType = RDF.type.asNode() ;
+ @Override
public QuadBlock rewrite(SDBRequest request, QuadBlock quadBlock)
{
// Does not consider if the property slot is a variable.
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubType.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubType.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubType.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QBR_SubType.java Wed Oct 19 13:04:47 2011
@@ -30,6 +30,7 @@ public class QBR_SubType implements Quad
{
private static final Node rdfType = RDF.type.asNode() ;
+ @Override
public QuadBlock rewrite(SDBRequest request, QuadBlock quadBlock)
{
// Does not consider if the property slot is a variable.
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QuadBlockRewriteCompiler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QuadBlockRewriteCompiler.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QuadBlockRewriteCompiler.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/compiler/rewrite/QuadBlockRewriteCompiler.java Wed Oct 19 13:04:47 2011
@@ -37,6 +37,7 @@ public class QuadBlockRewriteCompiler im
this.baseCompiler = baseCompiler ;
}
+ @Override
public SqlNode compile(QuadBlock quads)
{
quads = qbr1.rewrite(request, quads) ;
@@ -46,6 +47,7 @@ public class QuadBlockRewriteCompiler im
}
+ @Override
public SlotCompiler getSlotCompiler()
{ return baseCompiler.getSlotCompiler() ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/AnnotationsBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/AnnotationsBase.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/AnnotationsBase.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/AnnotationsBase.java Wed Oct 19 13:04:47 2011
@@ -25,24 +25,29 @@ public class AnnotationsBase implements
{
//---- Annotations
List<String> annotations = null ;
+ @Override
public List<String> getNotes()
{
initAnnotations() ;
return annotations ;
}
+ @Override
public boolean hasNotes()
{ return annotations != null && annotations.size() > 0 ; }
+ @Override
public boolean hasOneNote()
{ return annotations != null && annotations.size() == 1 ; }
+ @Override
public void addNote(String s)
{
initAnnotations() ;
annotations.add(s) ;
}
+ @Override
public void addNotes(List<String> annotations)
{
initAnnotations() ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Gensym.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Gensym.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Gensym.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Gensym.java Wed Oct 19 13:04:47 2011
@@ -36,6 +36,7 @@ public class Gensym implements Generator
private Gensym(String base) { this(base, 1) ; }
private Gensym(String base, int startCount) { this.base = base ; this.count = startCount ; }
+ @Override
public String next()
{
String x = base+(count++) ;
@@ -43,6 +44,7 @@ public class Gensym implements Generator
return x ;
}
+ @Override
public String current()
{
if ( lastAlloc == null )
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Scope2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Scope2.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Scope2.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/Scope2.java Wed Oct 19 13:04:47 2011
@@ -37,6 +37,7 @@ public class Scope2 implements Scope
//this.scopeStatus = status ;
}
+ @Override
public boolean hasColumnForVar(Var var)
{
if ( left != null && left.hasColumnForVar(var) )
@@ -46,6 +47,7 @@ public class Scope2 implements Scope
return false ;
}
+ @Override
public Set<Var> getVars()
{
// Better - implement Iterable
@@ -55,9 +57,11 @@ public class Scope2 implements Scope
return acc ;
}
+ @Override
public boolean isEmpty()
{ return left.isEmpty() && right.isEmpty() ; }
+ @Override
public Set<ScopeEntry> findScopes()
{
Set<ScopeEntry> x = new HashSet<ScopeEntry>() ;
@@ -69,6 +73,7 @@ public class Scope2 implements Scope
return x ;
}
+ @Override
public ScopeEntry findScopeForVar(Var var)
{
// Return a fixed ScopeEntry in preference to an optional one.
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeBase.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeBase.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeBase.java Wed Oct 19 13:04:47 2011
@@ -40,6 +40,7 @@ public class ScopeBase implements Scope
// this.parent = parent ;
// }
+ @Override
public boolean hasColumnForVar(Var var)
{
if ( frame.containsKey(var) )
@@ -49,6 +50,7 @@ public class ScopeBase implements Scope
return false ;
}
+ @Override
public Set<Var> getVars()
{
Set<Var> x = new HashSet<Var>() ;
@@ -58,9 +60,11 @@ public class ScopeBase implements Scope
return x ;
}
+ @Override
public boolean isEmpty()
{ return frame.isEmpty() ; }
+ @Override
public Set<ScopeEntry> findScopes()
{
Set<ScopeEntry> x = new HashSet<ScopeEntry>() ;
@@ -74,6 +78,7 @@ public class ScopeBase implements Scope
return x ;
}
+ @Override
public ScopeEntry findScopeForVar(Var var)
{
if ( frame.containsKey(var) )
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeEntry.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeEntry.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeEntry.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeEntry.java Wed Oct 19 13:04:47 2011
@@ -33,18 +33,21 @@ public class ScopeEntry
public static Filter<ScopeEntry> OptionalFilter = new Filter<ScopeEntry>()
{
+ @Override
public boolean accept(ScopeEntry item)
{ return item.getStatus() == ScopeStatus.OPTIONAL ; }
} ;
public static Transform<ScopeEntry, Var> ToVar = new Transform<ScopeEntry, Var>()
{
+ @Override
public Var convert(ScopeEntry item)
{ return item.getVar() ; }
} ;
public static Action<ScopeEntry> SetOpt = new Action<ScopeEntry>()
{
+ @Override
public void apply(ScopeEntry item)
{ item.setStatus(ScopeStatus.OPTIONAL) ; }
} ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeNull.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeNull.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeNull.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeNull.java Wed Oct 19 13:04:47 2011
@@ -25,10 +25,15 @@ import com.hp.hpl.jena.sparql.core.Var;
public class ScopeNull implements Scope
{
+ @Override
public boolean isEmpty() { return false ; }
+ @Override
public boolean hasColumnForVar(Var var) { return false ; }
+ @Override
public ScopeEntry findScopeForVar(Var var) { return null ; }
+ @Override
public Set<Var> getVars() { return Collections.emptySet() ; }
+ @Override
public Set<ScopeEntry> findScopes() { return Collections.emptySet() ; }
@Override public String toString() { return "ScopeNull" ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeOptional.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeOptional.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeOptional.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeOptional.java Wed Oct 19 13:04:47 2011
@@ -33,6 +33,7 @@ public class ScopeOptional implements Sc
public ScopeOptional(Scope subScope)
{ this.scope = subScope ; }
+ @Override
public ScopeEntry findScopeForVar(Var var)
{
ScopeEntry e = scope.findScopeForVar(var) ;
@@ -43,14 +44,17 @@ public class ScopeOptional implements Sc
return e ;
}
+ @Override
public Set<Var> getVars()
{
return scope.getVars() ;
}
+ @Override
public boolean isEmpty()
{ return scope.isEmpty() ; }
+ @Override
public Set<ScopeEntry> findScopes()
{
Set<ScopeEntry> x = scope.findScopes() ;
@@ -58,6 +62,7 @@ public class ScopeOptional implements Sc
return x ;
}
+ @Override
public boolean hasColumnForVar(Var var)
{
return scope.hasColumnForVar(var) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeRename.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeRename.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeRename.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeRename.java Wed Oct 19 13:04:47 2011
@@ -49,6 +49,7 @@ public class ScopeRename implements Scop
}
+ @Override
public ScopeEntry findScopeForVar(Var var)
{
check(var) ;
@@ -64,6 +65,7 @@ public class ScopeRename implements Scop
// return converter.convert(e) ;
}
+ @Override
public Set<ScopeEntry> findScopes()
{
Set<ScopeEntry> x = new HashSet<ScopeEntry>() ;
@@ -78,14 +80,17 @@ public class ScopeRename implements Scop
// return x ;
}
+ @Override
public boolean isEmpty()
{ return frame.isEmpty() ; }
+ @Override
public Set<Var> getVars()
{
return frame.keySet() ;
}
+ @Override
public boolean hasColumnForVar(Var var)
{
check(var) ;
@@ -113,6 +118,7 @@ public class ScopeRename implements Scop
private Transform<ScopeEntry, ScopeEntry> converter =
new Transform<ScopeEntry, ScopeEntry>(){
+ @Override
public ScopeEntry convert(ScopeEntry entry)
{
entry = new ScopeEntry(entry.getVar(), entry.getColumn()) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeStatus.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeStatus.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeStatus.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/ScopeStatus.java Wed Oct 19 13:04:47 2011
@@ -22,9 +22,12 @@ import com.hp.hpl.jena.sparql.util.Named
public enum ScopeStatus implements Named
{
- FIXED { public String getName() { return "Fixed" ; } } ,
- OPTIONAL { public String getName() { return "Optional" ; } } ,
- UNKNOWN { public String getName() { return "Unknown" ; } } ,
+ FIXED { @Override
+ public String getName() { return "Fixed" ; } } ,
+ OPTIONAL { @Override
+ public String getName() { return "Optional" ; } } ,
+ UNKNOWN { @Override
+ public String getName() { return "Unknown" ; } } ,
;
@Override
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Like.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Like.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Like.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Like.java Wed Oct 19 13:04:47 2011
@@ -48,5 +48,6 @@ public class S_Like extends SqlExprBase
return caseInsensitive ;
}
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Regex.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Regex.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Regex.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/S_Regex.java Wed Oct 19 13:04:47 2011
@@ -44,5 +44,6 @@ public class S_Regex extends SqlExprBase
return pattern ;
}
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlColumn.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlColumn.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlColumn.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlColumn.java Wed Oct 19 13:04:47 2011
@@ -64,5 +64,6 @@ public class SqlColumn extends SqlExprBa
public String asString() { return getFullColumnName() ; }
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlConstant.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlConstant.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlConstant.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlConstant.java Wed Oct 19 13:04:47 2011
@@ -34,5 +34,6 @@ public class SqlConstant extends SqlExpr
@Override
public boolean isConstant() { return true ; }
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr1.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr1.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr1.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr1.java Wed Oct 19 13:04:47 2011
@@ -34,5 +34,6 @@ public class SqlExpr1 extends SqlExprBas
public SqlExpr getExpr() { return expr ; }
public String getExprSymbol() { return exprSymbol ; }
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr2.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr2.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExpr2.java Wed Oct 19 13:04:47 2011
@@ -36,5 +36,6 @@ public class SqlExpr2 extends SqlExprBas
public SqlExpr getRight() { return right ; }
public String getOpSymbol() { return opSymbol ; }
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprBase.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprBase.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprBase.java Wed Oct 19 13:04:47 2011
@@ -32,6 +32,7 @@ public abstract class SqlExprBase extend
return asSQL(this) ;
}
+ @Override
public String asSQL() { return asSQL(this) ; }
public static String asSQL(SqlExpr expr)
@@ -42,6 +43,7 @@ public abstract class SqlExprBase extend
return buff.toString() ;
}
+ @Override
public Set<SqlColumn> getColumnsNeeded()
{
Set<SqlColumn> acc = new HashSet<SqlColumn>() ;
@@ -50,7 +52,9 @@ public abstract class SqlExprBase extend
return acc ;
}
+ @Override
public boolean isColumn() { return false ; }
+ @Override
public boolean isConstant() { return false ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprGenerateSQL.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprGenerateSQL.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprGenerateSQL.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprGenerateSQL.java Wed Oct 19 13:04:47 2011
@@ -71,10 +71,13 @@ OR left logical disjunction
SqlExprGenerateSQL(IndentedWriter out)
{ this.out = out ; }
+ @Override
public void visit(SqlColumn column) { out.print(column.asString()) ; }
+ @Override
public void visit(SqlConstant constant) { out.print(constant.asSqlString()) ; }
+ @Override
public void visit(SqlFunction1 expr)
{
out.print(expr.getFuncSymbol()) ;
@@ -83,6 +86,7 @@ OR left logical disjunction
out.print(")") ;
}
+ @Override
public void visit(SqlExpr1 expr)
{
printExpr(expr.getExpr()) ;
@@ -90,6 +94,7 @@ OR left logical disjunction
out.print(expr.getExprSymbol()) ;
}
+ @Override
public void visit(SqlExpr2 expr)
{
printExpr(expr.getLeft()) ;
@@ -99,6 +104,7 @@ OR left logical disjunction
printExpr(expr.getRight()) ;
}
+ @Override
public void visit(S_Like pattern)
{
if ( pattern.isCaseInsensitive() )
@@ -119,6 +125,7 @@ OR left logical disjunction
public String RegexOperator = "REGEXP" ;
+ @Override
public void visit(S_Regex regex)
{
// TODO Make per-store dependent for syntax and case sensitiveity reasons.
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprVisitorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprVisitorBase.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprVisitorBase.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprVisitorBase.java Wed Oct 19 13:04:47 2011
@@ -21,18 +21,25 @@ package com.hp.hpl.jena.sdb.core.sqlexpr
public class SqlExprVisitorBase implements SqlExprVisitor
{
+ @Override
public void visit(SqlColumn column) {}
+ @Override
public void visit(SqlConstant constant) {}
+ @Override
public void visit(SqlFunction1 expr) {}
+ @Override
public void visit(SqlExpr1 expr) {}
+ @Override
public void visit(SqlExpr2 expr) {}
+ @Override
public void visit(S_Regex regex) {}
+ @Override
public void visit(S_Like like) {}
public void visit(S_IsNull isNull) {}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprWalker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprWalker.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprWalker.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlExprWalker.java Wed Oct 19 13:04:47 2011
@@ -32,21 +32,26 @@ public class SqlExprWalker
private Walker(SqlExprVisitor visitor) { this.visitor = visitor ; }
+ @Override
public void visit(SqlColumn column) { column.visit(visitor) ; }
+ @Override
public void visit(SqlConstant constant) { constant.visit(visitor) ; }
+ @Override
public void visit(SqlFunction1 expr)
{
expr.getExpr().visit(this) ;
expr.visit(visitor) ;
}
+ @Override
public void visit(SqlExpr1 expr)
{
expr.getExpr().visit(this) ;
expr.visit(visitor) ;
}
+ @Override
public void visit(SqlExpr2 expr)
{
expr.getLeft().visit(this) ;
@@ -54,12 +59,14 @@ public class SqlExprWalker
expr.visit(visitor) ;
}
+ @Override
public void visit(S_Like like)
{
like.getExpr().visit(this) ;
like.visit(visitor) ;
}
+ @Override
public void visit(S_Regex regex)
{
regex.getExpr().visit(this) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlFunction1.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlFunction1.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlFunction1.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlexpr/SqlFunction1.java Wed Oct 19 13:04:47 2011
@@ -34,5 +34,6 @@ public class SqlFunction1 extends SqlExp
public SqlExpr getExpr() { return expr ; }
public String getFuncSymbol() { return funcSymbol ; }
+ @Override
public void visit(SqlExprVisitor visitor) { visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQL.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQL.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQL.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQL.java Wed Oct 19 13:04:47 2011
@@ -33,6 +33,7 @@ public class GenerateSQL implements SQLG
{ return new GenerateSQL().generatePartSQL(sqlNode) ; }
/** Generate an SQL statement for the node - force the outer level to be a SELECT */
+ @Override
public String generateSQL(SDBRequest request, SqlNode sqlNode)
{
// if ( forceOldGenerator )
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQLVisitor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQLVisitor.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQLVisitor.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/GenerateSQLVisitor.java Wed Oct 19 13:04:47 2011
@@ -72,6 +72,7 @@ public class GenerateSQLVisitor implemen
// If nested (subquery)
+ @Override
public void visit(SqlSelectBlock sqlSelectBlock)
{
// Need a rename and alias if:
@@ -185,6 +186,7 @@ public class GenerateSQLVisitor implemen
out.decIndent() ;
}
+ @Override
public void visit(SqlTable table)
{
out.print(table.getTableName()) ;
@@ -193,6 +195,7 @@ public class GenerateSQLVisitor implemen
annotate(table) ;
}
+ @Override
public void visit(SqlJoinInner join)
{
join = rewrite(join) ;
@@ -253,6 +256,7 @@ public class GenerateSQLVisitor implemen
}
static final Transform<SqlColumn, SqlTable> colToTable = new Transform<SqlColumn, SqlTable>() {
+ @Override
public SqlTable convert(SqlColumn item) { return item.getTable() ; }
} ;
@@ -261,8 +265,10 @@ public class GenerateSQLVisitor implemen
return Iter.toSet(Iter.map(cols, colToTable)) ;
}
+ @Override
public void visit(SqlJoinLeftOuter join) { visitJoin(join) ; }
+ @Override
public void visit(SqlCoalesce sqlNode)
{
out.print("SELECT ") ;
@@ -315,6 +321,7 @@ public class GenerateSQLVisitor implemen
// Alias and annotations handled by outputNode
}
+ @Override
public void visit(SqlUnion sqlUnion)
{ throw new SDBNotImplemented("SQL generation of SqlUnion") ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlCoalesce.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlCoalesce.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlCoalesce.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlCoalesce.java Wed Oct 19 13:04:47 2011
@@ -131,6 +131,7 @@ public class SqlCoalesce extends SqlNode
public SqlJoin getJoinNode() { return join ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlDistinct.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlDistinct.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlDistinct.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlDistinct.java Wed Oct 19 13:04:47 2011
@@ -47,6 +47,7 @@ import com.hp.hpl.jena.sdb.shared.SDBInt
public SqlDistinct asDistinct() { return this ; }
//@Override
+ @Override
public void visit(SqlNodeVisitor visitor)
{ throw new SDBInternalError("SqlDistinct.visit") ; /*visitor.visit(this) ;*/ }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoin.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoin.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoin.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoin.java Wed Oct 19 13:04:47 2011
@@ -85,6 +85,8 @@ public abstract class SqlJoin extends Sq
public void addCondition(SqlExpr e) { conditions.add(e) ; }
public void addConditions(SqlExprList exprs) { conditions.addAll(exprs) ; }
+ @Override
public Scope getIdScope() { return idScope ; }
+ @Override
public Scope getNodeScope() { return nodeScope ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinInner.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinInner.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinInner.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinInner.java Wed Oct 19 13:04:47 2011
@@ -32,6 +32,7 @@ public class SqlJoinInner extends SqlJoi
@Override
public SqlJoinInner asInnerJoin() { return this ; }
+ @Override
public void visit(SqlNodeVisitor visitor) { visitor.visit(this) ; }
@Override
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinLeftOuter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinLeftOuter.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinLeftOuter.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlJoinLeftOuter.java Wed Oct 19 13:04:47 2011
@@ -32,6 +32,7 @@ public class SqlJoinLeftOuter extends Sq
@Override
public SqlJoinLeftOuter asLeftJoin() { return this ; }
+ @Override
public void visit(SqlNodeVisitor visitor) { visitor.visit(this) ; }
@Override
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase.java Wed Oct 19 13:04:47 2011
@@ -34,34 +34,53 @@ public abstract class SqlNodeBase extend
public SqlNodeBase(String aliasName) { this.aliasName = aliasName ; }
+ @Override
public boolean isJoin() { return false ; }
+ @Override
public boolean isInnerJoin() { return false ; }
+ @Override
public boolean isLeftJoin() { return false ; }
// public boolean isRightJoin() { return false ; }
// public boolean isOuterJoin() { return false ; }
+ @Override
public SqlJoin asJoin() { classError(SqlJoin.class) ; return null ; }
+ @Override
public SqlJoinLeftOuter asLeftJoin() { classError(SqlJoinLeftOuter.class) ; return null ; }
+ @Override
public SqlJoinInner asInnerJoin(){ classError(SqlJoinInner.class) ; return null ; }
+ @Override
public boolean isRestrict() { return false ; }
+ @Override
public SqlRestrict asRestrict() { classError(SqlRestrict.class) ; return null ; }
+ @Override
public boolean isProject() { return false ; }
+ @Override
public SqlProject asProject() { classError(SqlProject.class) ; return null ; }
+ @Override
public boolean isDistinct() { return false ; }
+ @Override
public SqlDistinct asDistinct() { classError(SqlDistinct.class) ; return null ; }
+ @Override
public boolean isCoalesce() { return false ; }
+ @Override
public SqlCoalesce asCoalesce() { classError(SqlCoalesce.class) ; return null ; }
+ @Override
public boolean isTable() { return false ; }
+ @Override
public SqlTable asTable() { classError(SqlTable.class) ; return null ; }
+ @Override
public boolean isSelectBlock() { return false ; }
+ @Override
public SqlSelectBlock asSelectBlock() { classError(SqlSelectBlock.class) ; return null ; }
+ @Override
public void output(IndentedWriter out) { output(out, true) ; }
public void output(IndentedWriter out, boolean withAnnotations)
@@ -75,6 +94,7 @@ public abstract class SqlNodeBase extend
public boolean usesColumn(SqlColumn c) { return false ; }
+ @Override
final
public String getAliasName() { return aliasName ; }
@@ -83,6 +103,7 @@ public abstract class SqlNodeBase extend
throw new ClassCastException("Wanted class: "+Utils.className(wanted)+" :: Actual class "+Utils.className(this) ) ;
}
+ @Override
public Set<SqlTable> tablesInvolved()
{
TableFinder t = new TableFinder() ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase1.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase1.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase1.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeBase1.java Wed Oct 19 13:04:47 2011
@@ -26,7 +26,9 @@ public abstract class SqlNodeBase1 exten
protected SqlNodeBase1(String aliasName, SqlNode sqlNode) { super(aliasName) ; this.sqlNode = sqlNode ; }
+ @Override
public Scope getIdScope() { return sqlNode.getIdScope() ; }
+ @Override
public Scope getNodeScope() { return sqlNode.getNodeScope() ; }
public SqlNode getSubNode() { return sqlNode ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeTextVisitor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeTextVisitor.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeTextVisitor.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeTextVisitor.java Wed Oct 19 13:04:47 2011
@@ -122,6 +122,7 @@ public class SqlNodeTextVisitor implemen
finish() ;
}
+ @Override
public void visit(SqlTable sqlNode)
{
// if ( ! sqlNode.hasOneNote() )
@@ -134,12 +135,15 @@ public class SqlNodeTextVisitor implemen
addAnnotations(sqlNode) ;
}
+ @Override
public void visit(SqlJoinInner sqlJoin)
{ visitJoin(sqlJoin) ; }
+ @Override
public void visit(SqlJoinLeftOuter sqlJoin)
{ visitJoin(sqlJoin) ; }
+ @Override
public void visit(SqlUnion sqlUnion)
{
out.ensureStartOfLine() ;
@@ -156,6 +160,7 @@ public class SqlNodeTextVisitor implemen
finish() ;
}
+ @Override
public void visit(SqlCoalesce sqlNode)
{
start(sqlNode, "Coalesce", sqlNode.getAliasName()) ;
@@ -207,6 +212,7 @@ public class SqlNodeTextVisitor implemen
finish() ;
}
+ @Override
public void visit(SqlSelectBlock sqlNode)
{
start(sqlNode, "SqlSelectBlock", sqlNode.getAliasName()) ;
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeVisitorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeVisitorBase.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeVisitorBase.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeVisitorBase.java Wed Oct 19 13:04:47 2011
@@ -32,24 +32,30 @@ public class SqlNodeVisitorBase implemen
public void visit(SqlRename sqlRename)
{}
+ @Override
public void visit(SqlTable sqlTable)
{}
+ @Override
public void visit(SqlJoinInner sqlJoin)
{}
+ @Override
public void visit(SqlJoinLeftOuter sqlJoin)
{}
+ @Override
public void visit(SqlUnion sqlUnion)
{}
+ @Override
public void visit(SqlCoalesce sqlCoalesce)
{}
public void visit(SqlSlice sqlSlice)
{}
+ @Override
public void visit(SqlSelectBlock sqlSelectBlock)
{}
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeWalker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeWalker.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeWalker.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlNodeWalker.java Wed Oct 19 13:04:47 2011
@@ -63,18 +63,23 @@ public class SqlNodeWalker
sqlNode.getSubNode().visit(this) ;
}
+ @Override
public void visit(SqlTable sqlNode)
{ sqlNode.visit(visitor) ; }
+ @Override
public void visit(SqlJoinInner sqlNode)
{ visit2(sqlNode) ; }
+ @Override
public void visit(SqlJoinLeftOuter sqlNode)
{ visit2(sqlNode) ; }
+ @Override
public void visit(SqlUnion sqlNode)
{ visit2(sqlNode) ; }
+ @Override
public void visit(SqlCoalesce sqlNode)
{
sqlNode.visit(visitor) ;
@@ -84,6 +89,7 @@ public class SqlNodeWalker
public void visit(SqlSlice sqlNode)
{ visit1(sqlNode) ; }
+ @Override
public void visit(SqlSelectBlock sqlNode)
{ visit1(sqlNode) ; }
}
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlProject.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlProject.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlProject.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlProject.java Wed Oct 19 13:04:47 2011
@@ -109,6 +109,7 @@ public class SqlProject extends SqlNodeB
public List<ColAlias> getCols() { return cols ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ throw new SDBInternalError("SqlProject.visit") ; }
//{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRename.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRename.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRename.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRename.java Wed Oct 19 13:04:47 2011
@@ -96,6 +96,7 @@ import com.hp.hpl.jena.sdb.shared.SDBInt
@Override
public Scope getNodeScope() { return nodeScope ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ throw new SDBInternalError("SqlRename.visit") ; }
// { visitor.visit(this) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRestrict.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRestrict.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRestrict.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlRestrict.java Wed Oct 19 13:04:47 2011
@@ -101,6 +101,7 @@ public class SqlRestrict extends SqlNode
public SqlExprList getConditions() { return conditions ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ throw new SDBInternalError("SqlRestrict.visit") ; }
//{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSelectBlock.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSelectBlock.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSelectBlock.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSelectBlock.java Wed Oct 19 13:04:47 2011
@@ -215,6 +215,7 @@ public class SqlSelectBlock extends SqlN
public SqlNode copy(SqlNode subNode)
{ return new SqlSelectBlock(this.getAliasName(), subNode) ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSlice.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSlice.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSlice.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlSlice.java Wed Oct 19 13:04:47 2011
@@ -39,6 +39,7 @@ public class SqlSlice extends SqlNodeBas
// @Override
// public boolean isModifier() { return true ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ throw new SDBInternalError("SqlSlice.visit") ; }
//{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTable.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTable.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTable.java Wed Oct 19 13:04:47 2011
@@ -59,11 +59,14 @@ public class SqlTable extends SqlNodeBas
public String getTableName() { return tableName ; }
+ @Override
public void visit(SqlNodeVisitor visitor)
{ visitor.visit(this) ; }
+ @Override
public Scope getIdScope() { return idScope ; }
+ @Override
public Scope getNodeScope() { return nodeScope ; }
public void setIdColumnForVar(Var var, SqlColumn thisCol)
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformCopy.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformCopy.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformCopy.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformCopy.java Wed Oct 19 13:04:47 2011
@@ -28,36 +28,45 @@ public class SqlTransformCopy implements
public SqlTransformCopy() { this(COPY_ONLY_ON_CHANGE) ; }
public SqlTransformCopy(boolean alwaysDuplicate) { this.alwaysCopy = alwaysDuplicate ; }
+ @Override
public SqlNode transform(SqlProject sqlProject, SqlNode subNode)
{ return xform(sqlProject, subNode) ; }
public SqlNode transform(SqlDistinct sqlDistinct, SqlNode subNode)
{ return xform(sqlDistinct, subNode) ; }
+ @Override
public SqlNode transform(SqlRestrict sqlRestrict, SqlNode subNode)
{ return xform(sqlRestrict, subNode) ; }
public SqlNode transform(SqlSlice sqlSlice, SqlNode subNode)
{ return xform(sqlSlice, subNode) ; }
+ @Override
public SqlNode transform(SqlSelectBlock sqlSelectBlock, SqlNode subNode)
{ return xform(sqlSelectBlock, subNode) ; }
+ @Override
public SqlNode transform(SqlJoinInner sqlJoinInner, SqlNode left, SqlNode right)
{ return xform(sqlJoinInner, left, right) ; }
+ @Override
public SqlNode transform(SqlJoinLeftOuter sqlJoinLeftOuter, SqlNode left, SqlNode right)
{ return xform(sqlJoinLeftOuter, left, right) ; }
+ @Override
public SqlNode transform(SqlUnion sqlUnion, SqlNode left, SqlNode right)
{ return xform(sqlUnion, left, right) ; }
+ @Override
public SqlNode transform(SqlTable sqlTable)
{ return xform(sqlTable) ; }
+ @Override
public SqlNode transform(SqlRename sqlRename, SqlNode subNode)
{ return xform(sqlRename, subNode) ; }
+ @Override
public SqlNode transform(SqlCoalesce sqlCoalesce, SqlNode subNode)
{ return xform(sqlCoalesce, subNode) ; }
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformer.java?rev=1186185&r1=1186184&r2=1186185&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformer.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/core/sqlnode/SqlTransformer.java Wed Oct 19 13:04:47 2011
@@ -85,27 +85,33 @@ public class SqlTransformer
public void visit(SqlRestrict sqlRestrict)
{ visit1(sqlRestrict) ; }
+ @Override
public void visit(SqlTable sqlTable)
{ visit0(sqlTable) ; }
public void visit(SqlRename sqlRename)
{ visit1(sqlRename) ; }
+ @Override
public void visit(SqlJoinInner sqlJoin)
{ visit2(sqlJoin) ; }
+ @Override
public void visit(SqlJoinLeftOuter sqlJoin)
{ visit2(sqlJoin) ; }
+ @Override
public void visit(SqlUnion sqlUnion)
{ visit2(sqlUnion) ; }
+ @Override
public void visit(SqlCoalesce sqlCoalesce)
{ visit1(sqlCoalesce) ; }
public void visit(SqlSlice sqlSlice)
{ visit1(sqlSlice) ; }
+ @Override
public void visit(SqlSelectBlock sqlSelectBlock)
{ visit1(sqlSelectBlock) ; }
}