[jboss-svn-commits] JBL Code SVN: r9444 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client: packages and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 12 02:40:13 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-12 02:40:13 -0500 (Mon, 12 Feb 2007)
New Revision: 9444
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageManagerView.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java
Log:
JBRULES-654
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2007-02-12 03:37:48 UTC (rev 9443)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2007-02-12 07:40:13 UTC (rev 9444)
@@ -69,12 +69,10 @@
/** This will setup the explorer tab */
private FlexTable doExplore() {
FlexTable table = new FlexTable();
- final RulesFeature parent = this;
//and the the delegate to open an editor for a rule resource when
//chosen to
list = new AssetItemListViewer(new EditItemEvent() {
- public void open(String key,
- String name) {
+ public void open(String key) {
showLoadEditor( key );
}
@@ -110,14 +108,19 @@
Image newRule = new Image("images/new_rule.gif");
newRule.setTitle( "Create new rule" );
- final RulesFeature feature = this;
+
newRule.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- int left = 70;//w.getAbsoluteLeft() - 10;
- int top = 100; //w.getAbsoluteTop() - 10;
+ int left = 70;
+ int top = 100;
- NewRuleWizard pop = new NewRuleWizard(feature);
+ NewRuleWizard pop = new NewRuleWizard(new EditItemEvent() {
+ public void open(String key) {
+ showLoadEditor( key );
+
+ }
+ });
pop.setPopupPosition( left, top );
pop.show();
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-12 03:37:48 UTC (rev 9443)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-12 07:40:13 UTC (rev 9444)
@@ -7,6 +7,7 @@
import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.client.ruleeditor.NewRuleWizard;
import org.drools.brms.client.rulelist.AssetItemListViewer;
import org.drools.brms.client.rulelist.EditItemEvent;
import org.drools.brms.client.table.SortableTable;
@@ -20,6 +21,7 @@
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
+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.TextArea;
@@ -42,10 +44,12 @@
private final TreeListener treeListener;
private String currentPackage;
private AssetItemListViewer listView;
+ private EditItemEvent editEvent;
public PackageExplorerWidget(EditItemEvent edit) {
+ this.editEvent = edit;
exTree = new Tree();
layout = new FlexTable();
@@ -68,24 +72,17 @@
refreshTreeView( );
- Image newPackage = new Image("images/new_package.gif");
- newPackage.setTitle( "Create a new package" );
- newPackage.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- showNewPackage(w);
- }
- });
-
+
layout.setWidget( 0, 1, new HTML("<i>Please choose a package to edit, explore, or create a new package.</i>") );
//layout.getFlexCellFormatter().setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
- layout.setWidget( 1, 0, newPackage );
+ layout.setWidget( 1, 0, getNewWizardButtons() );
layout.getFlexCellFormatter().setWidth( 0, 0, "20%" );
layout.getCellFormatter().setStyleName( 1, 0, "new-asset-Icons" );
layout.getCellFormatter().setAlignment( 1, 0, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
- listView = new AssetItemListViewer(edit);
+ listView = new AssetItemListViewer(this.editEvent);
initWidget( layout );
}
@@ -93,6 +90,46 @@
+ /** Return all the new wizard buttons. */
+ private HorizontalPanel getNewWizardButtons() {
+ HorizontalPanel newWizards = new HorizontalPanel();
+
+ Image newPackage = new Image("images/new_package.gif");
+ newPackage.setTitle( "Create a new package" );
+ newPackage.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ showNewPackage(w);
+ }
+ });
+
+ Image newRule = new Image("images/new_rule.gif");
+ newRule.setTitle( "Create new rule" );
+
+ newRule.addClickListener( new ClickListener() {
+
+ public void onClick(Widget w) {
+ int left = 70;
+ int top = 100;
+
+ NewRuleWizard pop = new NewRuleWizard(new EditItemEvent() {
+ public void open(String key) {
+ editEvent.open( key );
+ }
+ });
+ pop.setPopupPosition( left, top );
+
+ pop.show();
+ }
+
+ });
+
+ newWizards.add( newRule );
+ newWizards.add( newPackage );
+ return newWizards;
+
+ }
+
+
private void refreshTreeView() {
layout.setWidget( 0, 0, new Label("Please wait...") );
@@ -152,7 +189,35 @@
pop.setPopupPosition( w.getAbsoluteLeft(), w.getAbsoluteTop() - 100 );
pop.show();
}
+
+ private void showNewFunction(Widget w) {
+ final FormStylePopup pop = new FormStylePopup("images/new_wiz.gif", "Create a new package");
+ final TextBox nameBox = new TextBox();
+ nameBox.setTitle( "The name of the package. Avoid spaces, use underscore instead." );
+
+ pop.addAttribute( "Package name", nameBox );
+ final TextArea descBox = new TextArea();
+ pop.addAttribute( "Description", descBox );
+
+ Button create = new Button("Create package");
+ create.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ pop.hide();
+ }
+
+ });
+
+
+ pop.addAttribute( "", create );
+
+ pop.setStyleName( "ks-popups-Popup" );
+
+ pop.setPopupPosition( w.getAbsoluteLeft(), w.getAbsoluteTop() - 100 );
+ pop.show();
+
+ }
+
private void createPackageAction(final String name, final String descr) {
LoadingPopup.showMessage( "Creating package - please wait..." );
RepositoryServiceFactory.getService().createPackage( name, descr, new GenericCallback() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageManagerView.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageManagerView.java 2007-02-12 03:37:48 UTC (rev 9443)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageManagerView.java 2007-02-12 07:40:13 UTC (rev 9444)
@@ -31,8 +31,7 @@
PackageExplorerWidget explorer = new PackageExplorerWidget(new EditItemEvent() {
- public void open(String key,
- String name) {
+ public void open(String key) {
RulesFeature.showLoadEditor( openedViewers, tab, key );
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java 2007-02-12 03:37:48 UTC (rev 9443)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java 2007-02-12 07:40:13 UTC (rev 9444)
@@ -5,17 +5,20 @@
import org.drools.brms.client.categorynav.CategorySelectHandler;
import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.common.ErrorPopup;
+import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.LoadingPopup;
import org.drools.brms.client.common.RulePackageSelector;
import org.drools.brms.client.common.WarningPopup;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.brms.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
@@ -42,13 +45,15 @@
private ListBox formatChooser = getFormatChooser();
private RulePackageSelector packageSelector = new RulePackageSelector();
- private RulesFeature feature;
+ private EditItemEvent afterCreate;
+
+
/** This is used when creating a new rule. */
- public NewRuleWizard(RulesFeature feature) {
+ public NewRuleWizard(EditItemEvent afterCreate) {//, boolean showCats, String format, String title, String assetType) {
super( true );
- this.feature = feature;
- super.setWidth( "60%" );
+ this.afterCreate = afterCreate;
+ super.setWidth( "40%" );
table.setWidth( "100%" );
name.setWidth( "100%" );
@@ -57,7 +62,7 @@
new Image( "images/new_wiz.gif" ) );
table.setWidget( 0,
1,
- new Label( "Create a new rule" ) );
+ new HTML( "<b>Create a new rule</b>" ) );
table.setWidget( 1,
0,
@@ -139,19 +144,10 @@
return;
}
- AsyncCallback cb = new AsyncCallback() {
-
- public void onFailure(Throwable err) {
- ErrorPopup.showMessage( err.getMessage() );
- }
-
+ GenericCallback cb = new GenericCallback() {
public void onSuccess(Object result) {
- if ( result != null ) {
openEditor((String) result);
hide();
- } else {
- ErrorPopup.showMessage( "Unable to create the item. Please contact your system administrator." );
- }
}
};
@@ -174,7 +170,8 @@
* @param uuid
*/
protected void openEditor(String uuid) {
- feature.showLoadEditor( uuid );
+ afterCreate.open( uuid );
+
}
void cancel() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java 2007-02-12 03:37:48 UTC (rev 9443)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java 2007-02-12 07:40:13 UTC (rev 9444)
@@ -99,7 +99,7 @@
openIcon.addClickListener( new ClickListener() {
public void onClick(Widget w) {
LoadingPopup.showMessage( "Loading item, please wait ..." );
- openItemEvent.open( TableDataRow.getId( table.getSelectedKey()), table.getText( table.getSelectedRow(), 1 ) );
+ openItemEvent.open( TableDataRow.getId( table.getSelectedKey()));
}
} );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java 2007-02-12 03:37:48 UTC (rev 9443)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java 2007-02-12 07:40:13 UTC (rev 9444)
@@ -9,8 +9,7 @@
/**
* @param key - the UUID to open.
* @param type - the resource type.
- * @param name - the name to display on the open tab.
*/
- public void open(String key, String name);
+ public void open(String key);
}
More information about the jboss-svn-commits
mailing list