Author: norman
Date: Wed Aug 12 18:57:01 2009
New Revision: 803665
URL: http://svn.apache.org/viewvc?rev=803665&view=rev
Log:
Ask for confirm when deleting messages from the Trash folder ( real deletion)
Added:
labs/hupa/src/main/java/org/apache/hupa/client/HupaMessages.java
labs/hupa/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java
- copied, changed from r803506,
labs/hupa/src/main/java/org/apache/hupa/client/widgets/QuestionDialogBox.java
Removed:
labs/hupa/src/main/java/org/apache/hupa/client/widgets/QuestionDialogBox.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
labs/hupa/src/main/java/org/apache/hupa/client/widgets/HasDialog.java
Added: labs/hupa/src/main/java/org/apache/hupa/client/HupaMessages.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/HupaMessages.java?rev=803665&view=auto
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/HupaMessages.java (added)
+++ labs/hupa/src/main/java/org/apache/hupa/client/HupaMessages.java Wed Aug 12
18:57:01 2009
@@ -0,0 +1,28 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you 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. *
+ ****************************************************************/
+
+package org.apache.hupa.client;
+
+import com.google.gwt.i18n.client.Messages;
+
+public interface HupaMessages extends Messages{
+
+ @DefaultMessage("Are you sure you want to delete the selected
messages?")
+ public String confirmDeleteMessages();
+}
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java?rev=803665&r1=803664&r2=803665&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
Wed Aug 12 18:57:01 2009
@@ -30,6 +30,7 @@
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
import org.apache.hupa.client.MyAsyncCallback;
+import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
import org.apache.hupa.shared.data.User;
@@ -44,6 +45,8 @@
import org.apache.hupa.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.gen2.table.event.client.HasPageLoadHandlers;
import com.google.gwt.gen2.table.event.client.HasRowSelectionHandlers;
@@ -67,6 +70,8 @@
public void reloadData(User user, IMAPFolder folder,String
searchValue);
public void removeMessages(ArrayList<Long> uids);
public void reset();
+ public HasDialog getConfirmDialog();
+ public HasClickHandlers getConfirmDialogClick();
}
private User user;
@@ -151,16 +156,23 @@
display.getDeleteClick().addClickHandler(new
com.google.gwt.event.dom.client.ClickHandler() {
public void
onClick(com.google.gwt.event.dom.client.ClickEvent event) {
- dispatcher.execute(new
DeleteMessage(user.getSessionId(),folder,getSelectedMessageUids()), new
MyAsyncCallback<DeleteMessageResult>(eventBus,user) {
+ if
(folder.getFullName().equals(IMAPFolder.DEFAULT_TRASH)) {
+ display.getConfirmDialog().show();
+ } else {
+ deleteMessages();
+ }
+
+ }
+
+ });
+ display.getConfirmDialogClick().addClickHandler(new
ClickHandler() {
- public void
onSuccess(DeleteMessageResult result) {
-
display.removeMessages(result.getMessageUids());
- }
-
- });
+ public void onClick(ClickEvent event) {
+ deleteMessages();
}
});
+
display.getNewClick().addClickHandler(new
com.google.gwt.event.dom.client.ClickHandler() {
public void
onClick(com.google.gwt.event.dom.client.ClickEvent event) {
@@ -168,8 +180,18 @@
}
});
+
}
+ private void deleteMessages() {
+ dispatcher.execute(new
DeleteMessage(user.getSessionId(),folder,getSelectedMessageUids()), new
MyAsyncCallback<DeleteMessageResult>(eventBus,user) {
+
+ public void onSuccess(DeleteMessageResult result) {
+ display.removeMessages(result.getMessageUids());
+ }
+
+ });
+ }
@Override
protected void onPlaceRequest(PlaceRequest request) {
// TODO Auto-generated method stub
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=803665&r1=803664&r2=803665&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
Wed Aug 12 18:57:01 2009
@@ -28,9 +28,12 @@
import net.customware.gwt.presenter.client.EventBus;
import org.apache.hupa.client.HupaConstants;
+import org.apache.hupa.client.HupaMessages;
import org.apache.hupa.client.bundles.HupaImageBundle;
import org.apache.hupa.client.bundles.MyPagingOptionImages;
import org.apache.hupa.client.mvp.IMAPMessageListPresenter.Display;
+import org.apache.hupa.client.widgets.ConfirmDialogBox;
+import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.RefetchPagingScrollTable;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
@@ -90,6 +93,7 @@
public class IMAPMessageListView extends Composite implements Display{
private HupaConstants constants = GWT.create(HupaConstants.class);
+ private HupaMessages messages = GWT.create(HupaMessages.class);
private HupaImageBundle imageBundle = GWT.create(HupaImageBundle.class);
private DispatchAsync dispatcher;
private User user;
@@ -103,7 +107,7 @@
private FixedWidthGrid dataTable = createDataTable();
private Button deleteMailButton = new
Button(constants.deleteMailButton());
private Button newMailButton = new Button(constants.newMailButton());
-
+ private ConfirmDialogBox confirmBox = new ConfirmDialogBox();
private ListBox pageBox = new ListBox();
@@ -215,6 +219,7 @@
hPanel.setHeight("100%");
vPanel.add(hPanel);
vPanel.add(mailTable);
+ confirmBox.setText(messages.confirmDeleteMessages());
initWidget(vPanel);
}
@@ -525,4 +530,12 @@
public IMAPMessage getData(int rowIndex) {
return mailTable.getRowValue(rowIndex);
}
+
+ public HasDialog getConfirmDialog() {
+ return confirmBox;
+ }
+
+ public HasClickHandlers getConfirmDialogClick() {
+ return confirmBox;
+ }
}
Copied:
labs/hupa/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java
(from r803506,
labs/hupa/src/main/java/org/apache/hupa/client/widgets/QuestionDialogBox.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java?p2=labs/hupa/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java&p1=labs/hupa/src/main/java/org/apache/hupa/client/widgets/QuestionDialogBox.java&r1=803506&r2=803665&rev=803665&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/widgets/QuestionDialogBox.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java
Wed Aug 12 18:57:01 2009
@@ -32,7 +32,7 @@
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
-public class QuestionDialogBox extends DialogBox implements
HasClickHandlers,HasDialog{
+public class ConfirmDialogBox extends DialogBox implements
HasClickHandlers,HasDialog{
private HupaConstants constants = GWT.create(HupaConstants.class);
private Label text = new Label();
private ButtonBar bar = new ButtonBar();
@@ -40,13 +40,17 @@
private Button okButton = new Button(constants.okButton());
private Button cancelButton = new Button(constants.cancelButton());
- public QuestionDialogBox() {
+ public ConfirmDialogBox() {
super();
setModal(true);
+ setAnimationEnabled(true);
+ setAutoHideEnabled(false);
+ panel.setSpacing(10);
panel.add(text);
bar.add(okButton);
bar.add(cancelButton);
panel.add(bar);
+ panel.setCellHorizontalAlignment(bar,
VerticalPanel.ALIGN_RIGHT);
cancelButton.addClickHandler(new ClickHandler() {
@@ -55,8 +59,14 @@
}
});
+ okButton.addClickHandler(new ClickHandler() {
+
+ public void onClick(ClickEvent event) {
+ hide();
+ }
+
+ });
add(panel);
-
}
public void setText(String value) {
@@ -67,5 +77,10 @@
return okButton.addClickHandler(handler);
}
+ public void show() {
+ super.show();
+ center();
+
+ }
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/widgets/HasDialog.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/widgets/HasDialog.java?rev=803665&r1=803664&r2=803665&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/widgets/HasDialog.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/widgets/HasDialog.java Wed
Aug 12 18:57:01 2009
@@ -22,5 +22,4 @@
public interface HasDialog {
public void show();
public void hide();
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
