JENA-938 : Code cleaning (extract of PR #63) Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f4890c56 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f4890c56 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f4890c56
Branch: refs/heads/add-contract-tests Commit: f4890c56b4a307378d1664c3f1580b4b6d92949c Parents: 61884bf Author: Andy Seaborne <[email protected]> Authored: Wed May 13 20:41:11 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed May 13 20:41:11 2015 +0100 ---------------------------------------------------------------------- .../org/apache/jena/datatypes/xsd/XSDDatatype.java | 2 +- .../java/org/apache/jena/n3/N3IndentedWriter.java | 1 - .../org/apache/jena/n3/N3JenaWriterCommon.java | 17 ++--------------- .../java/org/apache/jena/n3/N3JenaWriterPP.java | 10 ++-------- .../apache/jena/n3/turtle/parser/TurtleParser.java | 7 ++++--- 5 files changed, 9 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java index 36e7ee5..a7266fd 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java @@ -272,7 +272,7 @@ public class XSDDatatype extends BaseDatatype { try { ValidationContext context = new ValidationState(); ValidatedInfo resultInfo = new ValidatedInfo(); - Object result = typeDeclaration.validate(lexicalForm, context, resultInfo); + typeDeclaration.validate(lexicalForm, context, resultInfo); return convertValidatedDataValue(resultInfo); } catch (InvalidDatatypeValueException e) { throw new DatatypeFormatException(lexicalForm, this, "during parse -" + e); http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java b/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java index 1ce8eb3..bbbf28e 100644 --- a/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java +++ b/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java @@ -81,7 +81,6 @@ public class N3IndentedWriter public void padTo() throws IOException { - StringBuilder sBuff = new StringBuilder() ; for ( int i = 0 ; i < currentIndent ; i++ ) writer.write(' ') ; column = column + currentIndent ; http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java index f3a9d5c..e929338 100644 --- a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java +++ b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java @@ -235,18 +235,6 @@ public class N3JenaWriterCommon implements RDFWriter prefixMap = model.getNsPrefixMap() ; bNodesMap = new HashMap<>() ; - // PrefixMapping (to Jena 2.5.7 at least) - // is specialized to XML-isms and Turle prefixed names aren't quite qnames. - // Build temporary maps of acceptable prefixes and URIs. - - // If no base defined for the model, but one given to writer, - // then use this. - String base2 = prefixMap.get("") ; - -// BaseURI - <#> -// if ( base2 == null && baseURIrefHash != null ) -// prefixMap.put("", baseURIrefHash) ; - for ( Iterator<Entry<String, String>> iter = prefixMap.entrySet().iterator() ; iter.hasNext() ; ) { Entry<String, String> e = iter.next() ; @@ -563,7 +551,7 @@ public class N3JenaWriterCommon implements RDFWriter // Turtle - N3 does not allow .3 +.3 or -.3 // See if parsable. try { - BigDecimal d = new BigDecimal(s) ; + new BigDecimal(s); return s ; } catch (NumberFormatException nfe) {} } @@ -625,8 +613,7 @@ public class N3JenaWriterCommon implements RDFWriter protected String formatURI(String uriStr) { - String matchURI = "" ; - String matchPrefix = null ; + // BaseURI - <#> // if ( doAbbreviatedBaseURIref && uriStr.equals(baseURIref) ) http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java index ea21bd3..b7d9df4 100644 --- a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java +++ b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java @@ -212,7 +212,7 @@ public class N3JenaWriterPP extends N3JenaWriterCommon // Corrupt graph! throw new JenaException("N3: found object with no arcs!") ; - Statement s = pointsToIter.nextStatement() ; + pointsToIter.nextStatement() ; if ( pointsToIter.hasNext() ) return false ; @@ -393,10 +393,6 @@ public class N3JenaWriterPP extends N3JenaWriterCommon complex.add(obj) ; } sIter.close() ; - // DEBUG - int simpleSize = simple.size() ; - int complexSize = complex.size() ; - // Write property/simple objects if ( simple.size() > 0 ) @@ -467,9 +463,7 @@ public class N3JenaWriterPP extends N3JenaWriterCommon String padSp = null ; // Can we fit teh start of teh complex object on this line? - - // DEBUG variable. - int tmp = propStr.length() ; + // Complex objects - do not allow property to be long and alignment to be lost if ((propStr.length()+minGap) <= propertyCol) { http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java b/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java index 5cfa4c0..b2141e5 100644 --- a/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java +++ b/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java @@ -214,8 +214,8 @@ public class TurtleParser extends ParserBase implements TurtleParserConstants { // Non-recursive for Turtle long PropertyList tests final public void ObjectList(Node s, Node p) throws ParseException { - Node o ; - Object(s, p); + + Object(s, p); label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -557,7 +557,8 @@ public class TurtleParser extends ParserBase implements TurtleParserConstants { } final public Node RDFLiteral() throws ParseException { - Token t ; String lex = null ; + + String lex = null ; lex = String(); String lang = null ; String dt = null ; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
