r7000 - in dumbhippo/trunk: openfire/src/plugins/hippo/src/java/com/dumbhippo/jive server/src/com/dumbhippo/dm server/src/com/dumbhippo/dm/fetch server/src/com/dumbhippo/dm/schema

[commits mugshot org]

Author: otaylor
Date: 2007-12-10 11:40:49 -0600 (Mon, 10 Dec 2007)
New Revision: 7000

Modified:
   dumbhippo/trunk/openfire/src/plugins/hippo/src/java/com/dumbhippo/jive/SingleQueryIQMethod.java
   dumbhippo/trunk/server/src/com/dumbhippo/dm/DMSession.java
   dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java
   dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/ResourcePropertyHolder.java
Log:
Remove unnecessary classholder property from BoundFetch.visit()

Modified: dumbhippo/trunk/openfire/src/plugins/hippo/src/java/com/dumbhippo/jive/SingleQueryIQMethod.java
===================================================================
--- dumbhippo/trunk/openfire/src/plugins/hippo/src/java/com/dumbhippo/jive/SingleQueryIQMethod.java	2007-12-10 17:24:17 UTC (rev 6999)
+++ dumbhippo/trunk/openfire/src/plugins/hippo/src/java/com/dumbhippo/jive/SingleQueryIQMethod.java	2007-12-10 17:40:49 UTC (rev 7000)
@@ -25,7 +25,7 @@
 		DMClassHolder classHolder = resultObject.getClassHolder(); 
 		BoundFetch fetch = fetchNode.bind(classHolder);
 		
-		fetch.visit(session, classHolder, resultObject, visitor);
+		fetch.visit(session, resultObject, visitor);
 	}
 	
 	@Override

Modified: dumbhippo/trunk/server/src/com/dumbhippo/dm/DMSession.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/dm/DMSession.java	2007-12-10 17:24:17 UTC (rev 6999)
+++ dumbhippo/trunk/server/src/com/dumbhippo/dm/DMSession.java	2007-12-10 17:40:49 UTC (rev 7000)
@@ -84,8 +84,7 @@
 	}
 	
 	public <K,T extends DMObject<K>> void visitFetch(T object, BoundFetch<K,? super T> fetch, FetchVisitor visitor) {
-		DMClassHolder<K,T> classHolder = object.getClassHolder();
-		fetch.visit(this, classHolder, object, visitor);
+		fetch.visit(this, object, visitor);
 	}
 
 	/**

Modified: dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java	2007-12-10 17:24:17 UTC (rev 6999)
+++ dumbhippo/trunk/server/src/com/dumbhippo/dm/fetch/BoundFetch.java	2007-12-10 17:40:49 UTC (rev 7000)
@@ -53,7 +53,8 @@
 		return feedMinTimestamps;
 	}
 	
-	public <U extends T> void visit(DMSession session, DMClassHolder<K,U> classHolder, U object, FetchVisitor visitor, boolean indirect) {
+	public <U extends T> void visit(DMSession session, U object, FetchVisitor visitor, boolean indirect) {
+		DMClassHolder<K,U> classHolder = object.getClassHolder();
 		DMPropertyHolder<K,U,?>[] classProperties = classHolder.getProperties();
 		BoundFetch<K,? super U> oldFetch;
 		long[] feedMinTimestamps = null;
@@ -255,8 +256,8 @@
 		visitor.endResource();
 	}
 	
-	public <U extends T>  void visit(DMSession session, DMClassHolder<K,U> classHolder, U object, FetchVisitor visitor) {
-		visit(session, classHolder, object, visitor, false);
+	public <U extends T>  void visit(DMSession session, U object, FetchVisitor visitor) {
+		visit(session, object, visitor, false);
 	}
 	
 	private void appendToFetchString(StringBuilder sb, DMPropertyHolder<?,?,?> propertyHolder, boolean qualify) {

Modified: dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/ResourcePropertyHolder.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/ResourcePropertyHolder.java	2007-12-10 17:24:17 UTC (rev 6999)
+++ dumbhippo/trunk/server/src/com/dumbhippo/dm/schema/ResourcePropertyHolder.java	2007-12-10 17:40:49 UTC (rev 7000)
@@ -102,7 +102,7 @@
 	}
 	
 	protected void visitChild(DMSession session, BoundFetch<KI,TI> children, TI value, FetchVisitor visitor) {
-		children.visit(session, resourceClassHolder, value, visitor, true);
+		children.visit(session, value, visitor, true);
 	}
 
 	protected void visitResourceValue(DMSession session, TI value, FetchVisitor visitor) {