Author: andy
Date: Sat Jun 21 14:04:28 2014
New Revision: 1604390
URL: http://svn.apache.org/r1604390
Log:
JENA-726 : More deprecation cleaning (opVars). Add some deprecations in
OutputLangUtils.
Removed:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserQueryBase.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java?rev=1604390&r1=1604389&r2=1604390&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
Sat Jun 21 14:04:28 2014
@@ -46,7 +46,7 @@ public class DatasetFactory
*/
public static Dataset createMemFixed() { return
create(DatasetGraphFactory.createMemFixed()) ; }
- /** Create an in-memory, modifable Dataset
+ /** Create an in-memory, modifyable Dataset
* @deprecated Use createMem
*/
@Deprecated
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java?rev=1604390&r1=1604389&r2=1604390&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
Sat Jun 21 14:04:28 2014
@@ -40,12 +40,6 @@ import com.hp.hpl.jena.sparql.util.VarUt
public class OpVars
{
- /** @deprecated use {@linkplain #visibleVars} */
- @Deprecated
- public static Set<Var> patternVars(Op op) {
- return visibleVars(op) ;
- }
-
// Choose the default collector - LinkedHashSet is predictable and
// keeps the "found" order
private static Set<Var> collector() {
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java?rev=1604390&r1=1604389&r2=1604390&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
Sat Jun 21 14:04:28 2014
@@ -36,19 +36,16 @@ import org.apache.jena.riot.system.Synta
import com.hp.hpl.jena.sparql.core.Quad ;
-/** Utilites for formatter output */
+/** Utilites for formatter output
+ *
+ * @see NodeFormatter
+ * @see NodeFmtLib
+ */
public class OutputLangUtils
{
-
- /* This will become the way to output RDF terms and structures.
- *
- */
-
// "Prologue" is an input concept - whats the equivalent for output?
// Prefix mapping + base URI abbreviation.
- // TODO Use NodeFormatters / NodeFmtLib (objectified) in output(Writer,
node,*)
-
// Make an object so it can have per-instance flags
// ASCII vs UTF-8
// Abbreviate numbers or not.
@@ -57,6 +54,8 @@ public class OutputLangUtils
private static boolean asciiOnly = true ;
+ /** @deprecated */
+ @Deprecated
static public void output(Writer out, Quad quad, Prologue prologue,
NodeToLabel labelPolicy)
{
Node s = quad.getSubject() ;
@@ -67,6 +66,8 @@ public class OutputLangUtils
}
// See also SinkQuadWriter and deduplicate
+ /** @deprecated */
+ @Deprecated
static public void output(Writer out, Node s, Node p, Node o, Node g,
Prologue prologue, NodeToLabel labelPolicy)
{
output(out, s, prologue, labelPolicy) ;
@@ -84,6 +85,8 @@ public class OutputLangUtils
}
// See also SinkTripleWriter and deduplicate
+ /** @deprecated */
+ @Deprecated
static public void output(Writer out, Triple triple, Node graphNode,
Prologue prologue, NodeToLabel labelPolicy)
{
Node s = triple.getSubject() ;
@@ -92,6 +95,8 @@ public class OutputLangUtils
output(out, s, p, o, graphNode, prologue, labelPolicy) ;
}
+ /** @deprecated */
+ @Deprecated
static public void output(Writer out, Triple triple, Prologue prologue,
NodeToLabel labelPolicy)
{
Node s = triple.getSubject() ;
@@ -100,12 +105,15 @@ public class OutputLangUtils
output(out, s, p, o, null, prologue, labelPolicy) ;
}
- /** Use with caution - better to pass in a Node to Label mapper */
+ /** @deprecated */
+ @Deprecated
static public void output(Writer out, Node node, Prologue prologue)
{
output(out, node, prologue, SyntaxLabels.createNodeToLabel()) ;
}
+ /** @deprecated */
+ @Deprecated
static public void output(Writer out, Node node, Prologue prologue,
NodeToLabel labelPolicy)
{
// NodeVisitor would be nice but don't want to create an object per
static call.
@@ -256,7 +264,7 @@ public class OutputLangUtils
*
*/
@Deprecated
- static public void outputEsc(Writer out, String s, boolean useSlashEscapes)
+ static private void outputEsc(Writer out, String s, boolean
useSlashEscapes)
{
int len = s.length() ;
for (int i = 0; i < len; i++) {
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java?rev=1604390&r1=1604389&r2=1604390&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
(original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
Sat Jun 21 14:04:28 2014
@@ -68,6 +68,7 @@ public class TestOutput extends BaseTest
@Test public void output_13() { test(Node.ANY, "ANY", prologue) ; }
+ @SuppressWarnings("deprecation")
private void test(Node node, String string, Prologue prologue2)
{
try
@@ -106,6 +107,7 @@ public class TestOutput extends BaseTest
return stringForNode(nodeStr, null, "ASCII") ;
}
+ @SuppressWarnings("deprecation")
private static String stringForNode(String nodeStr, Prologue prologue,
String encoding)
{
Node node = NodeFactoryExtra.parseNode(nodeStr) ;
