[jboss-svn-commits] JBL Code SVN: r24558 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui.

[jboss-svn-commits at lists.jboss.org]

Author: joe.white at recondotech.com
Date: 2009-01-06 12:49:08 -0500 (Tue, 06 Jan 2009)
New Revision: 24558

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
Log:
GUVNOR-99 Fixed problem with the metadata storage on DSL date selector

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java	2009-01-06 16:43:07 UTC (rev 24557)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java	2009-01-06 17:49:08 UTC (rev 24558)
@@ -44,6 +44,7 @@
 import com.gwtext.client.widgets.Component;
 import com.gwtext.client.widgets.DatePicker;
 import com.gwtext.client.widgets.event.DatePickerListener;
+import com.gwtext.client.widgets.event.DatePickerListenerAdapter;
 import com.gwtext.client.widgets.form.DateField;
 
 /**
@@ -252,7 +253,8 @@
             }else if(wid instanceof DSLDateSelector){
             	DSLDateSelector dateSel = (DSLDateSelector)wid;
             	String dateString = dateSel.getDateString();
-            	newSentence = newSentence + "{"+dateString+":"+dateSel.getType()+":"+dateString+ "} ";
+            	String format = dateSel.getFormat();
+            	newSentence = newSentence + "{"+dateString+":"+dateSel.getType()+":"+format+ "} ";
             } else if (wid instanceof NewLine) {
             	newSentence = newSentence + "\\n";
             }
@@ -484,60 +486,8 @@
     		if(origDate!=null)
     			resultWidget.setValue(origDate);
 
-	    	resultWidget.addListener( new DatePickerListener() {
+	    	resultWidget.addListener( new DatePickerListenerAdapter() {
 
-				public boolean doBeforeDestroy(Component component) {
-					return true;
-				}
-
-				public boolean doBeforeHide(Component component) {
-					return true;
-				}
-
-				public boolean doBeforeRender(Component component) {
-					return true;
-				}
-
-				public boolean doBeforeShow(Component component) {
-					return true;
-				}
-
-				public boolean doBeforeStateRestore(Component component,
-						JavaScriptObject state) {
-					return true;
-				}
-
-				public boolean doBeforeStateSave(Component component,
-						JavaScriptObject state) {
-					return true;
-				}
-
-				public void onDestroy(Component component) {
-				}
-
-				public void onDisable(Component component) {
-				}
-
-				public void onEnable(Component component) {
-				}
-
-				public void onHide(Component component) {
-				}
-
-				public void onRender(Component component) {
-				}
-
-				public void onShow(Component component) {
-				}
-
-				public void onStateRestore(Component component,
-						JavaScriptObject state) {
-				}
-
-				public void onStateSave(Component component,
-						JavaScriptObject state) {
-				}
-
 				public void onSelect(DatePicker dataPicker, Date date) {
 					resultWidget.setValue(date);
 					updateSentence();
@@ -567,6 +517,9 @@
 			String result ="";
 			if(value!=null)
 				result =formatter.format(value);
+			else
+				result = varName;
+			
 			return  result;
 		}
 		public String getVarName() {