Author: dongxu
Date: Thu Sep 12 03:56:23 2013
New Revision: 1522275
URL: http://svn.apache.org/r1522275
Log:
scrub code
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
Thu Sep 12 03:56:23 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.activity.NotificationActivity;
import org.apache.hupa.client.activity.ToolBarActivity;
import org.apache.hupa.client.activity.TopBarActivity;
@@ -50,9 +51,9 @@ import com.google.gwt.core.client.Schedu
import java.util.logging.Logger;
>>>>>>> remove some warnings and create the AbstractPlace that can give place
>>>>>>> infomation
+=======
+>>>>>>> scrub code
import org.apache.hupa.client.bundles.HupaResources;
-import org.apache.hupa.client.place.DefaultPlace;
-import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.rf.CheckSessionRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.ui.HupaLayoutable;
@@ -61,7 +62,6 @@ import org.apache.hupa.client.ui.LoginLa
>>>>>>> move new theme ui from experiment to hupa evo
import com.google.gwt.dom.client.StyleInjector;
import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceChangeEvent;
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.place.shared.PlaceHistoryHandler;
@@ -105,13 +105,8 @@ public class HupaController {
@Inject private HupaLayoutable hupaLayout;
@Inject private PlaceController placeController;
@Inject private HupaRequestFactory requestFactory;
- private Place currentPlace;
-
@Inject private LoginLayoutable loginLayout;
- private static final Logger log = Logger.getLogger(HupaController.class
- .getName());
-
@Inject
<<<<<<< HEAD
public HupaController(EventBus eventBus) {
@@ -264,60 +259,6 @@ public class HupaController {
private final class PlaceChangHandler implements
PlaceChangeEvent.Handler {
@Override
public void onPlaceChange(PlaceChangeEvent event) {
-// log.fine("place changed to " + event.getNewPlace());
- // if (placeChange(event)) {
- // checkSession();
- // }
- // refreshActivities(event);
- }
-
- private void refreshActivities(PlaceChangeEvent event) {
- Place newPlace = event.getNewPlace();
- if (newPlace != currentPlace) {
- if (isAuth(newPlace, currentPlace)) {
- // appPanelView.setDefaultLayout();
- if
(!(RootLayoutPanel.get().getLayoutData() instanceof HupaLayoutable)) {
- RootLayoutPanel.get().clear();
-
RootLayoutPanel.get().add(hupaLayout.get());
-
- }
- } else if (newPlace instanceof DefaultPlace) {
- // appPanelView.setLoginLayout();
-
- if
(!(RootLayoutPanel.get().getLayoutData() instanceof LoginLayoutable)) {
- RootLayoutPanel.get().clear();
-
RootLayoutPanel.get().add(loginLayout.get());
- }
- }
- currentPlace = newPlace;
- }
- }
-
- //
- // private void checkSession() {
- // CheckSessionRequest checkSession =
requestFactory.sessionRequest();
- // checkSession.isValid().fire(new Receiver<Boolean>() {
- // @Override
- // public void onSuccess(Boolean sessionValid) {
- // if (!sessionValid) {
- // RootLayoutPanel.get().add(loginLayout.get());//
- // HupaController.this.placeController
- // .goTo(new DefaultPlace());
- // // this?
- // }
- // }
- // });
- // }
-
- private boolean placeChange(PlaceChangeEvent event) {
- return currentPlace != null
- && !(currentPlace instanceof
DefaultPlace)
- && event.getNewPlace() != currentPlace;
- }
-
- private boolean isAuth(Place newPlace, Place currentPlace) {
- return (newPlace instanceof MailFolderPlace)
- && !(currentPlace instanceof
MailFolderPlace);
}
}
@@ -332,14 +273,9 @@ public class HupaController {
if (!sessionValid) {
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(loginLayout.get());
-// log.fine("session invalid");
-// HupaController.this.placeController
-// .goTo(new
DefaultPlace());
-
} else {
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(hupaLayout.get());
-
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
Thu Sep 12 03:56:23 2013
@@ -868,8 +868,9 @@ public class IMAPMessageListActivity ext
display.getTable().setVisibleRangeAndClearData(display.getTable().getVisibleRange(),
true);
}
public IMAPMessageListActivity with(MailFolderPlace place) {
- this.user = place.getUser();
+// this.user = place.getUser();
// this.folder = place.getFolder();
+<<<<<<< HEAD
this.searchValue = place.getSearchValue();
<<<<<<< HEAD
<<<<<<< HEAD
@@ -1119,6 +1120,9 @@ public class IMAPMessageListActivity ext
>>>>>>> use CellTable to deal with MessageTableModel, even a few issues
=======
>>>>>>> fix the CellTable display
+=======
+// this.searchValue = place.getSearchValue();
+>>>>>>> scrub code
return this;
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
Thu Sep 12 03:56:23 2013
@@ -76,8 +76,6 @@ import org.apache.hupa.client.place.Mail
import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.HupaLayoutable;
import org.apache.hupa.client.ui.WidgetDisplayable;
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.LoginEvent;
@@ -496,7 +494,6 @@ public class LoginActivity extends Abstr
display.setLoading(false);
doReset();
- // placeController.goTo(new DefaultPlace());
}
});
<<<<<<< HEAD
@@ -506,10 +503,6 @@ public class LoginActivity extends Abstr
>>>>>>> scrub code
}
- private ImapFolder useDefaultInboxFolder(User user) {
- return new
ImapFolderImpl(user.getSettings().getInboxFolderName());
- }
-
/**
* Reset display
*/
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
Thu Sep 12 03:56:23 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.activity;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -167,6 +168,11 @@ public class MessageContentActivity exte
import org.apache.hupa.client.place.IMAPMessagePlace;
>>>>>>> make message content work as expected partly
=======
+=======
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+>>>>>>> scrub code
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
@@ -179,15 +185,20 @@ import com.google.gwt.event.shared.Event
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
+import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class MessageContentActivity extends AppBaseActivity {
+ private static final Logger log = Logger
+ .getLogger(MessageContentActivity.class.getName());
+
+ @Inject private Displayable display;
private String fullName;
private String uid;
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
- if (uid != null && uid.matches("\\d+")) {
+ if (isUidSet()) {
GetMessageDetailsRequest req = requestFactory
.messageDetailsRequest();
GetMessageDetailsAction action = req
@@ -201,13 +212,22 @@ public class MessageContentActivity exte
public void onSuccess(GetMessageDetailsResult
response) {
display.fillMessageContent(response.getMessageDetails()
.getText());
+ }
+ @Override
+ public void onFailure(ServerFailure error) {
+ if (error.isFatal()) {
+ log.log(Level.SEVERE,
error.getMessage());
+ // TODO write the error message
to status bar.
+ // throw new
RuntimeException(error.getMessage());
+ }
}
});
}
container.setWidget(display.asWidget());
}
+<<<<<<< HEAD
@Inject private Displayable display;
<<<<<<< HEAD
@@ -216,6 +236,11 @@ public class MessageContentActivity exte
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
=======
=======
+=======
+ private boolean isUidSet() {
+ return uid != null && uid.matches("\\d+");
+ }
+>>>>>>> scrub code
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
public interface Displayable extends WidgetDisplayable {
@@ -224,7 +249,7 @@ public class MessageContentActivity exte
public MessageContentActivity with(MailFolderPlace place) {
this.fullName = place.getFullName();
- this.uid = place.getMessageId();
+ this.uid = place.getUid();
return this;
}
>>>>>>> make message content work as expected partly
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
Thu Sep 12 03:56:23 2013
@@ -599,7 +599,7 @@ public class WestActivity extends AppBas
public WestActivity with(MailFolderPlace place) {
this.currentPlace = place;
- this.user = place.getUser();
+// this.user = place.getUser();
this.folder = new
ImapFolderImpl(user.getSettings().getInboxFolderName());
return this;
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java
Thu Sep 12 03:56:23 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.mapper;
import org.apache.hupa.client.activity.MessageContentActivity;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.MessagePlace;
import com.google.gwt.activity.shared.Activity;
@@ -30,6 +31,8 @@ import com.google.gwt.core.client.RunAsy
=======
=======
import org.apache.hupa.client.place.DefaultPlace;
+=======
+>>>>>>> scrub code
import org.apache.hupa.client.place.MailFolderPlace;
<<<<<<< HEAD
>>>>>>> prepare for message content panel
@@ -85,6 +88,7 @@ public class MessageContentActivityMappe
public Activity getActivity(Place place) {
<<<<<<< HEAD
+<<<<<<< HEAD
if(place instanceof DefaultPlace)return null;
else if (place instanceof MailFolderPlace) return null;
else if (place instanceof IMAPMessagePlace) return
messageContentActivityProvider.get();
@@ -94,6 +98,9 @@ public class MessageContentActivityMappe
if (place instanceof DefaultPlace)
return null;
else if (place instanceof MailFolderPlace) {
+=======
+ if (place instanceof MailFolderPlace) {
+>>>>>>> scrub code
return messageContentActivityProvider.get().with(
(MailFolderPlace) place);
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
Thu Sep 12 03:56:23 2013
@@ -19,49 +19,53 @@
package org.apache.hupa.client.place;
-import org.apache.hupa.shared.domain.ImapFolder;
-import org.apache.hupa.shared.domain.MessageDetails;
-import org.apache.hupa.shared.domain.User;
-
import com.google.gwt.place.shared.PlaceTokenizer;
import com.google.gwt.place.shared.Prefix;
public class MailFolderPlace extends AbstractPlace {
- private User user;
- private String searchValue;
private String uid;
- private MessageDetails messageDetails;
private String fullName;
+ private static final String DELIMITER = "/";
+ /**
+ * Folder places look like: #Mock-Inbox, #INBOX,<br>
+ * while message places: #Mock-Inbox/10, #INBOX/1234,
#%5BGmail%5DDrafts/18
+ *
+ * @param token
+ */
public MailFolderPlace(String token) {
- if (token.contains("/")
- && token.substring(token.lastIndexOf("/") +
1).matches("\\d+")) {
- fullName = token.substring(0, token.lastIndexOf("/"));
- uid = token.substring(token.lastIndexOf("/") + 1);
+ if (isMessagePlace(token)) {
+ initPlace4Message(token);
} else {
- fullName = token;
+ initPlace4Folder(token);
}
}
- public MessageDetails getMessageDetails() {
- return messageDetails;
+ private boolean isMessagePlace(String token) {
+ return token.contains(DELIMITER) && isEndWIthDigit(token);
}
- public String getMessageId() {
- return uid;
+ private void initPlace4Folder(String token) {
+ fullName = token;
}
- public String getFullName() {
- return fullName;
+ private void initPlace4Message(String token) {
+ fullName = token.substring(0, token.lastIndexOf(DELIMITER));
+ uid = token.substring(token.lastIndexOf(DELIMITER) + 1);
}
- public User getUser() {
- return user;
+ private boolean isEndWIthDigit(String token) {
+ return token.substring(token.lastIndexOf(DELIMITER) + 1)
+ .matches("\\d+");
}
- public String getSearchValue() {
- return searchValue;
+ public String getUid() {
+ return uid;
+ }
+
+ public String getFullName() {
+ return fullName;
}
// the main place use empty string such that colon'd disappear
@@ -75,19 +79,11 @@ public class MailFolderPlace extends Abs
@Override
public String getToken(MailFolderPlace place) {
- String token = place.getFullName();
- if (place.getMessageId() != null
- && place.getMessageId().length() > 0) {
- token += "/" + place.getMessageId();
+ StringBuilder token = new
StringBuilder(place.getFullName());
+ if (place.getUid() != null && place.getUid().length() >
0) {
+ token.append(DELIMITER + place.getUid());
}
- return token;
+ return token.toString();
}
}
-
- public static void main(String[] args) {
- System.out.println("123a".matches("\\d+"));
- // String lll = "test/asdf/123";
- // System.out.println(lll.substring(lll.lastIndexOf("/")+1));
- // System.out.println(lll.substring(0, lll.lastIndexOf("/")));
- }
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522275&r1=1522274&r2=1522275&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
Thu Sep 12 03:56:23 2013
@@ -24,7 +24,12 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
+<<<<<<< HEAD
import java.util.Set;
+=======
+import java.util.logging.Level;
+import java.util.logging.Logger;
+>>>>>>> scrub code
import org.apache.hupa.client.activity.MessageListActivity;
<<<<<<< HEAD
@@ -99,6 +104,9 @@ import com.google.web.bindery.requestfac
public class MessageListView extends Composite implements
MessageListActivity.Displayable {
+ private static final Logger log = Logger.getLogger(MessageListView.class
+ .getName());
+
@UiField(provided = true) DataGrid<Message> grid;
private HupaRequestFactory requestFactory;
private ImapFolder folder;
@@ -142,6 +150,18 @@ public class MessageListView extends Com
+ event.getValue().getUid()));
}
+
+ @Override
+ public void
onFailure(ServerFailure error) {
+ if
(error.isFatal()) {
+
log.log(Level.SEVERE,
+
error.getMessage());
+
// TODO write the error message to
+
// status bar.
+
throw new RuntimeException(error
+
.getMessage());
+ }
+ }
});
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
