[jboss-svn-commits] JBL Code SVN: r32473 - in labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/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
Wed Apr 7 17:27:19 EDT 2010
Author: diegoll
Date: 2010-04-07 17:27:18 -0400 (Wed, 07 Apr 2010)
New Revision: 32473
Modified:
labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java
labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
Log:
fix bug when calling new_template
Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java 2010-04-07 20:48:00 UTC (rev 32472)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java 2010-04-07 21:27:18 UTC (rev 32473)
@@ -204,7 +204,7 @@
m.addItem(new Item(constants.NewRuleTemplate(), new BaseItemListenerAdapter() {
@Override
public void onClick(BaseItem item, EventObject e) {
- launchWizard(null, constants.NewRuleTemplate(), true);
+ launchWizard(AssetFormats.RULE_TEMPLATE, constants.NewRuleTemplate(), true);
}
}, "images/new_template.gif")); //NON-NLS
Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java 2010-04-07 20:48:00 UTC (rev 32472)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java 2010-04-07 21:27:18 UTC (rev 32473)
@@ -53,17 +53,12 @@
this(mod, set, null);
}
- public ActionInsertFactWidget(RuleModeller ruleModeller,
- ActionInsertFact action, Boolean readOnly, boolean template) {
- this(ruleModeller, action, readOnly);
- this.template = template;
- }
-
- public ActionInsertFactWidget(RuleModeller mod, ActionInsertFact set,Boolean readOnly) {
+ public ActionInsertFactWidget(RuleModeller mod, ActionInsertFact set,Boolean readOnly, boolean template) {
super(mod);
this.model = set;
this.layout = new DirtyableFlexTable();
this.factType = set.factType;
+ this.template = template;
SuggestionCompletionEngine completions = this.getModeller().getSuggestionCompletions();
this.fieldCompletions = completions.getFieldCompletions( FieldAccessorsAndMutators.MUTATOR,
@@ -84,6 +79,11 @@
doLayout();
initWidget(this.layout);
+
+ }
+
+ public ActionInsertFactWidget(RuleModeller mod, ActionInsertFact set,Boolean readOnly) {
+ this(mod, set, readOnly, false);
}
private void doLayout() {
Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2010-04-07 20:48:00 UTC (rev 32472)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2010-04-07 21:27:18 UTC (rev 32473)
@@ -86,11 +86,22 @@
*/
public FactPatternWidget(RuleModeller mod, IPattern p,
String customLabel, boolean canBind, Boolean readOnly) {
+ this(mod, p, customLabel, canBind, readOnly, false);
+ }
+
+ public FactPatternWidget(RuleModeller ruleModeller, IPattern pattern,
+ boolean canBind, Boolean readOnly, boolean template) {
+ this(ruleModeller, pattern, null, canBind, readOnly, template);
+ }
+
+ public FactPatternWidget(RuleModeller mod, IPattern p,
+ String customLabel, boolean canBind, Boolean readOnly, boolean template) {
super(mod);
this.pattern = (FactPattern) p;
this.completions = mod.getSuggestionCompletions();
this.bindable = canBind;
-
+ this.template = template;
+
this.connectives = new Connectives();
this.connectives.setCompletions(completions);
this.connectives.setModeller(mod);
@@ -116,7 +127,7 @@
formatter.setAlignment(0, 0, HasHorizontalAlignment.ALIGN_LEFT, HasVerticalAlignment.ALIGN_BOTTOM);
formatter.setStyleName(0, 0, "modeller-fact-TypeHeader");
- ArrayList sortedConst = sortConstraints(pattern.getFieldConstraints());
+ List<FieldConstraint> sortedConst = sortConstraints(pattern.getFieldConstraints());
pattern.setFieldConstraints(sortedConst);
drawConstraints(sortedConst);
@@ -133,12 +144,7 @@
}
- public FactPatternWidget(RuleModeller ruleModeller, IPattern pattern,
- boolean canBind, Boolean readOnly, boolean template) {
- this(ruleModeller, pattern, canBind, readOnly);
- this.template = template;
- }
-
+
/**
* Render a hierarchy of constraints, hierarchy here means constraints that may
* themselves depend on members of constraint objects. With this code, the GUI
@@ -148,10 +154,10 @@
*
* @param sortedConst a sorted list of constraints to display.
* */
- private void drawConstraints(ArrayList sortedConst) {
+ private void drawConstraints(List<FieldConstraint> sortedConst) {
final DirtyableFlexTable table = new DirtyableFlexTable();
layout.setWidget(1, 0, table);
- List parents = new ArrayList();
+ List<FieldConstraint> parents = new ArrayList<FieldConstraint>();
for (int i = 0; i < sortedConst.size(); i++) {
int tabs = -1;
@@ -206,8 +212,8 @@
* @param constraints the list of inheriting constraints to sort.
* @return a sorted list of constraints ready for display.
* */
- private ArrayList sortConstraints(FieldConstraint[] constraints) {
- ArrayList sortedConst = new ArrayList(constraints.length);
+ private List<FieldConstraint> sortConstraints(FieldConstraint[] constraints) {
+ List<FieldConstraint> sortedConst = new ArrayList<FieldConstraint>(constraints.length);
for (int i = 0; i < constraints.length; i++) {
FieldConstraint current = constraints[i];
if (current instanceof SingleFieldConstraint) {
@@ -232,7 +238,7 @@
* @param sortedConst the array to fill.
* @param fieldConst the constraint to investigate.
* */
- private void insertSingleFieldConstraint(SingleFieldConstraint fieldConst, ArrayList sortedConst) {
+ private void insertSingleFieldConstraint(SingleFieldConstraint fieldConst, List<FieldConstraint> sortedConst) {
if (fieldConst.parent instanceof SingleFieldConstraint) {
insertSingleFieldConstraint((SingleFieldConstraint) fieldConst.parent, sortedConst);
}
More information about the jboss-svn-commits
mailing list