[jboss-svn-commits] JBL Code SVN: r36408 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: qa/testscenarios and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Dec 15 02:58:02 EST 2010


Author: Rikkola
Date: 2010-12-15 02:58:01 -0500 (Wed, 15 Dec 2010)
New Revision: 36408

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelper.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java
Log:
Code clean patch from zenix

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java	2010-12-15 07:43:19 UTC (rev 36407)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java	2010-12-15 07:58:01 UTC (rev 36408)
@@ -35,6 +35,7 @@
 import java.util.List;
 
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant;
 import com.google.gwt.user.client.ui.Widget;
 
 public class DirtyableFlexTable extends FlexTable implements DirtyableContainer {
@@ -59,7 +60,10 @@
 			list.add(length++, new Pair(row, column));
 		}
     }
-
+    
+    public void setHorizontalAlignmentForFlexCellFormatter(int row, int column, HorizontalAlignmentConstant horizontalAlignmentConstant ){
+    	getFlexCellFormatter().setHorizontalAlignment(row, column, horizontalAlignmentConstant);
+    }
 }
 
 class Pair {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelper.java	2010-12-15 07:43:19 UTC (rev 36407)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioHelper.java	2010-12-15 07:58:01 UTC (rev 36408)
@@ -40,131 +40,162 @@
  */
 public class ScenarioHelper {
 
-	static final String RETRACT_KEY = "retract";
-	static final String ACTIVATE_RULE_FLOW_GROUP = "activate_rule_flow_group";
+    static final String RETRACT_KEY              = "retract";
+    static final String ACTIVATE_RULE_FLOW_GROUP = "activate_rule_flow_group";
 
-	/**
-	 * Called lumpy map - as this takes a flat list of fixtures, and groups
-	 * things together. It will return a list - of which each element will
-	 * either be a list - or a map. If its a map - then its a map of FactData to
-	 * the fact type. If its a list, then it will be expectations or
-	 * retractions.
-	 * 
-	 * Man, this will be so much nicer with generics.
-	 * 
-	 * @return List<List<VeryifyRuleFired or VerifyFact or RetractFact> OR
-	 *         Map<String, List<FactData>> OR ExecutionTrace>
-	 */
-	public List<Fixture> lumpyMap(List<Fixture> fixtures) {
-		List<Fixture> output = new ArrayList<Fixture>();
+    /**
+     * Called lumpy map - as this takes a flat list of fixtures, and groups
+     * things together. It will return a list - of which each element will
+     * either be a list - or a map. If its a map - then its a map of FactData to
+     * the fact type. If its a list, then it will be expectations or
+     * retractions.
+     * 
+     * Man, this will be so much nicer with generics.
+     * 
+     * @return List<List<VeryifyRuleFired or VerifyFact or RetractFact> OR
+     *         Map<String, List<FactData>> OR ExecutionTrace>
+     */
+    public List<Fixture> lumpyMap(List<Fixture> fixtures) {
+        List<Fixture> output = new ArrayList<Fixture>();
 
-		FixturesMap dataInput = new FixturesMap();
-		CallFixtureMap callOnDataInput = new CallFixtureMap();
-		FixtureList verifyFact = new FixtureList();
-		FixtureList verifyRule = new FixtureList();
-		FixtureList retractFacts = new FixtureList();
+        FixturesMap dataInput = new FixturesMap();
+        CallFixtureMap callOnDataInput = new CallFixtureMap();
+        FixtureList verifyFact = new FixtureList();
+        FixtureList verifyRule = new FixtureList();
+        FixtureList retractFacts = new FixtureList();
 
-		for (Iterator<Fixture> iterator = fixtures.iterator(); iterator
-				.hasNext();) {
-			Fixture fixture = iterator.next();
-			if (fixture instanceof FactData) {
-				accumulateData(dataInput, fixture);
-			} else if (fixture instanceof CallMethod) {
-				accumulateCallMethode(callOnDataInput, fixture);
-			} else if (fixture instanceof ActivateRuleFlowGroup) {
-				accumulateData(dataInput, fixture);
-			} else if (fixture instanceof RetractFact) {
-				retractFacts.add((RetractFact) fixture);
-			} else if (fixture instanceof VerifyRuleFired) {
-				verifyRule.add((VerifyRuleFired) fixture);
-			} else if (fixture instanceof VerifyFact) {
-				verifyFact.add((VerifyFact) fixture);
-			} else if (fixture instanceof ExecutionTrace) {
-				gatherFixtures(output, dataInput, callOnDataInput, verifyFact,
-						verifyRule, retractFacts, false);
+        for ( Iterator<Fixture> iterator = fixtures.iterator(); iterator
+                .hasNext(); ) {
+            Fixture fixture = iterator.next();
+            if ( fixture instanceof FactData ) {
+                accumulateData( dataInput,
+                                fixture );
+            } else if ( fixture instanceof CallMethod ) {
+                accumulateCallMethode( callOnDataInput,
+                                       fixture );
+            } else if ( fixture instanceof ActivateRuleFlowGroup ) {
+                accumulateData( dataInput,
+                                fixture );
+            } else if ( fixture instanceof RetractFact ) {
+                retractFacts.add( (RetractFact) fixture );
+            } else if ( fixture instanceof VerifyRuleFired ) {
+                verifyRule.add( (VerifyRuleFired) fixture );
+            } else if ( fixture instanceof VerifyFact ) {
+                verifyFact.add( (VerifyFact) fixture );
+            } else if ( fixture instanceof ExecutionTrace ) {
+                gatherFixtures( output,
+                                dataInput,
+                                callOnDataInput,
+                                verifyFact,
+                                verifyRule,
+                                retractFacts,
+                                false );
 
-				output.add(fixture);
+                output.add( fixture );
 
-				verifyRule = new FixtureList();
-				verifyFact = new FixtureList();
-				retractFacts = new FixtureList();
-				callOnDataInput = new CallFixtureMap();
-				dataInput = new FixturesMap();
-			}
-		}
-		gatherFixtures(output, dataInput, callOnDataInput, verifyFact,
-				verifyRule, retractFacts, true);
+                verifyRule = new FixtureList();
+                verifyFact = new FixtureList();
+                retractFacts = new FixtureList();
+                callOnDataInput = new CallFixtureMap();
+                dataInput = new FixturesMap();
+            }
+        }
+        gatherFixtures( output,
+                        dataInput,
+                        callOnDataInput,
+                        verifyFact,
+                        verifyRule,
+                        retractFacts,
+                        true );
 
-		return output;
-	}
+        return output;
+    }
 
-	private void gatherFixtures(List<Fixture> output, FixturesMap dataInput,
-			CallFixtureMap callOnDataInput, FixtureList verifyFact,
-			FixtureList verifyRule, FixtureList retractFacts, boolean end) {
-		if (verifyRule.size() > 0)
-			output.add(verifyRule);
-		if (verifyFact.size() > 0)
-			output.add(verifyFact);
-		if (retractFacts.size() > 0)
-			dataInput.put(RETRACT_KEY, retractFacts);
-		if (dataInput.size() > 0 || !end)
-			output.add(dataInput); // want to have a place holder for the GUI
-		if (callOnDataInput.size() > 0 || !end)
-			output.add(callOnDataInput);
-	}
+    private void gatherFixtures(List<Fixture> output,
+                                FixturesMap dataInput,
+                                CallFixtureMap callOnDataInput,
+                                FixtureList verifyFact,
+                                FixtureList verifyRule,
+                                FixtureList retractFacts,
+                                boolean end) {
+        if ( verifyRule.size() > 0 ) output.add( verifyRule );
+        if ( verifyFact.size() > 0 ) output.add( verifyFact );
+        if ( retractFacts.size() > 0 ) dataInput.put( RETRACT_KEY,
+                                                      retractFacts );
+        if ( dataInput.size() > 0 || !end ) output.add( dataInput ); // want to have a place holder for the GUI
+        if ( callOnDataInput.size() > 0 || !end ) output.add( callOnDataInput );
+    }
 
-	/**
-	 * Group the globals together by fact type.
-	 */
-	public Map<String, FixtureList> lumpyMapGlobals(List<FactData> globals) {
-		Map<String, FixtureList> map = new HashMap<String, FixtureList>();
-		for (FactData factData : globals) {
-			accumulateData(map, factData);
-		}
-		return map;
-	}
+    /**
+     * Group the globals together by fact type.
+     */
+    public Map<String, FixtureList> lumpyMapGlobals(List<FactData> globals) {
+        Map<String, FixtureList> map = new HashMap<String, FixtureList>();
+        for ( FactData factData : globals ) {
+            accumulateData( map,
+                            factData );
+        }
+        return map;
+    }
 
-	private void accumulateData(Map<String, FixtureList> dataInput, Fixture f) {
-		if (f instanceof FactData) {
-			FactData fd = (FactData) f;
-			if (!dataInput.containsKey(fd.type)) {
-				dataInput.put(fd.type, new FixtureList());
-			}
-			((FixtureList) dataInput.get(fd.type)).add(fd);
-		} else if (f instanceof ActivateRuleFlowGroup) {
-			if (!dataInput.containsKey(ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP)) {
-				dataInput.put(ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP,
-						new FixtureList());
-			}
-			((FixtureList) dataInput
-					.get(ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP)).add(f);
-		}
-	}
+    public List<ExecutionTrace> getExecutionTraceFor(List<Fixture> fixtures) {
+        List<Fixture> processedFixtures = lumpyMap( fixtures );
+        List<ExecutionTrace> listExecutionTrace = new ArrayList<ExecutionTrace>();
+        for ( int i = 0; i < processedFixtures.size(); i++ ) {
+            final Object fixture = processedFixtures.get( i );
+            if ( fixture instanceof ExecutionTrace ) {
+                listExecutionTrace.add( (ExecutionTrace) fixture );
+            }
+        }
 
-	private void accumulateCallMethode(Map<String, FixtureList> dataInput,
-			Fixture f) {
-		if (f instanceof CallMethod) {
-			CallMethod fd = (CallMethod) f;
-			if (!dataInput.containsKey(fd.variable)) {
-				dataInput.put(fd.variable, new FixtureList());
-			}
-			((FixtureList) dataInput.get(fd.variable)).add(fd);
-		}
-	}
+        return listExecutionTrace;
+    }
 
-	static void removeFields(List<Fixture> factDatas, String field) {
-		for (Fixture fixture : factDatas) {
-			if (fixture instanceof FactData) {
-				FactData factData = (FactData) fixture;
-				for (Iterator<FieldData> fieldDataIterator = factData.fieldData
-						.iterator(); fieldDataIterator.hasNext();) {
-					FieldData fieldData = fieldDataIterator.next();
-					if (fieldData.name.equals(field)) {
-						fieldDataIterator.remove();
-					}
-				}
-			}
-		}
-	}
+    private void accumulateData(Map<String, FixtureList> dataInput,
+                                Fixture f) {
+        if ( f instanceof FactData ) {
+            FactData fd = (FactData) f;
+            if ( !dataInput.containsKey( fd.type ) ) {
+                dataInput.put( fd.type,
+                               new FixtureList() );
+            }
+            ((FixtureList) dataInput.get( fd.type )).add( fd );
+        } else if ( f instanceof ActivateRuleFlowGroup ) {
+            if ( !dataInput.containsKey( ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP ) ) {
+                dataInput.put( ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP,
+                               new FixtureList() );
+            }
+            ((FixtureList) dataInput
+                    .get( ScenarioHelper.ACTIVATE_RULE_FLOW_GROUP )).add( f );
+        }
+    }
 
+    private void accumulateCallMethode(Map<String, FixtureList> dataInput,
+                                       Fixture f) {
+        if ( f instanceof CallMethod ) {
+            CallMethod fd = (CallMethod) f;
+            if ( !dataInput.containsKey( fd.variable ) ) {
+                dataInput.put( fd.variable,
+                               new FixtureList() );
+            }
+            ((FixtureList) dataInput.get( fd.variable )).add( fd );
+        }
+    }
+
+    static void removeFields(List<Fixture> factDatas,
+                             String field) {
+        for ( Fixture fixture : factDatas ) {
+            if ( fixture instanceof FactData ) {
+                FactData factData = (FactData) fixture;
+                for ( Iterator<FieldData> fieldDataIterator = factData.fieldData
+                        .iterator(); fieldDataIterator.hasNext(); ) {
+                    FieldData fieldData = fieldDataIterator.next();
+                    if ( fieldData.name.equals( field ) ) {
+                        fieldDataIterator.remove();
+                    }
+                }
+            }
+        }
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java	2010-12-15 07:43:19 UTC (rev 36407)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ScenarioWidget.java	2010-12-15 07:58:01 UTC (rev 36408)
@@ -16,7 +16,6 @@
 
 package org.drools.guvnor.client.qa.testscenarios;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.drools.guvnor.client.common.DirtyableFlexTable;
@@ -49,7 +48,6 @@
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
@@ -88,7 +86,8 @@
         this.layout = new VerticalPanel();
         this.setShowResults( false );
 
-        this.suggestionCompletionEngine = SuggestionCompletionCache.getInstance().getEngineFromCache( asset.metaData.packageName );
+        this.suggestionCompletionEngine = SuggestionCompletionCache
+                .getInstance().getEngineFromCache( asset.metaData.packageName );
 
         if ( getScenario().fixtures.size() == 0 ) {
             getScenario().fixtures.add( new ExecutionTrace() );
@@ -109,150 +108,236 @@
 
     }
 
+    private void createWidgetForEditorLayout(DirtyableFlexTable editorLayout,
+                                             int layoutRow,
+                                             int layoutColumn,
+                                             Widget widget) {
+        editorLayout.setWidget( layoutRow,
+                                layoutColumn,
+                                widget );
+    }
+
     void renderEditor() {
 
         if ( this.layout.getWidgetCount() == 2 ) {
             this.layout.remove( 1 );
         }
 
-        DirtyableFlexTable editorLayout = new DirtyableFlexTable();
-        editorLayout.clear();
-        editorLayout.setWidth( "100%" );
-        editorLayout.setStyleName( "model-builder-Background" );
+        DirtyableFlexTable editorLayout = createDirtyableFlexTable();
         this.layout.add( editorLayout );
+        ScenarioHelper scenarioHelper = new ScenarioHelper();
+        List<Fixture> fixtures = getScenario().fixtures;
+        List<ExecutionTrace> listExecutionTrace = scenarioHelper
+                .getExecutionTraceFor( fixtures );
 
-        ScenarioHelper scenarioHelper = new ScenarioHelper();
-        List<Fixture> fixtures = scenarioHelper.lumpyMap( getScenario().fixtures );
-        List<ExecutionTrace> listExecutionTrace = new ArrayList<ExecutionTrace>();
-        for ( int i = 0; i < fixtures.size(); i++ ) {
-            final Object fixture = fixtures.get( i );
-            if ( fixture instanceof ExecutionTrace ) {
-                listExecutionTrace.add( (ExecutionTrace) fixture );
-            }
-        }
         int layoutRow = 1;
         int executionTraceLine = 0;
         ExecutionTrace previousExecutionTrace = null;
         for ( final Fixture fixture : fixtures ) {
             if ( fixture instanceof ExecutionTrace ) {
                 ExecutionTrace currentExecutionTrace = (ExecutionTrace) fixture;
-                editorLayout.setWidget( layoutRow,
-                                        0,
-                                        new ExpectPanel( asset.metaData.packageName,
-                                                         currentExecutionTrace,
-                                                         getScenario(),
-                                                         this ) );
+                createWidgetForEditorLayout( editorLayout,
+                                             layoutRow,
+                                             0,
+                                             createExpectPanel( currentExecutionTrace ) );
 
                 executionTraceLine++;
                 if ( executionTraceLine >= listExecutionTrace.size() ) {
                     executionTraceLine = listExecutionTrace.size() - 1;
                 }
-                editorLayout.setWidget( layoutRow,
-                                        1,
-                                        new ExecutionWidget( currentExecutionTrace,
-                                                             isShowResults() ) );
-                editorLayout.getFlexCellFormatter().setHorizontalAlignment( layoutRow,
-                                                                            2,
-                                                                            HasHorizontalAlignment.ALIGN_LEFT );
+                createWidgetForEditorLayout( editorLayout,
+                                             layoutRow,
+                                             1,
+                                             createExecutionWidget( currentExecutionTrace ) );
+                editorLayout.setHorizontalAlignmentForFlexCellFormatter(
+                                                                         layoutRow,
+                                                                         2,
+                                                                         HasHorizontalAlignment.ALIGN_LEFT );
 
                 previousExecutionTrace = currentExecutionTrace;
 
             } else if ( fixture instanceof FixturesMap ) {
-                editorLayout.setWidget( layoutRow,
-                                        0,
-                                        new GivenLabelButton( previousExecutionTrace,
-                                                              getScenario(),
-                                                              listExecutionTrace.get( executionTraceLine ),
-                                                              this ) );
-
+                createWidgetForEditorLayout(
+                                             editorLayout,
+                                             layoutRow,
+                                             0,
+                                             createGivenLabelButton( listExecutionTrace,
+                                                                     executionTraceLine,
+                                                                     previousExecutionTrace ) );
                 layoutRow++;
-
-                if ( fixture instanceof FixturesMap ) {
-                    editorLayout.setWidget( layoutRow,
-                                            1,
-                                            newGivenPanel( listExecutionTrace,
-                                                           executionTraceLine,
-                                                           (FixturesMap) fixture ) );
-                }
+                createWidgetForEditorLayout(
+                                             editorLayout,
+                                             layoutRow,
+                                             1,
+                                             createGivenPanel( listExecutionTrace,
+                                                               executionTraceLine,
+                                                               (FixturesMap) fixture ) );
             } else if ( fixture instanceof CallFixtureMap ) {
-                editorLayout.setWidget( layoutRow,
-                                        0,
-                                        new CallMethodLabelButton( previousExecutionTrace,
-                                                                   getScenario(),
-                                                                   listExecutionTrace.get( executionTraceLine ),
-                                                                   this ) );
-
+                createWidgetForEditorLayout(
+                                             editorLayout,
+                                             layoutRow,
+                                             0,
+                                             createCallMethodLabelButton( listExecutionTrace,
+                                                                          executionTraceLine,
+                                                                          previousExecutionTrace ) );
                 layoutRow++;
-                editorLayout.setWidget( layoutRow,
-                                        1,
-                                        newCallMethodOnGivenPanel( listExecutionTrace,
-                                                                   executionTraceLine,
-                                                                   (CallFixtureMap) fixture ) );
+                createWidgetForEditorLayout(
+                                             editorLayout,
+                                             layoutRow,
+                                             1,
+                                             createCallMethodOnGivenPanel( listExecutionTrace,
+                                                                           executionTraceLine,
+                                                                           (CallFixtureMap) fixture ) );
             } else {
                 FixtureList fixturesList = (FixtureList) fixture;
                 Fixture first = fixturesList.get( 0 );
                 if ( first instanceof VerifyFact ) {
-
-                    editorLayout.setWidget( layoutRow,
-                                            1,
-                                            new VerifyFactsPanel( fixturesList,
-                                                                  listExecutionTrace.get( executionTraceLine ),
-                                                                  getScenario(),
-                                                                  this,
-                                                                  isShowResults() ) );
+                    createWidgetForEditorLayout(
+                                                 editorLayout,
+                                                 layoutRow,
+                                                 1,
+                                                 createVerifyFactsPanel( listExecutionTrace,
+                                                                         executionTraceLine,
+                                                                         fixturesList ) );
                 } else if ( first instanceof VerifyRuleFired ) {
-                    editorLayout.setWidget( layoutRow,
-                                            1,
-                                            new VerifyRulesFiredWidget( fixturesList,
-                                                                        getScenario(),
-                                                                        isShowResults() ) );
+                    createWidgetForEditorLayout( editorLayout,
+                                                 layoutRow,
+                                                 1,
+                                                 createVerifyRulesFiredWidget( fixturesList ) );
                 }
 
             }
             layoutRow++;
         }
 
-        //add more execution sections.
-        editorLayout.setWidget( layoutRow,
-                                0,
-                                new AddExecuteButton( getScenario(),
-                                                      this ) );
+        // add more execution sections.
+        createWidgetForEditorLayout( editorLayout,
+                                     layoutRow,
+                                     0,
+                                     createAddExecuteButton() );
         layoutRow++;
+        createWidgetForEditorLayout( editorLayout,
+                                     layoutRow,
+                                     0,
+                                     createSmallLabel() );
 
-        editorLayout.setWidget( layoutRow,
-                                0,
-                                new SmallLabel( constants.configuration() ) );
+        // config section
+        createWidgetForEditorLayout( editorLayout,
+                                     layoutRow,
+                                     1,
+                                     createConfigWidget() );
 
-        //config section
-        editorLayout.setWidget( layoutRow,
-                                1,
-                                new ConfigWidget( getScenario(),
-                                                  asset.metaData.packageName,
-                                                  this ) );
-
         layoutRow++;
 
-        //global section
+        // global section
+        HorizontalPanel horizontalPanel = createHorizontalPanel();
+        createWidgetForEditorLayout( editorLayout,
+                                     layoutRow,
+                                     0,
+                                     horizontalPanel );
+
+        createWidgetForEditorLayout( editorLayout,
+                                     layoutRow,
+                                     1,
+                                     createGlobalPanel( scenarioHelper,
+                                                        previousExecutionTrace ) );
+    }
+
+    private GlobalPanel createGlobalPanel(ScenarioHelper scenarioHelper,
+                                          ExecutionTrace previousExecutionTrace) {
+        return new GlobalPanel(
+                                scenarioHelper.lumpyMapGlobals( getScenario().globals ),
+                                getScenario(),
+                                previousExecutionTrace,
+                                this );
+    }
+
+    private HorizontalPanel createHorizontalPanel() {
         HorizontalPanel h = new HorizontalPanel();
         h.add( new GlobalButton( getScenario(),
                                  this ) );
         h.add( new SmallLabel( constants.globals() ) );
-        editorLayout.setWidget( layoutRow,
-                                0,
-                                h );
+        return h;
+    }
 
-        editorLayout.setWidget( layoutRow,
-                                1,
-                                new GlobalPanel( scenarioHelper.lumpyMapGlobals( getScenario().globals ),
-                                                 getScenario(),
-                                                 previousExecutionTrace,
-                                                 this ) );
+    private SmallLabel createSmallLabel() {
+        return new SmallLabel( constants.configuration() );
     }
 
-    private Widget newGivenPanel(List<ExecutionTrace> listExecutionTrace,
-                                 int executionTraceLine,
-                                 FixturesMap given) {
+    private ConfigWidget createConfigWidget() {
+        return new ConfigWidget( getScenario(),
+                                 asset.metaData.packageName,
+                                 this );
+    }
 
+    private AddExecuteButton createAddExecuteButton() {
+        return new AddExecuteButton( getScenario(),
+                                     this );
+    }
+
+    private VerifyRulesFiredWidget createVerifyRulesFiredWidget(
+                                                                FixtureList fixturesList) {
+        return new VerifyRulesFiredWidget( fixturesList,
+                                           getScenario(),
+                                           isShowResults() );
+    }
+
+    private VerifyFactsPanel createVerifyFactsPanel(
+                                                    List<ExecutionTrace> listExecutionTrace,
+                                                    int executionTraceLine,
+                                                    FixtureList fixturesList) {
+        return new VerifyFactsPanel( fixturesList,
+                                     listExecutionTrace.get( executionTraceLine ),
+                                     getScenario(),
+                                     this,
+                                     isShowResults() );
+    }
+
+    private CallMethodLabelButton createCallMethodLabelButton(
+                                                              List<ExecutionTrace> listExecutionTrace,
+                                                              int executionTraceLine,
+                                                              ExecutionTrace previousExecutionTrace) {
+        return new CallMethodLabelButton( previousExecutionTrace,
+                                          getScenario(),
+                                          listExecutionTrace.get( executionTraceLine ),
+                                          this );
+    }
+
+    private GivenLabelButton createGivenLabelButton(
+                                                    List<ExecutionTrace> listExecutionTrace,
+                                                    int executionTraceLine,
+                                                    ExecutionTrace previousExecutionTrace) {
+        return new GivenLabelButton( previousExecutionTrace,
+                                     getScenario(),
+                                     listExecutionTrace.get( executionTraceLine ),
+                                     this );
+    }
+
+    private ExecutionWidget createExecutionWidget(
+                                                  ExecutionTrace currentExecutionTrace) {
+        return new ExecutionWidget( currentExecutionTrace,
+                                    isShowResults() );
+    }
+
+    private ExpectPanel createExpectPanel(ExecutionTrace currentExecutionTrace) {
+        return new ExpectPanel( asset.metaData.packageName,
+                                currentExecutionTrace,
+                                getScenario(),
+                                this );
+    }
+
+    private DirtyableFlexTable createDirtyableFlexTable() {
+        DirtyableFlexTable editorLayout = new DirtyableFlexTable();
+        editorLayout.clear();
+        editorLayout.setWidth( "100%" );
+        editorLayout.setStyleName( "model-builder-Background" );
+        return editorLayout;
+    }
+
+    private Widget createGivenPanel(List<ExecutionTrace> listExecutionTrace,
+                                    int executionTraceLine,
+                                    FixturesMap given) {
+
         if ( given.size() > 0 ) {
             return new GivenPanel( listExecutionTrace,
                                    executionTraceLine,
@@ -261,13 +346,16 @@
                                    this );
 
         } else {
-            return new HTML( "<i><small>" + constants.AddInputDataAndExpectationsHere() + "</small></i>" );
+            return new HTML( "<i><small>"
+                             + constants.AddInputDataAndExpectationsHere()
+                             + "</small></i>" );
         }
     }
 
-    private Widget newCallMethodOnGivenPanel(List<ExecutionTrace> listExecutionTrace,
-                                             int executionTraceLine,
-                                             CallFixtureMap given) {
+    private Widget createCallMethodOnGivenPanel(
+                                                List<ExecutionTrace> listExecutionTrace,
+                                                int executionTraceLine,
+                                                CallFixtureMap given) {
 
         if ( given.size() > 0 ) {
             return new CallMethodOnGivenPanel( listExecutionTrace,
@@ -277,7 +365,9 @@
                                                this );
 
         } else {
-            return new HTML( "<i><small>" + constants.AddInputDataAndExpectationsHere() + "</small></i>" );
+            return new HTML( "<i><small>"
+                             + constants.AddInputDataAndExpectationsHere()
+                             + "</small></i>" );
         }
     }
 
@@ -301,11 +391,13 @@
             ruleSelectionCL = new ChangeHandler() {
 
                 public void onChange(ChangeEvent event) {
-                    ruleNameTextBox.setText( availableRulesBox.getItemText( availableRulesBox.getSelectedIndex() ) );
+                    ruleNameTextBox.setText( availableRulesBox
+                            .getItemText( availableRulesBox.getSelectedIndex() ) );
                 }
             };
 
-            availableRulesHandlerRegistration = availableRulesBox.addChangeHandler( ruleSelectionCL );
+            availableRulesHandlerRegistration = availableRulesBox
+                    .addChangeHandler( ruleSelectionCL );
             horizontalPanel.add( availableRulesBox );
 
         } else {
@@ -317,7 +409,8 @@
                 public void onClick(ClickEvent event) {
                     horizontalPanel.remove( showList );
                     final Image busy = new Image( images.searching() );
-                    final Label loading = new SmallLabel( constants.loadingList1() );
+                    final Label loading = new SmallLabel( constants
+                            .loadingList1() );
                     horizontalPanel.add( busy );
                     horizontalPanel.add( loading );
 
@@ -325,28 +418,41 @@
                     scheduler.scheduleDeferred( new Command() {
 
                         public void execute() {
-                            RepositoryServiceFactory.getService().listRulesInPackage( packageName,
-                                                                                      new GenericCallback<String[]>() {
+                            RepositoryServiceFactory.getService()
+                                    .listRulesInPackage( packageName,
+                                                         new GenericCallback<String[]>() {
 
-                                                                                          public void onSuccess(String[] list) {
-                                                                                              availableRules = (list);
-                                                                                              final ListBox availableRulesBox = new ListBox();
-                                                                                              availableRulesBox.addItem( constants.pleaseChoose1() );
-                                                                                              for ( int i = 0; i < list.length; i++ ) {
-                                                                                                  availableRulesBox.addItem( list[i] );
-                                                                                              }
-                                                                                              ruleSelectionCL = new ChangeHandler() {
-                                                                                                  public void onChange(ChangeEvent event) {
-                                                                                                      ruleNameTextBox.setText( availableRulesBox.getItemText( availableRulesBox.getSelectedIndex() ) );
-                                                                                                  }
-                                                                                              };
-                                                                                              availableRulesHandlerRegistration = availableRulesBox.addChangeHandler( ruleSelectionCL );
-                                                                                              availableRulesBox.setSelectedIndex( 0 );
-                                                                                              horizontalPanel.add( availableRulesBox );
-                                                                                              horizontalPanel.remove( busy );
-                                                                                              horizontalPanel.remove( loading );
-                                                                                          }
-                                                                                      } );
+                                                             public void onSuccess(
+                                                                                   String[] list) {
+                                                                 availableRules = (list);
+                                                                 final ListBox availableRulesBox = new ListBox();
+                                                                 availableRulesBox.addItem( constants
+                                                                         .pleaseChoose1() );
+                                                                 for ( int i = 0; i < list.length; i++ ) {
+                                                                     availableRulesBox
+                                                                             .addItem( list[i] );
+                                                                 }
+                                                                 ruleSelectionCL = new ChangeHandler() {
+                                                                     public void onChange(
+                                                                                          ChangeEvent event) {
+                                                                         ruleNameTextBox
+                                                                                 .setText( availableRulesBox
+                                                                                         .getItemText( availableRulesBox
+                                                                                                 .getSelectedIndex() ) );
+                                                                     }
+                                                                 };
+                                                                 availableRulesHandlerRegistration = availableRulesBox
+                                                                         .addChangeHandler( ruleSelectionCL );
+                                                                 availableRulesBox
+                                                                         .setSelectedIndex( 0 );
+                                                                 horizontalPanel
+                                                                         .add( availableRulesBox );
+                                                                 horizontalPanel
+                                                                         .remove( busy );
+                                                                 horizontalPanel
+                                                                         .remove( loading );
+                                                             }
+                                                         } );
                         }
                     } );
 
@@ -372,8 +478,16 @@
                                 int width,
                                 float percent) {
         int pixels = (int) (width * (percent / 100));
-        String html = "<div class=\"smallish-progress-wrapper\" style=\"width: " + width + "px\">" + "<div class=\"smallish-progress-bar\" style=\"width: " + pixels + "px; background-color: " + colour + ";\"></div>"
-                      + "<div class=\"smallish-progress-text\" style=\"width: " + width + "px\">" + (int) percent + "%</div></div>"; //NON-NLS
+        String html = "<div class=\"smallish-progress-wrapper\" style=\"width: "
+                      + width
+                      + "px\">"
+                      + "<div class=\"smallish-progress-bar\" style=\"width: "
+                      + pixels
+                      + "px; background-color: "
+                      + colour
+                      + ";\"></div>"
+                      + "<div class=\"smallish-progress-text\" style=\"width: "
+                      + width + "px\">" + (int) percent + "%</div></div>"; // NON-NLS
         return new HTML( html );
 
     }



More information about the jboss-svn-commits mailing list