Cosmetics

diff --git a/src/main/java/org/z3950/zing/cql/sparql/Filter.java b/src/main/java/org/z3950/zing/cql/sparql/Filter.java
index 29f6e89..c6e98d6 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/Filter.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/Filter.java
@@ -20,8 +20,8 @@ public class Filter implements GraphPattern {
   }
 
   @Override
-  public void print(PrettyPrinter pr) {
-    pr.startl("FILTER ").put(filter).put(".").endl();
+  public void print(PrettyPrinter pp) {
+    pp.startl("FILTER ").put(filter).put(".").endl();
   }
   
 }

diff --git a/src/main/java/org/z3950/zing/cql/sparql/GraphPatternSet.java b/src/main/java/org/z3950/zing/cql/sparql/GraphPatternSet.java
index 859d91c..3942d9a 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/GraphPatternSet.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/GraphPatternSet.java
@@ -28,11 +28,11 @@ public class GraphPatternSet implements GraphPattern {
   }
 
   @Override
-  public void print(PrettyPrinter sw) {
-    sw.put("{").endl();
+  public void print(PrettyPrinter pp) {
+    pp.put("{").endl();
     for (GraphPattern tp : patterns) {
-      tp.print(sw.levelUp());
+      tp.print(pp.levelUp());
     }
-    sw.putl("}");
+    pp.putl("}");
   }
 }

diff --git a/src/main/java/org/z3950/zing/cql/sparql/Optional.java b/src/main/java/org/z3950/zing/cql/sparql/Optional.java
index 88d51cc..7652895 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/Optional.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/Optional.java
@@ -19,9 +19,9 @@ public class Optional extends GraphPatternSet {
   }
   
   @Override
-  public void print(PrettyPrinter sw) {
-    sw.startl("OPTIONAL ");
-    super.print(sw);
+  public void print(PrettyPrinter pp) {
+    pp.startl("OPTIONAL ");
+    super.print(pp);
   }
  
 }

diff --git a/src/main/java/org/z3950/zing/cql/sparql/Query.java b/src/main/java/org/z3950/zing/cql/sparql/Query.java
index 0f3a213..2ca9952 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/Query.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/Query.java
@@ -62,13 +62,13 @@ public class Query implements Printable {
   }
   
   @Override
-  public void print(PrettyPrinter sw) {
+  public void print(PrettyPrinter pp) {
     for (Prefix prefix : prefixes.values()) {
-      sw.startl("PREFIX ")
+      pp.startl("PREFIX ")
         .put(prefix.getName()).put(": ")
         .put("<").put(prefix.getUrl()).put(">").endl();
     }
-    form.print(sw);
-    where.print(sw);
+    form.print(pp);
+    where.print(pp);
   }
 }

diff --git a/src/main/java/org/z3950/zing/cql/sparql/Select.java b/src/main/java/org/z3950/zing/cql/sparql/Select.java
index 31a4e2e..b7ef67e 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/Select.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/Select.java
@@ -23,13 +23,13 @@ public class Select implements Form {
   }
 
   @Override
-  public void print(PrettyPrinter sw) {
-    sw.startl("SELECT");
+  public void print(PrettyPrinter pp) {
+    pp.startl("SELECT");
     for (String var : variables) {
-      sw.put(" ");
-      sw.put(var);
+      pp.put(" ");
+      pp.put(var);
     }
-    sw.endl();
+    pp.endl();
   }
   
 }

diff --git a/src/main/java/org/z3950/zing/cql/sparql/TriplePattern.java b/src/main/java/org/z3950/zing/cql/sparql/TriplePattern.java
index 88430b2..f3534df 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/TriplePattern.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/TriplePattern.java
@@ -24,8 +24,8 @@ public class TriplePattern implements GraphPattern {
   }
   
   @Override
-  public void print(PrettyPrinter wr) {
-    wr.startl(subject).put(" ")
+  public void print(PrettyPrinter pp) {
+    pp.startl(subject).put(" ")
       .put(predicate).put(" ")
       .put(object).put(" .").endl();
   }

diff --git a/src/main/java/org/z3950/zing/cql/sparql/Where.java b/src/main/java/org/z3950/zing/cql/sparql/Where.java
index fa5479c..42067ca 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/sparql/Where.java
+++ b/src/main/java/org/z3950/zing/cql/sparql/Where.java
@@ -21,9 +21,9 @@ public class Where extends GraphPatternSet {
   }
   
   @Override
-  public void print(PrettyPrinter sw) {
-    sw.startl("WHERE ");
-    super.print(sw);
+  public void print(PrettyPrinter pp) {
+    pp.startl("WHERE ");
+    super.print(pp);
   }
   
 }