[jboss-svn-commits] JBL Code SVN: r18454 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client: explorer and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 11 03:17:48 EST 2008
Author: michael.neale at jboss.com
Date: 2008-02-11 03:17:48 -0500 (Mon, 11 Feb 2008)
New Revision: 18454
Removed:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerNodeConfig.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java
Log:
JBRULES-1445 Version browser
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java 2008-02-11 02:29:14 UTC (rev 18453)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java 2008-02-11 08:17:48 UTC (rev 18454)
@@ -49,6 +49,10 @@
}
+ public FormStylePopup() {
+ form = new FormStyleLayout();
+ }
+
public FormStylePopup(String image, final String title, Integer width, Integer height, Boolean shadow) {
this(image, title);
this.shadow = shadow;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerNodeConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerNodeConfig.java 2008-02-11 02:29:14 UTC (rev 18453)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/ExplorerNodeConfig.java 2008-02-11 08:17:48 UTC (rev 18454)
@@ -212,6 +212,7 @@
}
public static TreeNode getQAStructure(final ExplorerViewCenterPanel centerPanel) {
+
final TreeNode treeNode = new TreeNode( new TreeNodeConfig() {
{
setText("QA");
@@ -234,6 +235,7 @@
scenarios.addTreeNodeListener(new TreeNodeListenerAdapter() {
public void onExpand(Node node) {
+
RepositoryServiceFactory.getService().listPackages(new GenericCallback() {
public void onSuccess(Object data) {
PackageConfigData[] conf = (PackageConfigData[]) data;
@@ -283,12 +285,12 @@
}
});
- analysis.appendChild(new TreeNode("Please wait..."));
analysis.addTreeNodeListener(new TreeNodeListenerAdapter() {
public void onExpand(Node node) {
+
RepositoryServiceFactory.getService().listPackages(new GenericCallback() {
public void onSuccess(Object data) {
PackageConfigData[] conf = (PackageConfigData[]) data;
@@ -327,6 +329,9 @@
});
+ analysis.appendChild(new TreeNode("Please wait..."));
+
+
treeNode.appendChild(analysis);
return treeNode;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2008-02-11 02:29:14 UTC (rev 18453)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2008-02-11 08:17:48 UTC (rev 18454)
@@ -16,10 +16,16 @@
* limitations under the License.
*/
+import java.util.Arrays;
+import java.util.Comparator;
+
+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.common.LoadingPopup;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.brms.client.rpc.RuleAsset;
import org.drools.brms.client.rpc.TableDataResult;
import org.drools.brms.client.rpc.TableDataRow;
import org.drools.brms.client.table.DataModel;
@@ -35,6 +41,7 @@
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.Widget;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
@@ -99,7 +106,7 @@
protected void clickLoadHistory() {
showBusyIcon();
- DeferredCommand.add( new Command() {
+ DeferredCommand.addCommand( new Command() {
public void execute() {
loadHistoryData();
}
@@ -121,54 +128,51 @@
public void onSuccess(Object data) {
if ( data == null ) {
- layout.setWidget( 1,
- 0,
- new Label( "No history." ) );
+ layout.setWidget( 1, 0, new Label( "No history." ) );
showStaticIcon();
return;
}
TableDataResult table = (TableDataResult) data;
- final TableDataRow[] rows = table.data;
+ TableDataRow[] rows = table.data;
+ Arrays.sort(rows, new Comparator() {
+ public int compare(
+ Object o1,
+ Object o2) {
+ TableDataRow r1 = (TableDataRow) o1;
+ TableDataRow r2 = (TableDataRow) o2;
+ return r2.values[0].compareTo(r1.values[0]);
+ }
- String[] header = new String[]{"Version number", "Comment", "Date Modified", "Status"};
+ });
- DataModel mdl = getTableDataModel( rows );
+ //String[] header = new String[]{"Version number", "Comment", "Date Modified", "Status"};
- final SortableTable tableWidget = SortableTable.createTableWidget( mdl,
- header,
- 0,
- false);
+ final ListBox history = new ListBox(true);
- tableWidget.setWidth( "100%" );
+ for (int i = 0; i < rows.length; i++) {
+ TableDataRow row = rows[i];
+ String s = row.values[0] + " modified on: " + row.values[2] + " (" + row.values[1] + ")" ;
+ history.addItem(s, row.id);
+ }
- layout.setWidget( 1,
- 0,
- tableWidget );
+
+ layout.setWidget( 1, 0, history );
FlexCellFormatter formatter = layout.getFlexCellFormatter();
- formatter.setColSpan( 1,
- 0,
- 2 );
+ formatter.setColSpan( 1,0,2 );
- Button open = new Button( "View selected version" );
+ Button open = new Button( "View" );
open.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- if ( tableWidget.getSelectedRow() == 0 ) return;
- showVersion( tableWidget.getSelectedKey() );
+ showVersion(history.getValue(history.getSelectedIndex()));
}
} );
- layout.setWidget( 2,
- 1,
- open );
- formatter.setColSpan( 2,
- 1,
- 3 );
- formatter.setHorizontalAlignment( 2,
- 1,
- HasHorizontalAlignment.ALIGN_CENTER );
+ layout.setWidget( 2, 1, open );
+ formatter.setColSpan( 2, 1, 3 );
+ formatter.setHorizontalAlignment( 2,1,HasHorizontalAlignment.ALIGN_CENTER );
showStaticIcon();
@@ -180,21 +184,81 @@
/**
* This should popup a view of the chosen historical version.
- * @param selectedUUID
*/
- private void showVersion(String selectedUUID) {
+ private void showVersion(final String versionUUID) {
+// VersionViewer viewer = new VersionViewer( this.metaData, versionUUID, uuid, refreshCommand );
- VersionViewer viewer = new VersionViewer( this.metaData,
- selectedUUID,
- uuid,
- refreshCommand );
- viewer.setPopupPosition( 100,
- 100 );
+ LoadingPopup.showMessage( "Loading version" );
- viewer.show();
+ RepositoryServiceFactory.getService().loadRuleAsset( versionUUID, new GenericCallback() {
+ public void onSuccess(Object data) {
+
+ RuleAsset asset = (RuleAsset) data;
+ asset.isreadonly = true;
+ asset.metaData.name = metaData.name;
+
+ final FormStylePopup pop = new FormStylePopup("images/snapshot.png", "Version number [" + asset.metaData.versionNumber + "] of [" + asset.metaData.name + "]",
+ new Integer(800), new Integer(500), new Boolean(false));
+
+ Button restore = new Button("Restore this version");
+ restore.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ restore(w, versionUUID, new Command() {
+ public void execute() {
+ refreshCommand.execute();
+ pop.hide();
+ }
+ });
+ }
+ });
+
+ RuleViewer viewer = new RuleViewer(asset, true);
+ viewer.setWidth( "100%" );
+
+
+ pop.addRow(restore);
+ pop.addRow(viewer);
+ pop.show();
+ }
+ });
}
+ private void restore(Widget w, final String versionUUID, final Command refresh) {
+
+ final CheckinPopup pop = new CheckinPopup(w.getAbsoluteLeft() + 10,
+ w.getAbsoluteTop() + 10,
+ "Restore this version?");
+ pop.setCommand( new Command() {
+ public void execute() {
+ RepositoryServiceFactory.getService().restoreVersion( versionUUID, uuid, pop.getCheckinComment(), new GenericCallback() {
+ public void onSuccess(Object data) {
+ refresh.execute();
+ }
+ });
+ }
+ });
+ pop.show();
+ }
+
+
+ private void restore(Widget w, final Command refresh, final String versionUUID, final String headUUID) {
+
+ final CheckinPopup pop = new CheckinPopup(w.getAbsoluteLeft() + 10,
+ w.getAbsoluteTop() + 10,
+ "Restore this version?");
+ pop.setCommand( new Command() {
+ public void execute() {
+ RepositoryServiceFactory.getService().restoreVersion( versionUUID, headUUID, pop.getCheckinComment(), new GenericCallback() {
+ public void onSuccess(Object data) {
+ refresh.execute();
+ }
+ });
+ }
+ });
+ pop.show();
+ }
+
private void showStaticIcon() {
refresh.setUrl( "images/refresh.gif" );
}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java 2008-02-11 02:29:14 UTC (rev 18453)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java 2008-02-11 08:17:48 UTC (rev 18454)
@@ -1,124 +0,0 @@
-package org.drools.brms.client.ruleeditor;
-/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
-
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.DialogBox;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-
-/**
- * This shows a historical read only view of an asset, as a popup.
- * Why a popup? well, people can drag it around how they want.
- *
- * @author Michael Neale
- */
-public class VersionViewer extends DialogBox {
-
- private String versionUUID;
- private String headUUID;
- private Command refresh;
-
- public VersionViewer(final MetaData head, String versionUUID, String headUUID, Command refresh) {
- super(false);
-
- this.versionUUID = versionUUID;
- this.headUUID = headUUID;
- this.refresh = refresh;
-
- setStyleName( "version-Popup" );
-
- LoadingPopup.showMessage( "Loading version" );
-
- RepositoryServiceFactory.getService().loadRuleAsset( versionUUID, new GenericCallback() {
-
- public void onSuccess(Object data) {
-
- RuleAsset asset = (RuleAsset) data;
- asset.isreadonly = true;
- asset.metaData.name = head.name;
- setText( "Version number [" + asset.metaData.versionNumber + "] of ["
- + asset.metaData.name + "]");
-
- FlexTable layout = new FlexTable();
- FlexCellFormatter formatter = layout.getFlexCellFormatter();
-
- Button restore = new Button("Restore this version");
- restore.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- restore(w);
- }
-
- });
- layout.setWidget( 0, 0, restore );
- formatter.setHorizontalAlignment( 0, 0, HasHorizontalAlignment.ALIGN_LEFT );
-
- Button close = new Button("Close");
- close.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- hide();
- }
- });
-
- layout.setWidget( 0, 1, close );
-
- formatter.setHorizontalAlignment( 0, 1, HasHorizontalAlignment.ALIGN_RIGHT );
-
- RuleViewer viewer = new RuleViewer(asset, true);
-
- viewer.setWidth( "100%" );
- layout.setWidget( 1, 0, viewer );
- formatter.setColSpan( 1, 1, 2 );
- layout.setWidth( "100%" );
- layout.setPixelSize( 800, 300 );
- setWidget(layout);
- }
- });
- }
-
- private void restore(Widget w) {
-
- final CheckinPopup pop = new CheckinPopup(w.getAbsoluteLeft() + 10,
- w.getAbsoluteTop() + 10,
- "Restore this version?");
- pop.setCommand( new Command() {
- public void execute() {
- RepositoryServiceFactory.getService().restoreVersion( versionUUID, headUUID, pop.getCheckinComment(), new GenericCallback() {
- public void onSuccess(Object data) {
- hide();
- refresh.execute();
- }
- });
- }
- });
- pop.show();
- }
-
-
-
-}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list