[jboss-svn-commits] JBL Code SVN: r35871 - in labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client: modeldriven/ui and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 4 14:44:01 EDT 2010
Author: tsurdilovic
Date: 2010-11-04 14:44:01 -0400 (Thu, 04 Nov 2010)
New Revision: 35871
Modified:
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerLabel.java
labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerTextBox.java
Log:
BRMS-338 : When adding rules in Guided Editor with the date-effective attribute set, entering a wrong date format does not show warning.
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-11-04 17:42:13 UTC (rev 35870)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-11-04 18:44:01 UTC (rev 35871)
@@ -2095,4 +2095,6 @@
String FillInColumnWithValue();
String LoadTemplateData();
+
+ String InvalidDateFormatMessage();
}
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-11-04 17:42:13 UTC (rev 35870)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-11-04 18:44:01 UTC (rev 35871)
@@ -1032,4 +1032,5 @@
TemplateData=Template Data
ActivateRuleFlowGroup=Activate rule flow group
FillInColumnWithValue=Please fill in this column with a {0} value.
-LoadTemplateData=Load Template Data
\ No newline at end of file
+LoadTemplateData=Load Template Data
+InvalidDateFormatMessage=Date format is invalid. Please follow the correct date format: dd-MMM-yyyy
\ No newline at end of file
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerLabel.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerLabel.java 2010-11-04 17:42:13 UTC (rev 35870)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerLabel.java 2010-11-04 18:44:01 UTC (rev 35871)
@@ -18,7 +18,11 @@
import java.util.Date;
+import org.drools.guvnor.client.messages.Constants;
+
+import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.FocusListener;
import com.google.gwt.user.client.ui.Label;
@@ -33,6 +37,7 @@
public class DatePickerLabel extends DatePicker {
protected Label labelWidget = new Label();
+ private Constants constants = ((Constants) GWT.create( Constants.class ));
public DatePickerLabel(String selectedDate) {
this( selectedDate,
@@ -47,7 +52,8 @@
datePickerPopUp = new DatePickerPopUp( new ClickListener() {
public void onClick(Widget arg0) {
- Date date = fillDate();
+ try {
+ Date date = fillDate();
textWidget.setText( visualFormatFormatter.format( date ) );
labelWidget.setText( textWidget.getText() );
@@ -57,6 +63,9 @@
panel.clear();
panel.add( labelWidget );
datePickerPopUp.hide();
+ } catch(Exception e) {
+ Window.alert( constants.InvalidDateFormatMessage() );
+ }
}
},
visualFormatFormatter );
Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerTextBox.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerTextBox.java 2010-11-04 17:42:13 UTC (rev 35870)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerTextBox.java 2010-11-04 18:44:01 UTC (rev 35871)
@@ -19,8 +19,11 @@
import java.util.Date;
import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.messages.Constants;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.FocusListener;
import com.google.gwt.user.client.ui.TextBox;
@@ -29,6 +32,7 @@
public class DatePickerTextBox extends DatePicker {
private ImageButton select = new ImageButton( "images/edit_tiny.gif" );
+ private Constants constants = ((Constants) GWT.create( Constants.class ));
public DatePickerTextBox(String selectedDate) {
this( selectedDate,
@@ -43,13 +47,17 @@
datePickerPopUp = new DatePickerPopUp( new ClickListener() {
public void onClick(Widget arg0) {
- Date date = fillDate();
+ try {
+ Date date = fillDate();
textWidget.setText( visualFormatFormatter.format( date ) );
valueChanged();
makeDirty();
datePickerPopUp.hide();
+ } catch(Exception e) {
+ Window.alert( constants.InvalidDateFormatMessage() );
+ }
}
},
visualFormatFormatter );
More information about the jboss-svn-commits
mailing list