[jboss-svn-commits] JBL Code SVN: r18366 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client: categorynav and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 7 02:42:07 EST 2008
Author: michael.neale at jboss.com
Date: 2008-02-07 02:42:06 -0500 (Thu, 07 Feb 2008)
New Revision: 18366
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/BackupManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/StateManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryEditor.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor2.java
Log:
JBRULES-1445 Tidy up of admin features
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -31,14 +31,11 @@
public class ArchivedAssetManager extends Composite {
- HorizontalPanel layout;
private AssetItemGrid grid;
private ListBox packages = new ListBox(true);
public ArchivedAssetManager(final ExplorerViewCenterPanel tab) {
- VerticalPanel layout = new VerticalPanel();
- layout.setWidth("100%");
PrettyFormLayout pf = new PrettyFormLayout();
@@ -47,8 +44,9 @@
pf.addHeader("images/backup_large.png", header);
- layout.add(pf);
+
+
EditItemEvent edit = new EditItemEvent () {
public void open(String key) {
tab.openAsset(key);
@@ -64,8 +62,6 @@
loadPackages();
Toolbar tb = new Toolbar(Ext.generateId());
- tb.addItem(new ToolbarTextItem("Archived packages:"));
- tb.addItem(new ToolbarSeparator());
tb.addButton(new ToolbarButton(new ButtonConfig() {
{
setButtonListener(new ButtonListenerAdapter() {
@@ -106,13 +102,15 @@
}));
+ pf.startSection("Archived packages");
- layout.add(tb);
- layout.add(packages);
+ pf.addRow(tb);
+ pf.addRow(packages);
+
+ pf.endSection();
+
tb = new Toolbar(Ext.generateId());
- tb.addItem(new ToolbarTextItem("Archived assets:"));
- tb.addItem(new ToolbarSeparator());
tb.addButton(new ToolbarButton(new ButtonConfig() {
{
setText("Restore selected asset");
@@ -160,13 +158,15 @@
});
}
}));
- layout.add(tb);
+ pf.startSection("Archived assets");
+ pf.addRow(tb);
- layout.add(grid);
+ pf.addRow(grid);
+ pf.endSection();
- initWidget( layout );
+ initWidget( pf );
}
@@ -207,6 +207,9 @@
for (int i = 0; i < configs.length; i++) {
packages.addItem(configs[i].name, configs[i].uuid);
}
+ if (configs.length == 0) {
+ packages.addItem("-- no archived packages --");
+ }
}
});
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/BackupManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/BackupManager.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/BackupManager.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -18,10 +18,10 @@
import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStyleLayout;
import org.drools.brms.client.common.HTMLFileManagerFields;
import org.drools.brms.client.common.ImageButton;
import org.drools.brms.client.common.LoadingPopup;
+import org.drools.brms.client.common.PrettyFormLayout;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
@@ -48,20 +48,21 @@
public BackupManager() {
- FormStyleLayout widtab = new FormStyleLayout( "images/backup_large.png",
- "Import/Export" );
+
+ PrettyFormLayout widtab = new PrettyFormLayout( );
+ widtab.addHeader("images/backup_large.png", new HTML("<b>Import/Export</b>"));
+
+ widtab.startSection("Import from an xml file");
widtab.addAttribute( "",
- new HTML( "<i>Import and Export rules repository</i>" ) );
- widtab.addRow( new HTML( "<hr/>" ) );
- widtab.addAttribute( "Import from an xml file",
newImportWidget() );
- widtab.addAttribute( "Export to a zip file",
+ widtab.endSection();
+
+ widtab.startSection("Export to a zip file");
+ widtab.addAttribute( "",
newExportWidget() );
- widtab.addRow( new HTML( "<hr/>" ) );
-// widtab.addAttribute( "Delete rules repository",
-// cleanRepository() );
+ widtab.endSection();
initWidget( widtab );
}
@@ -161,13 +162,15 @@
private void exportRepository() {
- LoadingPopup.showMessage( "Exporting repository, please wait, as this could take some time..." );
+ if (Window.confirm("Export the repository? This may take some time.")) {
+ LoadingPopup.showMessage( "Exporting repository, please wait, as this could take some time..." );
- Window.open( GWT.getModuleBaseURL() + "backup?" + HTMLFileManagerFields.FORM_FIELD_REPOSITORY + "=true",
- "downloading",
- "resizable=no,scrollbars=yes,status=no" );
+ Window.open( GWT.getModuleBaseURL() + "backup?" + HTMLFileManagerFields.FORM_FIELD_REPOSITORY + "=true",
+ "downloading",
+ "resizable=no,scrollbars=yes,status=no" );
- LoadingPopup.close();
+ LoadingPopup.close();
+ }
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -1,13 +1,13 @@
package org.drools.brms.client.admin;
/*
* Copyright 2005 JBoss Inc
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,9 +20,9 @@
import org.drools.brms.client.categorynav.CategoryEditor;
import org.drools.brms.client.categorynav.CategoryExplorerWidget;
import org.drools.brms.client.categorynav.CategorySelectHandler;
-import org.drools.brms.client.common.FormStyleLayout;
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.ImageButton;
+import org.drools.brms.client.common.PrettyFormLayout;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Window;
@@ -43,25 +43,23 @@
public VerticalPanel layout = new VerticalPanel();
//public String selectedPath;
private CategoryExplorerWidget explorer;
-
+
public CategoryManager() {
-
- FormStyleLayout form = new FormStyleLayout("images/edit_category.gif", "Edit categories");
- form.addAttribute( "", new HTML("<i>Categories aid in managing large numbers of rules/assets. A shallow hierarchy is recommented.</i>") );
+ PrettyFormLayout form = new PrettyFormLayout();
+ form.addHeader("images/edit_category.gif", new HTML("<b>Edit categories</b>"));
+ form.startSection("Categories aid in managing large numbers of rules/assets. A shallow hierarchy is recommented.");
+
explorer = new CategoryExplorerWidget(new CategorySelectHandler() {
public void selected(String sel) {
//don't need this here as we don't do anything on select in this spot
}
});
- explorer.setStyleName( "category-explorer-Admin" );
-
SimplePanel editable = new SimplePanel();
- editable.setStyleName( "metadata-Widget" );
editable.add( explorer );
- form.addRow( new HTML("<hr/>") );
+
form.addAttribute( "Current categories:", editable );
-
+
Image refresh = new ImageButton( "images/refresh.gif" );
refresh.setTitle( "Refresh categories" );
refresh.addClickListener( new ClickListener() {
@@ -70,21 +68,19 @@
}
} );
form.addAttribute( "Refresh view:", refresh );
- form.addRow( new HTML("<hr/>") );
-
+
Image newCat = new ImageButton( "images/new.gif" );
newCat.setTitle( "Create a new category" );
newCat.addClickListener( new ClickListener() {
public void onClick(Widget w) {
CategoryEditor newCat = new CategoryEditor( explorer.getSelectedPath() );
- newCat.setPopupPosition( w.getAbsoluteLeft(),
- w.getAbsoluteTop() - 400 );
+
newCat.show();
}
} );
-
+
form.addAttribute( "Create a new category:", newCat );
-
+
Image delete = new ImageButton("images/delete_obj.gif");
delete.addClickListener( new ClickListener() {
public void onClick(Widget w) {
@@ -92,13 +88,15 @@
}
} );
delete.setTitle( "Deletes the currently selected category. You won't be able to delete if the category is in use." );
-
+
form.addAttribute( "Delete the currently selected category:", delete );
-
+
+ form.endSection();
+
initWidget( form );
}
-
-
+
+
private void deleteSelected() {
if (Window.confirm( "Are you sure you want to delete category: " + explorer.getSelectedPath() )) {
RepositoryServiceFactory.getService().removeCategory( explorer.getSelectedPath(), new GenericCallback() {
@@ -106,11 +104,11 @@
public void onSuccess(Object data) {
explorer.refresh();
}
-
+
});
- }
+ }
}
-
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/StateManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/StateManager.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/StateManager.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -1,13 +1,13 @@
package org.drools.brms.client.admin;
/*
* Copyright 2005 JBoss Inc
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,9 @@
-import org.drools.brms.client.common.FormStyleLayout;
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.LoadingPopup;
+import org.drools.brms.client.common.PrettyFormLayout;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.ui.Button;
@@ -37,18 +37,21 @@
public StateManager() {
- FormStyleLayout form = new FormStyleLayout("images/status_large.png", "Manage statuses");
- form.addAttribute( "", new HTML("<i>Status tags are for the lifecycle of an asset.</i>") );
-
+ PrettyFormLayout form = new PrettyFormLayout();
+ form.addHeader("images/status_large.png", new HTML("<b>Manage statuses</b>"));
+ form.startSection("Status tags are for the lifecycle of an asset.");
+
+
currentStatuses = new ListBox();
currentStatuses.setVisibleItemCount( 7 );
currentStatuses.setWidth( "50%" );
-
+
refreshList( );
-
+
form.addAttribute( "Current statuses:", currentStatuses );
-
+
form.addAttribute( "Add new status:", newStatusEditor() );
+ form.endSection();
initWidget( form );
}
@@ -58,9 +61,9 @@
public void onSuccess(Object data) {
currentStatuses.clear();
String[] statii = (String[]) data;
- for ( int i = 0; i < statii.length; i++ ) {
+ for ( int i = 0; i < statii.length; i++ ) {
currentStatuses.addItem( statii[i] );
- }
+ }
LoadingPopup.close();
}
});
@@ -69,31 +72,31 @@
private Widget newStatusEditor() {
HorizontalPanel horiz = new HorizontalPanel();
final TextBox box = new TextBox();
-
+
Button create = new Button("Create");
create.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- createStatus(box);
+ createStatus(box);
}
});
-
+
horiz.add( box );
horiz.add( create );
return horiz;
}
-
+
private void createStatus(final TextBox box) {
LoadingPopup.showMessage( "Creating status" );
- RepositoryServiceFactory.getService().createState( box.getText(), new GenericCallback() {
+ RepositoryServiceFactory.getService().createState( box.getText(), new GenericCallback() {
public void onSuccess(Object data) {
box.setText( "" );
refreshList();
LoadingPopup.close();
}
});
-
+
}
-
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryEditor.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryEditor.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -18,6 +18,7 @@
import org.drools.brms.client.common.ErrorPopup;
+import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.ImageButton;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
@@ -36,30 +37,20 @@
* This provides a popup for editing a category (name etc).
* Mainly this is for creating a new category.
*/
-public class CategoryEditor extends PopupPanel {
+public class CategoryEditor extends FormStylePopup {
private String path;
- private FlexTable table = new FlexTable(); //Using this table for the form layout
private TextBox name = new TextBox();
private TextArea description = new TextArea();
/** This is used when creating a new category */
public CategoryEditor(String catPath) {
- super(true);
+ super("images/edit_category.gif", getTitle(catPath));
path = catPath;
- table.setWidget( 0, 0, new ImageButton("images/edit_category.gif") );
+ addAttribute("Category name", name);
- table.setWidget( 0, 1, new Label(getTitle( path )));
-
- table.setWidget( 1, 0, new Label("Category name") );
- table.setWidget( 1, 1, name );
-
- description.setVisibleLines( 4 );
- table.setWidget( 2, 0, new Label("Description") );
- table.setWidget( 2, 1, description );
-
Button ok = new Button("OK");
ok.addClickListener( new ClickListener() {
public void onClick(Widget arg0) {
@@ -67,24 +58,10 @@
}
});
-
- table.setWidget( 3, 0, ok );
-
- Button cancel = new Button("Cancel");
- cancel.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- cancel();
- }
-
- });
-
- table.setWidget( 3, 1, cancel );
-
- add( table );
- setStyleName( "ks-popups-Popup" );
+ addAttribute("", ok);
}
- private String getTitle(String catPath) {
+ private static String getTitle(String catPath) {
if (catPath == null) {
return "Create a new top level category.";
} else {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -225,7 +225,7 @@
case 4:
if (!centertabbedPanel.showIfOpen("errorLog"))
- centertabbedPanel.addTab("Backup Manager", true, new LogViewer(), "errorLog");
+ centertabbedPanel.addTab("Error Log", true, new LogViewer(), "errorLog");
break;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor2.java 2008-02-07 06:19:58 UTC (rev 18365)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor2.java 2008-02-07 07:42:06 UTC (rev 18366)
@@ -47,7 +47,7 @@
/**
* This is the package editor and viewer for package configuration.
- * This is ALL NEW AND IMPROVED !
+ * This is ALL NEW AND IMPROVED ! This one is actually used.
*
* @author Michael Neale
*/
@@ -76,20 +76,25 @@
private void refreshWidgets() {
clear();
- startSection("Package name: [" + conf.name + "]");
+
+
+
+
FlexTable headerWidgets = new FlexTable();
headerWidgets.setWidget(0, 0, new HTML("<b>Package name:</b>"));
headerWidgets.setWidget(0, 1, new Label(this.conf.name));
if (!conf.isSnapshot) {
//headerWidgets.setWidget(1, 1, modifyWidgets() );
- addAttribute("Modify:", modifyWidgets());
+ headerWidgets.setWidget(1, 0, modifyWidgets());
+ headerWidgets.getFlexCellFormatter().setColSpan(1, 0, 2);
}
- endSection();
+ addHeader("images/package_large.png", headerWidgets);
+
//addHeader( "images/package_large.png", headerWidgets );
startSection("Configuration");
More information about the jboss-svn-commits
mailing list