You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/10 15:03:39 UTC

[10/50] [abbrv] jena git commit: JENA-907: Rename to getXMLLocalName and getXMLNameSpace

JENA-907: Rename to getXMLLocalName and getXMLNameSpace


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/103776ed
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/103776ed
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/103776ed

Branch: refs/heads/add-contract-tests
Commit: 103776ed71efb5f6ca963260637274ea3356cea8
Parents: 6d3a74f
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 1 16:15:01 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 1 16:15:01 2015 +0100

----------------------------------------------------------------------
 .../apache/jena/rdfxml/xmloutput/impl/Unparser.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/103776ed/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
index 2f35939..409bbd9 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
@@ -901,7 +901,7 @@ class Unparser {
             print(" ");
             printRdfAt("ID");
             print("=");
-            print(quote(getLocalName(r)));
+            print(quote(getXMLLocalName(r)));
             return true;
 
         }
@@ -956,7 +956,7 @@ class Unparser {
             print(" ");
             printRdfAt("ID");
             print("=");
-            print(quote(getLocalName(res)));
+            print(quote(getXMLLocalName(res)));
             haveReified.add(res);
         }
     }
@@ -1180,7 +1180,7 @@ class Unparser {
         }
     }
 
-    private String getNameSpace(Resource r) {
+    private String getXMLNameSpace(Resource r) {
         if (r.isAnon()) {
             logger.error("Internal error - Unparser.getNameSpace; giving up");
             throw new BrokenException("Internal error: getNameSpace(bNode)");
@@ -1204,8 +1204,8 @@ class Unparser {
     }
 
     private boolean isLocalReference(Resource r) {
-        return (!r.isAnon()) && getNameSpace(r).equals(localName + "#")
-                && XMLChar.isValidNCName(getLocalName(r));
+        return (!r.isAnon()) && getXMLNameSpace(r).equals(localName + "#")
+                && XMLChar.isValidNCName(getXMLLocalName(r));
     }
 
     /*
@@ -1217,7 +1217,7 @@ class Unparser {
      * return getSuffix(more) + new Character((char) ('a' + suffixId % 26)); } }
      */
 
-    private String getLocalName(Resource r) {
+    private String getXMLLocalName(Resource r) {
         if (r.isAnon()) {
             logger.error("Internal error - giving up - Unparser.getLocalName");
             throw new BrokenException("Internal error: getLocalName(bNode)");
@@ -1343,7 +1343,7 @@ class Unparser {
 
             if (l.getLanguage().equals("")) {
                 // j.cook.up bug fix
-                if (prettyWriter.isDefaultNamespace(getNameSpace(p)))
+                if (prettyWriter.isDefaultNamespace(getXMLNameSpace(p)))
                     return false;
 
                 String str = l.getString();