[jboss-svn-commits] JBL Code SVN: r34273 - 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
Wed Jul 28 20:56:33 EDT 2010
Author: baunax
Date: 2010-07-28 20:56:32 -0400 (Wed, 28 Jul 2010)
New Revision: 34273
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.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/modeldriven/ui/RuleTemplateEditor.java
Log:
GUVNOR-547 Template data tab not showing
- replaced tabs by a pop up to load the template data
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.java 2010-07-29 00:55:42 UTC (rev 34272)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.java 2010-07-29 00:56:32 UTC (rev 34273)
@@ -54,6 +54,7 @@
private Boolean shadow;
private Integer width;
+ private Integer height;
private boolean modal = true;
private int popLeft = -1;
private int popTop;
@@ -163,6 +164,10 @@
}
} );
+ if (getHeight() != null) {
+ this.dialog.setHeight(getHeight());
+ }
+
this.dialog.show();
}
@@ -184,4 +189,12 @@
this.width = new Integer( i );
}
+ public Integer getHeight() {
+ return height;
+ }
+
+ public void setHeight(Integer height) {
+ this.height = height;
+ }
+
}
\ No newline at end of file
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-07-29 00:55:42 UTC (rev 34272)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-07-29 00:56:32 UTC (rev 34273)
@@ -2085,4 +2085,6 @@
String CantRemoveThisBlockAsOneOfTheNamesIsBeingUsed();
String FillInColumnWithValue();
+
+ String LoadTemplateData();
}
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-07-29 00:55:42 UTC (rev 34272)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-07-29 00:56:32 UTC (rev 34273)
@@ -1027,4 +1027,5 @@
TemplateEditor=Template Editor
TemplateData=Template Data
ActivateRuleFlowGroup=Activate rule flow group
-FillInColumnWithValue=Please fill in this column with a {0} value.
\ No newline at end of file
+FillInColumnWithValue=Please fill in this column with a {0} value.
+LoadTemplateData=Load Template Data
\ 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-07-29 00:55:42 UTC (rev 34272)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2010-07-29 00:56:32 UTC (rev 34273)
@@ -932,4 +932,4 @@
AllChangesHaveBeenSaved=Todos los cambios han sido guardados
TemplateEditor=Edici\u00F3n del Template
TemplateData=Datos del Template
-
\ No newline at end of file
+LoadTemplateData=Carga Datos del Template
\ No newline at end of file
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-07-29 00:55:42 UTC (rev 34272)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java 2010-07-29 00:56:32 UTC (rev 34273)
@@ -16,20 +16,22 @@
package org.drools.guvnor.client.modeldriven.ui;
-import java.util.HashSet;
-import java.util.Set;
-
import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.ide.common.client.modeldriven.dt.TemplateModel;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.KeyCodes;
-import com.google.gwt.event.logical.shared.BeforeSelectionEvent;
-import com.google.gwt.event.logical.shared.BeforeSelectionHandler;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.TabPanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.data.ArrayReader;
@@ -66,28 +68,30 @@
public RuleTemplateEditor(RuleAsset asset) {
model = (TemplateModel) asset.content;
- final TabPanel tPanel = new TabPanel();
+ final VerticalPanel tPanel = new VerticalPanel();
tPanel.setWidth("100%");
ruleModeller = new RuleModeller(asset, new TemplateModellerWidgetFactory());
- tPanel.add(ruleModeller, constants.TemplateEditor());
- tPanel.add(buildTemplateTable(), constants.TemplateData());
- tPanel.addBeforeSelectionHandler(new BeforeSelectionHandler<Integer>() {
+ tPanel.add(new Button(constants.LoadTemplateData(), new ClickHandler() {
- public void onBeforeSelection(BeforeSelectionEvent<Integer> event) {
- if (event.getItem() == 1) {
- Set<String> keySet = new HashSet<String>(model.getTable().keySet());
- model.putInSync();
- if (!keySet.equals(model.getTable().keySet()) || model.getRowsCount() == 0) {
- tPanel.remove(tPanel.getWidgetCount() - 1);
- tPanel.add(buildTemplateTable(), constants.TemplateData());
+ public void onClick(ClickEvent event) {
+ final FormStylePopup popUp = new FormStylePopup(null, constants.TemplateData(), (int) (Window.getClientWidth() * 0.8), false);
+ popUp.setHeight((int) (Window.getClientHeight() * 0.8));
+ popUp.addAttribute("", buildTemplateTable());
+ Button close = new Button(constants.Close(), new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ popUp.hide();
}
- }
+ });
+ HorizontalPanel pnlClose = new HorizontalPanel();
+ pnlClose.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
+ pnlClose.add(close);
+ popUp.addAttribute("", pnlClose);
+ popUp.show();
}
- });
-
- tPanel.selectTab(0);
+ }));
+ tPanel.add(ruleModeller);
initWidget(tPanel);
}
@@ -188,7 +192,7 @@
model.setValue(field, rowIndex, (String) newValue);
}
});
- grid.setWidth(800);
+ grid.setWidth((int) (Window.getClientWidth() * 0.75));
return grid;
}
More information about the jboss-svn-commits
mailing list