X-Git-Url: http://git.phpeclipse.com

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java
index 149135f..cfa3fbe 100644
--- a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/subset/ObjectNode.java
@@ -1,6 +1,5 @@
 package com.quantum.view.subset;
 
-import com.quantum.IQuantumConstants;
 import com.quantum.Messages;
 import com.quantum.model.Entity;
 import com.quantum.model.EntityHolder;
@@ -31,7 +30,7 @@ public class ObjectNode implements Comparable, EntityHolder {
 	public ObjectNode(){
 	}
 	public String getType(){
-		return IQuantumConstants.View;
+		return Entity.VIEW_TYPE;
 	}
 
 	/* (non-Javadoc)
@@ -71,8 +70,8 @@ public class ObjectNode implements Comparable, EntityHolder {
 			if (node.getOrder() > getOrder()) return -1;
 			if (node.getOrder() < getOrder()) return 1;
 			// If the order is the same, we use alphabetical order 
-			return getEntity().getCondQualifiedName().compareTo(
-                node.getEntity().getCondQualifiedName());
+			return getEntity().getQualifiedName().compareTo(
+                node.getEntity().getQualifiedName());
 		} else throw new ClassCastException();
 	}
 	
@@ -105,8 +104,8 @@ public class ObjectNode implements Comparable, EntityHolder {
 	 */
 	public boolean equals(Object obj) {
 		if (!(obj instanceof ObjectNode)) return false;
-		return (getEntity().getCondQualifiedName().equals(
-            ((ObjectNode) obj).getEntity().getCondQualifiedName()));
+		return (getEntity().getQualifiedName().equals(
+            ((ObjectNode) obj).getEntity().getQualifiedName()));
 	}
 	
 	/**
@@ -153,7 +152,7 @@ public class ObjectNode implements Comparable, EntityHolder {
 	 */
 	public String getQuery() {
 		String result = new String(""); //$NON-NLS-1$
-		result = "SELECT " + metadata.getColumnsString() + " FROM " + getEntity().getCondQualifiedName(); //$NON-NLS-1$ //$NON-NLS-2$
+		result = "SELECT " + metadata.getColumnsString() + " FROM " + getEntity().getQualifiedName(); //$NON-NLS-1$ //$NON-NLS-2$
 		return result;
 	}