small refactoring in the Java binding

3 files changed, 17 insertions, 15 deletions

diff --git a/src/runtime/java/org/grammaticalframework/pgf/Concr.java b/src/runtime/java/org/grammaticalframework/pgf/Concr.java
index 0f91539a0..f7ec88b60 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/Concr.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/Concr.java
@@ -14,10 +14,10 @@ public class Concr {
 	// private stuff
 	
 	private PGF gr;
-	public long concr;
+	public long ref;
 
-	private Concr(PGF gr, long concr) {
-		this.gr    = gr;
-		this.concr = concr;
+	private Concr(PGF gr, long ref) {
+		this.gr  = gr;
+		this.ref = ref;
 	}
 }
diff --git a/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java b/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java
index be90d07c5..1ab9cae26 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java
@@ -3,20 +3,22 @@ package org.grammaticalframework.pgf;
 import java.util.*;
 
 class ExprIterator implements Iterator<ExprProb> {
+	private Concr concr;
 	private Pool pool, out_pool;
-	private long enumRef;
+	private long ref;
 	private ExprProb ep;
 	private boolean fetched;
 
-	public ExprIterator(long pool, long out_pool, long enumRef) {
-		this.pool = new Pool(pool);
+	public ExprIterator(Concr concr, long pool, long out_pool, long ref) {
+		this.concr    = concr;
+		this.pool     = new Pool(pool);
 		this.out_pool = new Pool(out_pool);
-		this.enumRef = enumRef;
-		this.ep = null;
-		this.fetched = false;
+		this.ref      = ref;
+		this.ep       = null;
+		this.fetched  = false;
 	}
 
-	private native ExprProb fetchExprProb(long enumRef, Pool out_pool);
+	private native ExprProb fetchExprProb(long ref, Pool out_pool);
 
 	private void fetch() {
 		if (!fetched) {
diff --git a/src/runtime/java/org/grammaticalframework/pgf/PGF.java b/src/runtime/java/org/grammaticalframework/pgf/PGF.java
index 35ff8d044..467065d00 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/PGF.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/PGF.java
@@ -30,18 +30,18 @@ public class PGF {
 	private static native void free(long pool);
 
 	private long pool;
-	private long gr;
+	private long ref;
 
-	private PGF(long pool, long gr) {
+	private PGF(long pool, long ref) {
 		this.pool = pool;
-		this.gr   = gr;
+		this.ref  = ref;
 	}
 
 	protected void finalize () throws Throwable {
 		if (pool != 0) {
 			free(pool);
 			pool = 0;
-			gr = 0;
+			ref = 0;
 		}
 	}