[jboss-svn-commits] JBL Code SVN: r32636 - in labs/jbossrules/trunk: drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 23 17:17:01 EDT 2010
Author: baunax
Date: 2010-04-23 17:17:01 -0400 (Fri, 23 Apr 2010)
New Revision: 32636
Modified:
labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/config/SimpleConstraintConfigurationImpl.java
labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/client/helper/ConstraintsConstrainerTest.java
labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/RangeConstraintSingleOperatorTest.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
Log:
GUVNOR-532 The same FactConstraint is assigned to the diffent fields in WorkignSetEditor
- Fixed the issue creating a new WS config.
- some cosmetic changes.
Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/config/SimpleConstraintConfigurationImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/config/SimpleConstraintConfigurationImpl.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/config/SimpleConstraintConfigurationImpl.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -14,6 +14,13 @@
private String factType;
private String fieldName;
+ public SimpleConstraintConfigurationImpl(ConstraintConfiguration constraintConfiguration) {
+ copyFrom(constraintConfiguration);
+ }
+
+ public SimpleConstraintConfigurationImpl() {
+ }
+
public Set<String> getArgumentKeys() {
return args.keySet();
}
@@ -59,4 +66,17 @@
return "SimpleConstraintConfigurationImpl [args=" + args + ", constraintName=" + constraintName + ", factType="
+ factType + ", fieldName=" + fieldName + "]";
}
+
+ private void copyFrom(ConstraintConfiguration other) {
+ if (constraintName != null) {
+ throw new RuntimeException("can't copy configuration on a configured instance");
+ }
+ this.constraintName = other.getConstraintName();
+ this.factType = other.getFactType();
+ this.fieldName = other.getFieldName();
+ this.args = new HashMap<String, String>();
+ for (String argName : other.getArgumentKeys()) {
+ this.args.put(argName, (String) other.getArgumentValue(argName));
+ }
+ }
}
Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -103,6 +103,10 @@
}
public static ConstraintConfiguration getEmptyConfiguration(String constraintName) {
- return getAllConfigurations().get(constraintName);
+ return copyConfig(getAllConfigurations().get(constraintName));
}
+
+ private static ConstraintConfiguration copyConfig(ConstraintConfiguration constraintConfiguration) {
+ return new SimpleConstraintConfigurationImpl(constraintConfiguration);
+ }
}
Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/client/helper/ConstraintsConstrainerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/client/helper/ConstraintsConstrainerTest.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/client/helper/ConstraintsConstrainerTest.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -50,4 +50,16 @@
assertEquals(1, cc.getConstraints("Pet", "name").size());
}
+ @Test
+ public void newConfig() {
+ for (String confName : new String[] {"NotNull", "IntegerConstraint", "RangeConstraint", "NotMatches", "Matches"}) {
+ ConstraintConfiguration conf1 = ConstraintsContainer.getEmptyConfiguration(confName);
+ ConstraintConfiguration conf2 = ConstraintsContainer.getEmptyConfiguration(confName);
+ assertFalse(conf1.equals(conf2));
+
+ assertEquals(conf1.getArgumentKeys(), conf2.getArgumentKeys());
+ }
+
+ }
+
}
Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/RangeConstraintSingleOperatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/RangeConstraintSingleOperatorTest.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/RangeConstraintSingleOperatorTest.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -140,7 +140,6 @@
public void testGT() {
String rulesToVerify = "";
- int fail = 0;
int warning = 0;
//FAIL
@@ -185,7 +184,6 @@
public void testGE() {
String rulesToVerify = "";
- int fail = 0;
int warning = 0;
//FAIL
@@ -230,7 +228,6 @@
public void testLT() {
String rulesToVerify = "";
- int fail = 0;
int warning = 0;
//FAIL
@@ -275,7 +272,6 @@
public void testLE() {
String rulesToVerify = "";
- int fail = 0;
int warning = 0;
//FAIL
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -41,18 +41,19 @@
public class RuleTemplateEditor extends DirtyableComposite implements RuleModelEditor {
private TemplateModel model;
- private GroupingStore store;
+ private GroupingStore store = null;
private RuleModeller ruleModeller;
private Constants constants = ((Constants) GWT.create(Constants.class));
public RuleTemplateEditor(RuleAsset asset) {
model = (TemplateModel) asset.content;
TabPanel tPanel = new TabPanel();
- tPanel.setAutoWidth(true);
+ tPanel.setWidth(800);
+// tPanel.setAutoWidth(true);
// tPanel.setAutoHeight(true);
Panel pnl = new Panel();
- pnl.setAutoWidth(true);
+// pnl.setAutoWidth(true);
pnl.setClosable(false);
pnl.setTitle("Template Editor");
// pnl.setAutoHeight(true);
@@ -61,7 +62,7 @@
tPanel.add(pnl);
pnl = new Panel();
- pnl.setAutoWidth(true);
+// pnl.setAutoWidth(true);
pnl.setClosable(false);
pnl.setTitle("Template Data");
// pnl.setAutoHeight(true);
@@ -124,7 +125,7 @@
}
store = new GroupingStore(proxy, reader);
store.load();
- EditorGridPanel grid = new EditorGridPanel(store, cm);
+ final EditorGridPanel grid = new EditorGridPanel(store, cm);
grid.setStripeRows(true);
GroupingView gv = new GroupingView();
@@ -153,7 +154,7 @@
model.addRow(rowData);
}
}));
-
+
ToolbarMenuButton tbb = new ToolbarMenuButton(constants.Modify(), menu);
tb.addButton(tbb);
grid.add(tb);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -429,9 +429,7 @@
}
protected void showWorkingSetsSelection(RuleModeller modeller) {
- final WorkingSetSelectorPopup pop = new WorkingSetSelectorPopup( modeller,
- asset );
- pop.show();
+ new WorkingSetSelectorPopup( modeller, asset ).show();
}
public static interface CheckinAction {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-04-23 21:13:09 UTC (rev 32635)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-04-23 21:17:01 UTC (rev 32636)
@@ -14,6 +14,7 @@
import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
@@ -29,7 +30,6 @@
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -39,6 +39,7 @@
import com.gwtext.client.widgets.event.PanelListenerAdapter;
public class WorkingSetEditor extends Composite {
+ private static int idGenerator = 0;
private Constants constants = GWT.create(Constants.class);
private RuleAsset workingSet;
@@ -70,19 +71,20 @@
WorkingSetConfigData wsData = (WorkingSetConfigData) workingSet.content;
TabPanel tPanel = new TabPanel();
+ tPanel.setWidth(800);
Panel pnl = new Panel();
- pnl.setAutoWidth(true);
+// pnl.setAutoWidth(true);
pnl.setClosable(false);
pnl.setTitle("WS Definition"); //TODO {bauna} i18n
- pnl.setAutoHeight(true);
+// pnl.setAutoHeight(true);
pnl.add(buildDoubleList(wsData));
tPanel.add(pnl);
pnl = new Panel();
- pnl.setAutoWidth(true);
+// pnl.setAutoWidth(true);
pnl.setClosable(false);
pnl.setTitle("WS Constraints"); //TODO {bauna} i18n
- pnl.setAutoHeight(true);
+// pnl.setAutoHeight(true);
pnl.add(buildFactsConstraintsEditor(tPanel));
tPanel.add(pnl);
@@ -136,18 +138,18 @@
final FlexTable table = new FlexTable();
VerticalPanel vp = new VerticalPanel();
- vp.add(new Label(constants.FactTypes()));
+ vp.add(new SmallLabel(constants.FactTypes()));
vp.add(factsCombo);
table.setWidget(0, 0, vp);
vp = new VerticalPanel();
- vp.add(new Label(constants.Field()));
+ vp.add(new SmallLabel(constants.Field()));
vp.add(fieldsCombo);
table.setWidget(1, 0, vp);
vp = new VerticalPanel();
HorizontalPanel hp = new HorizontalPanel();
- vp.add(new Label(constants.ConstraintsSection()));
+ vp.add(new SmallLabel("Constraints")); //TODO i18n
hp.add(constraintsCombo);
VerticalPanel btnPanel = new VerticalPanel();
@@ -164,8 +166,8 @@
}
});
- vpConstraintConf.add(new Label(constants.ConstraintsSection()));
- vpConstraintConf.add(new Label(""));
+ vpConstraintConf.add(new SmallLabel("Contraints Parameters")); //TODO i18n
+ vpConstraintConf.add(new SmallLabel(""));
table.setWidget(0, 1, vpConstraintConf);
table.getFlexCellFormatter().setRowSpan(0, 1, 5);
@@ -187,7 +189,7 @@
private void showConstraintConfig() {
if (constraintsCombo.getItemCount() == 0) {
vpConstraintConf.remove(vpConstraintConf.getWidgetCount() - 1);
- vpConstraintConf.add(new Label());
+ vpConstraintConf.add(new SmallLabel());
return;
}
if (constraintsCombo.getSelectedIndex() != -1) {
@@ -285,19 +287,19 @@
constraintsCombo.addItem(c.getConstraintName(), addContrainsMap(c));
}
vpConstraintConf.remove(vpConstraintConf.getWidgetCount() - 1);
- vpConstraintConf.add(new Label());
+ vpConstraintConf.add(new SmallLabel());
}
showConstraintConfig();
}
- private String addContrainsMap(ConstraintConfiguration c) {
- String id = "" + contraintsMap.size();
+ synchronized private String addContrainsMap(ConstraintConfiguration c) {
+ String id = String.valueOf(idGenerator++);
contraintsMap.put(id, c);
return id;
}
private Grid buildDoubleList(WorkingSetConfigData wsData) {
- Grid grid = new Grid(1, 3);
+ Grid grid = new Grid(2, 3);
SuggestionCompletionEngine sce = SuggestionCompletionCache.getInstance().getEngineFromCache(workingSet.metaData.packageName);
boolean filteringFact = sce.isFilteringFacts();
@@ -340,9 +342,12 @@
}
}));
- grid.setWidget(0, 0, availFacts);
- grid.setWidget(0, 1, btnsPanel);
- grid.setWidget(0, 2, validFacts);
+ grid.setWidget(0, 0, new SmallLabel("Available Facts")); //TODO i18n
+ grid.setWidget(0, 1, new SmallLabel(""));
+ grid.setWidget(0, 2, new SmallLabel("WorkingSet Facts")); //TODO i18n
+ grid.setWidget(1, 0, availFacts);
+ grid.setWidget(1, 1, btnsPanel);
+ grid.setWidget(1, 2, validFacts);
grid.getColumnFormatter().setWidth(0, "45%");
grid.getColumnFormatter().setWidth(0, "10%");
More information about the jboss-svn-commits
mailing list