[jboss-svn-commits] JBL Code SVN: r32249 - in labs/jbossrules/trunk: drools-guvnor/src/main/java/org/drools/guvnor/client/messages and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 26 14:45:21 EDT 2010
Author: baunax
Date: 2010-03-26 14:45:21 -0400 (Fri, 26 Mar 2010)
New Revision: 32249
Modified:
labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/ConstraintsContainer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
Log:
added delete button for erasing constraints
Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/ConstraintsContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/ConstraintsContainer.java 2010-03-26 18:08:06 UTC (rev 32248)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/ConstraintsContainer.java 2010-03-26 18:45:21 UTC (rev 32249)
@@ -29,8 +29,15 @@
}
- public void addConstraint(Constraint c) {
+ public void removeConstraint(Constraint c) {
List<Constraint> list = constraints.get(c.getFactType());
+ if (list != null) {
+ list.remove(c);
+ }
+ }
+
+ public void addConstraint(Constraint c) {
+ List<Constraint> list = constraints.get(c.getFactType());
if (list == null) {
list = new LinkedList<Constraint>();
constraints.put(c.getFactType(), list);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-03-26 18:08:06 UTC (rev 32248)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-03-26 18:45:21 UTC (rev 32249)
@@ -2064,5 +2064,6 @@
String RenameTheWorkingSetTip();
String WorkingSetRenamedSuccessfully();
String ConstraintsSection();
- String AddNewConstrain();
+ String AddNewConstraint();
+ String removeConstraint();
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-03-26 18:08:06 UTC (rev 32248)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-03-26 18:45:21 UTC (rev 32249)
@@ -1005,4 +1005,5 @@
RenameTheWorkingSetTip=<i>Rename the WorkingSet. A new unique name is required.</i>
WorkingSetRenamedSuccessfully=WorkingSet successfully renamed.
ConstraintsSection=Constraints Section
-AddNewConstrain=Add New Constraint
\ No newline at end of file
+AddNewConstraint=Add New Constraint
+removeConstraint=Remove Constraint
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2010-03-26 18:08:06 UTC (rev 32248)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2010-03-26 18:45:21 UTC (rev 32249)
@@ -919,4 +919,5 @@
WorkingSetRenamedSuccessfully=WorkingSet renombrado correctamente.
ErrorLoadingRules=Error al cargar las reglas.
ConstraintsSection=Secci\u00F3n de Restricciones
-AddNewConstrain=Agregar nueva Restricci\u00F3n
\ No newline at end of file
+AddNewConstraint=Agregar nueva Restricci\u00F3n
+removeConstraint=Borrar Restricci\u00F3n
\ No newline at end of file
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-03-26 18:08:06 UTC (rev 32248)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-03-26 18:45:21 UTC (rev 32249)
@@ -54,6 +54,7 @@
private ListBox fieldsCombo = new ListBox(false);
private ListBox constraintsCombo = new ListBox(false);
private VerticalPanel vpConstraintConf = new VerticalPanel();
+ private Map<String, Constraint> contraintsMap = new HashMap<String, Constraint>();
public WorkingSetEditor(RuleAsset asset) {
if (!AssetFormats.WORKING_SET.equals(asset.metaData.format)) {
@@ -119,15 +120,24 @@
}
});
- Image addNewConstraint = new ImageButton("images/new_item.gif");
- addNewConstraint.setTitle(constants.AddNewConstrain());
+ Image addNewConstraint = new ImageButton("images/new_item.gif"); // NON-NLS
+ addNewConstraint.setTitle(constants.AddNewConstraint());
- addNewConstraint.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- showNewConstrainPop();
- }
- });
+ addNewConstraint.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ showNewConstrainPop();
+ }
+ });
+ Image removeConstraint = new Image( "images/trash.gif" ); //NON-NLS
+ removeConstraint.setTitle(constants.removeConstraint());
+ removeConstraint.addClickListener(new ClickListener() {
+ public void onClick(Widget arg0) {
+ removeConstraint();
+ }
+ });
+
+
final FlexTable table = new FlexTable();
VerticalPanel vp = new VerticalPanel();
@@ -144,7 +154,11 @@
HorizontalPanel hp = new HorizontalPanel();
vp.add(new Label(constants.ConstraintsSection()));
hp.add(constraintsCombo);
- hp.add(addNewConstraint);
+
+ VerticalPanel btnPanel = new VerticalPanel();
+ btnPanel.add(addNewConstraint);
+ btnPanel.add(removeConstraint);
+ hp.add(btnPanel);
vp.add(hp);
table.setWidget(2, 0, vp);
table.getFlexCellFormatter().setRowSpan(2, 0, 3);
@@ -167,6 +181,14 @@
return table;
}
+ protected void removeConstraint() {
+ if (constraintsCombo.getSelectedIndex() != -1) {
+ Constraint c = contraintsMap.get(constraintsCombo.getValue(constraintsCombo.getSelectedIndex()));
+ getConstraintsConstrainer().removeConstraint(c);
+ }
+ fillFieldConstrains();
+ }
+
private void showConstraintConfig() {
if (constraintsCombo.getItemCount() == 0) {
vpConstraintConf.remove(vpConstraintConf.getWidgetCount() - 1);
@@ -182,13 +204,13 @@
}
private void showNewConstrainPop() {
- final FormStylePopup pop = new FormStylePopup("images/config.png", constants.AddNewConstrain()); //NON-NLS
+ final FormStylePopup pop = new FormStylePopup("images/config.png", constants.AddNewConstraint()); //NON-NLS
final Button addbutton = new Button(constants.OK());
final ListBox consDefsCombo = new ListBox(false);
consDefsCombo.setVisibleItemCount(5);
- addbutton.setTitle(constants.AddNewConstrain());
+ addbutton.setTitle(constants.AddNewConstraint());
consDefsCombo.addItem("NotNull");
consDefsCombo.addItem("Range");
@@ -263,7 +285,6 @@
fillFieldConstrains();
}
- private Map<String, Constraint> contraintsMap = new HashMap<String, Constraint>();
private void fillFieldConstrains() {
if (fieldsCombo.getSelectedIndex() != -1) {
String fieldName = fieldsCombo.getItemText(fieldsCombo.getSelectedIndex());
More information about the jboss-svn-commits
mailing list