[jboss-svn-commits] JBL Code SVN: r28821 - 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
Tue Aug 4 23:14:15 EDT 2009
Author: michael.neale at jboss.com
Date: 2009-08-04 23:14:14 -0400 (Tue, 04 Aug 2009)
New Revision: 28821
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/NewRepoDialog.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/ruleeditor/ActionToolbar.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
Log:
added a save and close button, a few other usability improvements
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/NewRepoDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/NewRepoDialog.java 2009-08-05 02:38:33 UTC (rev 28820)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/NewRepoDialog.java 2009-08-05 03:14:14 UTC (rev 28821)
@@ -45,7 +45,7 @@
public void onClick(Widget w) {
if (!Window.confirm(constants.AboutToInstallSampleRepositoryAreYouSure())) return;
LoadingPopup.showMessage(constants.ImportingAndProcessing());
- RepositoryServiceFactory.getService().installSampleRepository(new GenericCallback<Object>() {
+ RepositoryServiceFactory.getService().installSampleRepository(new GenericCallback() {
public void onSuccess(Object a) {
Window.alert(constants.RepositoryInstalledSuccessfully());
hide();
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 2009-08-05 02:38:33 UTC (rev 28820)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2009-08-05 03:14:14 UTC (rev 28821)
@@ -1902,4 +1902,6 @@
String EraseAllCommentsWarning();
String Discussion();
+
+ String SaveAndClose();
}
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 2009-08-05 02:38:33 UTC (rev 28820)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2009-08-05 03:14:14 UTC (rev 28821)
@@ -903,4 +903,5 @@
AddADiscussionComment=Add a discussion comment
EraseAllComments=Erase all comments
EraseAllCommentsWarning=Erase ALL discussion items? NOTE that this CAN NOT be undone. Are you sure?
-Discussion=Discussion
\ No newline at end of file
+Discussion=Discussion
+SaveAndClose=Save and close
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2009-08-05 02:38:33 UTC (rev 28820)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2009-08-05 03:14:14 UTC (rev 28821)
@@ -60,17 +60,19 @@
private Constants constants = GWT.create(Constants.class);
private SmallLabel savedOK;
private Widget editor;
+ private Command closeCommand;
public ActionToolbar(final RuleAsset asset,
final CheckinAction checkin,
final CheckinAction archiv,
- final Command delete, boolean readOnly, Widget editor) {
+ final Command delete, boolean readOnly, Widget editor, Command closeCommand) {
this.checkinAction = checkin;
this.archiveAction = archiv;
this.deleteAction = delete;
this.asset = asset;
this.editor = editor;
+ this.closeCommand = closeCommand;
this.state = new ToolbarTextItem(constants.Status() + " ");
@@ -120,12 +122,24 @@
public void onClick(
com.gwtext.client.widgets.Button button,
EventObject e) {
- doCheckinConfirm(button);
+ doCheckinConfirm(button, false);
}
});
toolbar.addButton(save);
+ ToolbarButton saveAndClose = new ToolbarButton();
+ saveAndClose.setText(constants.SaveAndClose());
+ saveAndClose.setTooltip(getTip(constants.CommitAnyChangesForThisAsset()));
+ saveAndClose.addListener(new ButtonListenerAdapter() {
+ public void onClick(
+ com.gwtext.client.widgets.Button button,
+ EventObject e) {
+ doCheckinConfirm(button, true);
+ }
+ });
+ toolbar.addButton(saveAndClose);
+
savedOK = new SmallLabel("<font color='green'>" + constants.SavedOK() + "</font>");
savedOK.setVisible(false);
toolbar.addElement(savedOK.getElement());
@@ -333,13 +347,15 @@
/**
* Called when user wants to checkin.
+ * set closeAfter to true if it should close this whole thing after saving it.
*/
- protected void doCheckinConfirm(Widget w) {
+ protected void doCheckinConfirm(Widget w, final boolean closeAfter) {
final CheckinPopup pop = new CheckinPopup(w.getAbsoluteLeft(), w.getAbsoluteTop(), constants.CheckInChanges());
pop.setCommand( new Command() {
public void execute() {
checkinAction.doCheckin(pop.getCheckinComment());
if (afterCheckinEvent != null) afterCheckinEvent.execute();
+ if (closeAfter) closeCommand.execute();
}
});
pop.show();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2009-08-05 02:38:33 UTC (rev 28820)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2009-08-05 03:14:14 UTC (rev 28821)
@@ -12,6 +12,7 @@
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.Window;
import com.google.gwt.http.client.URL;
import com.gwtext.client.util.Format;
@@ -57,6 +58,7 @@
discussionLayout.setWidth("100%");
discussionPanel.add(discussionLayout);
+
discussionLayout.add(commentList);
newCommentLayout.setWidth("100%");
@@ -87,7 +89,7 @@
}
}
- private void appendComment(DiscussionRecord r) {
+ private Widget appendComment(DiscussionRecord r) {
SmallLabel hrd = new SmallLabel(Format.format(constants.smallCommentBy0On1Small(), r.author, new Date(r.timestamp).toString()));
hrd.addStyleName("discussion-header");
commentList.add(hrd);
@@ -95,6 +97,7 @@
lbl.setStyleName("x-form-field");
commentList.add(lbl);
commentList.add(new HTML("<br/>"));
+ return hrd;
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2009-08-05 02:38:33 UTC (rev 28820)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2009-08-05 03:14:14 UTC (rev 28821)
@@ -144,7 +144,11 @@
doDelete();
}
},
- readOnly, editor );
+ readOnly, editor, new Command() {
+ public void execute() {
+ close();
+ }
+ });
//layout.add(toolbar, DockPanel.NORTH);
layout.add( toolbar );
@@ -213,12 +217,18 @@
return false;
}
+ /** closes itself */
+ private void close() {
+ closeCommand.execute();
+ }
+
+
void doDelete() {
RepositoryServiceFactory.getService().deleteUncheckedRule( this.asset.uuid,
this.asset.metaData.packageName,
new GenericCallback() {
public void onSuccess(Object o) {
- closeCommand.execute();
+ close();
}
} );
}
More information about the jboss-svn-commits
mailing list