[jboss-svn-commits] JBL Code SVN: r32494 - in labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client: ruleeditor and 1 other directory.

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

Author: baunax
Date: 2010-04-09 16:59:18 -0400 (Fri, 09 Apr 2010)
New Revision: 32494

Added:
   labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModelEditor.java
Modified:
   labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
   labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java
   labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
Log:
added WorkingSet menu to Rule Template Editor

Added: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModelEditor.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModelEditor.java	                        (rev 0)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModelEditor.java	2010-04-09 20:59:18 UTC (rev 32494)
@@ -0,0 +1,5 @@
+package org.drools.guvnor.client.modeldriven.ui;
+
+public interface RuleModelEditor {
+	public RuleModeller getRuleModeller();
+}


Property changes on: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModelEditor.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-04-09 20:40:32 UTC (rev 32493)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-04-09 20:59:18 UTC (rev 32494)
@@ -87,7 +87,7 @@
  * @author Michael Neale
  *
  */
-public class RuleModeller extends DirtyableComposite {
+public class RuleModeller extends DirtyableComposite implements RuleModelEditor {
 
     private DirtyableFlexTable layout;
     private RuleModel model;
@@ -1199,4 +1199,8 @@
 	public void setWidgetFactory(ModellerWidgetFactory widgetFactory) {
 		this.widgetFactory = widgetFactory;
 	}
+
+	public RuleModeller getRuleModeller() {
+		return this;
+	}
 }

Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java	2010-04-09 20:40:32 UTC (rev 32493)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java	2010-04-09 20:59:18 UTC (rev 32494)
@@ -38,10 +38,11 @@
 import com.gwtext.client.widgets.menu.Menu;
 import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter;
 
-public class RuleTemplateEditor extends DirtyableComposite {
+public class RuleTemplateEditor extends DirtyableComposite implements RuleModelEditor {
 
 	private TemplateModel model;
 	private GroupingStore store;
+	private RuleModeller ruleModeller;
 	private Constants constants = ((Constants) GWT.create(Constants.class));
 
 	public RuleTemplateEditor(RuleAsset asset) {
@@ -55,7 +56,8 @@
 		pnl.setClosable(false);
 		pnl.setTitle("Template Editor");
 		pnl.setAutoHeight(true);
-		pnl.add(new RuleModeller(asset, new TemplateModellerWidgetFactory()));
+		ruleModeller = new RuleModeller(asset, new TemplateModellerWidgetFactory());
+		pnl.add(ruleModeller);
 		tPanel.add(pnl);
 
 		pnl = new Panel();
@@ -173,4 +175,8 @@
 		store.commitChanges();
 		
 	}
+
+	public RuleModeller getRuleModeller() {
+		return ruleModeller;
+	}
 }

Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2010-04-09 20:40:32 UTC (rev 32493)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2010-04-09 20:59:18 UTC (rev 32494)
@@ -41,6 +41,7 @@
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.client.rpc.BuilderResult;
 import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
+import org.drools.guvnor.client.modeldriven.ui.RuleModelEditor;
 import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
 import org.drools.guvnor.client.security.Capabilities;
 import org.drools.guvnor.client.packages.PackageBuilderWidget;
@@ -224,17 +225,16 @@
 
         if ( isValidatorTypeAsset() ) {
 
-            if (editor instanceof RuleModeller){
-                ToolbarButton workingSets = new ToolbarButton();
-                workingSets.setText( constants.SelectWorkingSets() );
-                workingSets.addListener( new ButtonListenerAdapter() {
-                    public void onClick(com.gwtext.client.widgets.Button button,
-                                        EventObject e) {
-                        showWorkingSetsSelection((RuleModeller)editor);
-                    }
-                } );
-                toolbar.addButton( workingSets );
-            }
+			if (editor instanceof RuleModelEditor) {
+				ToolbarButton workingSets = new ToolbarButton();
+				workingSets.setText(constants.SelectWorkingSets());
+				workingSets.addListener(new ButtonListenerAdapter() {
+					public void onClick(com.gwtext.client.widgets.Button button, EventObject e) {
+						showWorkingSetsSelection(((RuleModelEditor) editor).getRuleModeller());
+					}
+				});
+				toolbar.addButton(workingSets);
+			}
 
             ToolbarButton validate = new ToolbarButton();
             validate.setText( constants.Validate() );