[jboss-svn-commits] JBL Code SVN: r32029 - labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa.

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

Author: jervisliu
Date: 2010-03-11 00:11:39 -0500 (Thu, 11 Mar 2010)
New Revision: 32029

Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java
Log:
Merged BRMS-143(can't remove a global from test scenario) from trunk. 
Merge log: 
svn merge -r 26591:27497 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java

Note, to merge 27497 we have to include revision 26945 and 26759 of ScenarioWidget.java and revision 26759 of FormStylePopup.java. 26759 has already been on this branch. So this merge includes 26945: GUVNOR-364 : In an expect part of a test scenario, if you use a class and then remove the model, il it not possible to open that testscenario

Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java	2010-03-11 04:33:23 UTC (rev 32028)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java	2010-03-11 05:11:39 UTC (rev 32029)
@@ -535,11 +535,11 @@
 	public static Widget editableCell(final ValueChanged changeEvent, String factType, String fieldName, String initialValue, SuggestionCompletionEngine sce) {
 		String key  = factType + "." + fieldName;
 		String flType = sce.fieldTypes.get(key);
-		if (flType.equals(SuggestionCompletionEngine.TYPE_NUMERIC)) {
+		if ( flType != null && flType.equals( SuggestionCompletionEngine.TYPE_NUMERIC ) ) {
 			final TextBox box = editableTextBox(changeEvent, fieldName, initialValue);
 			box.addKeyboardListener(ActionValueEditor.getNumericFilter(box));
 	        return box;
-		} else if (flType.equals(SuggestionCompletionEngine.TYPE_BOOLEAN )) {
+		} else if ( flType != null && flType.equals( SuggestionCompletionEngine.TYPE_BOOLEAN ) ) {
 			String[] c = new String[] {"true", "false"};
 			return ConstraintValueEditor.enumDropDown(initialValue, changeEvent, DropDownData.create(c));
 		} else {
@@ -720,7 +720,7 @@
                 remove.addClickListener(new ClickListener() {
                     public void onClick(Widget sender) {
                         if (Window.confirm(constants.AreYouSureYouWantToRemoveThisBlockOfData())) {
-                            scenario.fixtures.removeAll(defList);
+                            scenario.globals.removeAll( defList );
                             parent.renderEditor();
                             pop.hide();
                         }