Author: dongxu
Date: Thu Sep 12 03:37:27 2013
New Revision: 1522224
URL: http://svn.apache.org/r1522224
Log:
remove warnings
Modified:
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/dnd/PagingScrollTableRowDragController.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java
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=1522224&r1=1522223&r2=1522224&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:37:27 2013
@@ -921,13 +921,13 @@ System.out.println("1111111"+response);
=======
>>>>>>> scrub code
public void onExpandMessage(ExpandMessageEvent event) {
- final boolean decreaseUnseen;
+// final boolean decreaseUnseen;
final Message message = event.getMessage();
// check if the message was already seen in the
past
if
(event.getMessage().getFlags().contains(IMAPFlag.SEEN) == false) {
- decreaseUnseen = true;
+// decreaseUnseen = true;//TODO 1209
} else {
- decreaseUnseen = false;
+// decreaseUnseen = false;
}
GetMessageDetailsRequest req =
requestFactory.messageDetailsRequest();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java?rev=1522224&r1=1522223&r2=1522224&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java
Thu Sep 12 03:37:27 2013
@@ -43,7 +43,7 @@ public class PagingScrollTableRowDragCon
private HupaMessages messages = GWT.create(HupaMessages.class);
private HupaImageBundle bundle =GWT.create(HupaImageBundle.class);
private FixedWidthGrid draggableTable;
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
private PagingScrollTable parentTable;
private int dragRow;
private RowDragProxy proxyWidget;
@@ -89,7 +89,7 @@ public class PagingScrollTableRowDragCon
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
protected Widget newDragProxy(DragContext context) {
draggableTable = (FixedWidthGrid) context.draggable.getParent();
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java?rev=1522224&r1=1522223&r2=1522224&view=diff
==============================================================================
---
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
Thu Sep 12 03:37:27 2013
@@ -90,6 +90,7 @@ public class MockHttpSession implements
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@SuppressWarnings("rawtypes")
public Enumeration getAttributeNames() {
=======
@@ -100,6 +101,10 @@ public class MockHttpSession implements
@SuppressWarnings("unchecked")
public Enumeration getAttributeNames() {
>>>>>>> first commit
+=======
+ @SuppressWarnings("rawtypes")
+ public Enumeration getAttributeNames() {
+>>>>>>> remove warnings
return new Enumeration() {
Iterator it = attributeMap.keySet().iterator();
public boolean hasMoreElements() {
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java?rev=1522224&r1=1522223&r2=1522224&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
Thu Sep 12 03:37:27 2013
@@ -75,12 +75,15 @@ import org.apache.hupa.server.mock.MockH
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.server.mock.MockLogProvider;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
<<<<<<< HEAD
<<<<<<< HEAD
=======
import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
+=======
+>>>>>>> remove warnings
import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
>>>>>>> re-add server unit tests
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java?rev=1522224&r1=1522223&r2=1522224&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
Thu Sep 12 03:37:27 2013
@@ -82,9 +82,12 @@ public class StoreBugTest {
static User user = new User() {
=======
static User user = new UserImpl() {
+<<<<<<< HEAD
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+>>>>>>> remove warnings
{setName(imapUser); setPassword(imapPass);}
};
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java?rev=1522224&r1=1522223&r2=1522224&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java
Thu Sep 12 03:37:27 2013
@@ -29,10 +29,6 @@ public class SettingsImpl implements Set
public static final String DEFAULT_SENT = "Sent";
public static final String DEFAULT_DRAFT = "Draft";
- /**
- *
- */
- private static final long serialVersionUID = -8051377307421345664L;
private String trashFolderName = DEFAULT_TRASH;
private String sentFolderName = DEFAULT_SENT;
private String inboxFolderName = DEFAULT_INBOX;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
