[Hibernate-commits] Hibernate Code SVN: r10004 - in trunk/HibernateExt/tools/src: java/org/hibernate/tool/ide/completion test/org/hibernate/tool/ide/completion

[<hib...@li...>]

Author: max...@jb...
Date: 2006-06-09 07:01:53 -0400 (Fri, 09 Jun 2006)
New Revision: 10004

Modified:
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/HQLCompletionProposal.java
   trunk/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java
Log:
put Property into the completion

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java	2006-06-09 01:31:32 UTC (rev 10003)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/ConfigurationCompletion.java	2006-06-09 11:01:53 UTC (rev 10004)
@@ -188,6 +188,7 @@
 		    if (prefix.length() == 0 || candidate.startsWith(prefix)) {
 		    	HQLCompletionProposal proposal = createStartWithCompletionProposal( prefix, cursorPosition, HQLCompletionProposal.PROPERTY, candidate );
 		    	proposal.setEntityName( cmd.getEntityName() );
+		    	proposal.setProperty( property );
 		    	proposal.setPropertyName( candidate );		    	
 				hcc.accept( proposal);		    	                
             }
@@ -323,6 +324,7 @@
 				HQLCompletionProposal proposal = createStartWithCompletionProposal( prefix, cursorPosition, HQLCompletionProposal.PROPERTY, candidate );
 				//proposal.setEntityName( cmd.getEntityName() ); ...we don't know here..TODO: pass in the "path"
 		    	proposal.setPropertyName( candidate );
+		    	proposal.setProperty(element);
 				hcc.accept( proposal);				               
             }
             i++;

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/HQLCompletionProposal.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/HQLCompletionProposal.java	2006-06-09 01:31:32 UTC (rev 10003)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/ide/completion/HQLCompletionProposal.java	2006-06-09 11:01:53 UTC (rev 10004)
@@ -1,7 +1,9 @@
 package org.hibernate.tool.ide.completion;
 
+import org.hibernate.mapping.Property;
 
 
+
 public class HQLCompletionProposal {
 	
 	static final char[] NO_CHAR = new char[0];
@@ -55,6 +57,11 @@
 	 * The propertyName, can be null.  
 	 */
 	private String propertyName = null;
+
+	/**
+	 * The underlying property. Can be null.
+	 */
+	private Property property;
 	
 	public String getCompletion() {
 		return completion;
@@ -173,8 +180,14 @@
 		this.propertyName = propertyName;
 	}
 
+	public void setProperty(Property element) {
+		this.property = element;		
+	}
+
+	public Property getProperty() {
+		return property;
+	}
 	
-	
 
 	
 }

Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java	2006-06-09 01:31:32 UTC (rev 10003)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/ide/completion/ModelCompletionTest.java	2006-06-09 11:01:53 UTC (rev 10004)
@@ -379,6 +379,8 @@
 		//TODO: keep a path/context assertEquals("Product", proposal.getShortEntityName());
 		assertEquals("org.hibernate.tool.ide.completion.Product", proposal.getEntityName());
 		assertEquals("version", proposal.getPropertyName());
+		assertNotNull(proposal.getProperty());
+		assertEquals(proposal.getPropertyName(), proposal.getProperty().getName());
 	
     		
     }