Author: norman
Date: Sun Aug 30 18:30:52 2009
New Revision: 809397
URL: http://svn.apache.org/viewvc?rev=809397&view=rev
Log:
move header to AppView
Added:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/Hupa.java
labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.java
labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.properties
labs/hupa/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
labs/hupa/client/war/Hupa.css
labs/hupa/server/pom.xml
labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
labs/hupa/war/Hupa.css
Modified: labs/hupa/client/src/main/java/org/apache/hupa/client/Hupa.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/client/Hupa.java (original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/client/Hupa.java Sun Aug 30
18:30:52 2009
@@ -32,7 +32,8 @@
public void onModuleLoad() {
AppPresenter aPres = injector.getAppPresenter();
- aPres.go(RootPanel.get());
+ aPres.bind();
+ RootPanel.get().add(aPres.getDisplay().asWidget());
injector.getPlaceManager().fireCurrentPlace();
}
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.java
(original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.java
Sun Aug 30 18:30:52 2009
@@ -95,4 +95,6 @@
public String pagePrev();
public String pageFirst();
+
+ public String loginAs();
}
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.properties
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.properties?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.properties
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/HupaConstants.properties
Sun Aug 30 18:30:52 2009
@@ -37,3 +37,4 @@
pageLast=Last
pagePrev=Previous
pageFirst=First
+loginAs=Login as
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
Sun Aug 30 18:30:52 2009
@@ -27,6 +27,7 @@
import org.apache.hupa.client.CachingDispatchAsync;
import org.apache.hupa.client.dnd.PagingScrollTableRowDragController;
import org.apache.hupa.client.mvp.AppPresenter;
+import org.apache.hupa.client.mvp.AppView;
import org.apache.hupa.client.mvp.IMAPFolderPresenter;
import org.apache.hupa.client.mvp.IMAPFolderView;
import org.apache.hupa.client.mvp.IMAPMessageListPresenter;
@@ -54,7 +55,7 @@
bindPresenter(MainPresenter.class,MainPresenter.Display.class,MainView.class);
bindPresenter(MessageSendPresenter.class,
MessageSendPresenter.Display.class, MessageSendView.class);
bindPresenter(IMAPFolderPresenter.class,
IMAPFolderPresenter.Display.class, IMAPFolderView.class);
- bind(AppPresenter.class).in(Singleton.class);
+ bindPresenter(AppPresenter.class, AppPresenter.Display.class,
AppView.class);
bind(CachingDispatchAsync.class);
bind(PagingScrollTableRowDragController.class).in(Singleton.class);
}
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
(original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
Sun Aug 30 18:30:52 2009
@@ -22,6 +22,10 @@
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.presenter.client.EventBus;
+import net.customware.gwt.presenter.client.place.Place;
+import net.customware.gwt.presenter.client.place.PlaceRequest;
+import net.customware.gwt.presenter.client.widget.WidgetDisplay;
+import net.customware.gwt.presenter.client.widget.WidgetPresenter;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.LoginEvent;
@@ -30,20 +34,34 @@
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.rpc.LoginSession;
import org.apache.hupa.shared.rpc.LoginUserResult;
+import org.apache.hupa.shared.rpc.LogoutUser;
+import org.apache.hupa.shared.rpc.LogoutUserResult;
import org.apache.hupa.shared.rpc.Noop;
import org.apache.hupa.shared.rpc.NoopResult;
import com.google.gwt.core.client.GWT;
+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.user.client.Cookies;
import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.Window.ClosingEvent;
+import com.google.gwt.user.client.Window.ClosingHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.HasWidgets;
+import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
-public class AppPresenter {
+public class AppPresenter extends WidgetPresenter<AppPresenter.Display>{
- private EventBus bus;
- private HasWidgets container;
+ public interface Display extends WidgetDisplay {
+ public HasClickHandlers getLogoutClick();
+ public void showTopNavigation(boolean show);
+ public void setMain(Widget w);
+ public HasText getUserText();
+ }
+
private LoginPresenter loginPresenter;
private MainPresenter mainPresenter;
private Timer noopTimer;
@@ -52,20 +70,43 @@
@Inject
- public AppPresenter(final DispatchAsync dispatcher,final EventBus bus,
LoginPresenter loginPresenter, MainPresenter mainPresenter) {
- this.bus = bus;
+ public AppPresenter(Display display, DispatchAsync dispatcher,final
EventBus bus, LoginPresenter loginPresenter, MainPresenter mainPresenter) {
+ super(display,bus);
this.dispatcher = dispatcher;
this.loginPresenter = loginPresenter;
- this.mainPresenter = mainPresenter;
- bindHandlers();
-
+ this.mainPresenter = mainPresenter;
+ }
+
+ private void showMain(User user) {
+ loginPresenter.unbind();
+ mainPresenter.bind(user);
+ display.showTopNavigation(true);
+ display.setMain(mainPresenter.getDisplay().asWidget());
}
- private void bindHandlers() {
- bus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
+
+ private void showLogin() {
+ mainPresenter.unbind();
+ loginPresenter.bind();
+ display.showTopNavigation(false);
+ display.setMain(loginPresenter.getDisplay().asWidget());
+
+ }
+
+ @Override
+ public Place getPlace() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected void onBind() {
+ registerHandler(eventBus.addHandler(LoginEvent.TYPE, new
LoginEventHandler() {
public void onLogin(LoginEvent event) {
user = event.getUser();
+
display.getUserText().setText(event.getUser().getName());
+
Cookies.setCookie("sessionId",
user.getSessionId());
noopTimer = new Timer() {
@@ -87,8 +128,8 @@
noopTimer.scheduleRepeating(30000);
showMain(user);
}
- });
- bus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() {
+ }));
+ registerHandler(eventBus.addHandler(LogoutEvent.TYPE, new
LogoutEventHandler() {
public void onLogout(LogoutEvent event) {
Cookies.removeCookie("sessionId");
@@ -98,29 +139,45 @@
}
}
- });
- }
-
+ }));
+ registerHandler(display.getLogoutClick().addClickHandler(new
ClickHandler() {
- private void showMain(User user) {
- loginPresenter.unbind();
- mainPresenter.bind(user);
+ public void onClick(ClickEvent event) {
+ doLogout();
+ }
+
+ }));
+ registerHandler(Window.addWindowClosingHandler(new
ClosingHandler() {
+
+ public void onWindowClosing(ClosingEvent event) {
+ doLogout();
+ }
+
+ }));
- container.clear();
- container.add(mainPresenter.getDisplay().asWidget());
+ checkForCookie();
}
-
- private void showLogin() {
- mainPresenter.unbind();
- loginPresenter.bind();
+ private void doLogout() {
+ if (user != null) {
+ dispatcher.execute(new LogoutUser(user.getSessionId()),
new AsyncCallback<LogoutUserResult>() {
- container.clear();
- container.add(loginPresenter.getDisplay().asWidget());
+ public void onFailure(Throwable caught) {
+ GWT.log("ERROR",caught);
+ }
+
+ public void onSuccess(LogoutUserResult result) {
+ Cookies.removeCookie("sessionId");
+
+ eventBus.fireEvent(new
LogoutEvent(result.getUser()));
+ }
+
+ });
+ }
}
- public void go(HasWidgets container) {
- this.container = container;
+
+ private void checkForCookie() {
String sessionId = Cookies.getCookie("sessionId");
if (sessionId != null) {
dispatcher.execute(new LoginSession(sessionId), new
AsyncCallback<LoginUserResult>() {
@@ -133,7 +190,7 @@
}
public void onSuccess(LoginUserResult result) {
- bus.fireEvent(new
LoginEvent(result.getUser()));
+ eventBus.fireEvent(new
LoginEvent(result.getUser()));
}
});
@@ -141,4 +198,25 @@
showLogin();
}
}
+ @Override
+ protected void onPlaceRequest(PlaceRequest request) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void onUnbind() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void refreshDisplay() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void revealDisplay() {
+ // TODO Auto-generated method stub
+
+ }
}
Added: labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppView.java?rev=809397&view=auto
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
(added)
+++ labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/AppView.java Sun
Aug 30 18:30:52 2009
@@ -0,0 +1,134 @@
+/****************************************************************
+ * 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.mvp;
+
+import org.apache.hupa.client.HupaConstants;
+import org.cobogw.gwt.user.client.ui.Button;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.HasClickHandlers;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public class AppView extends Composite implements AppPresenter.Display{
+ private SimplePanel mainPanel = new SimplePanel();
+ private HupaConstants constants = GWT.create(HupaConstants.class);
+ private HorizontalPanel northTop = new HorizontalPanel();
+ private Button logoutButton = new Button(constants.logoutButton());
+ private SimplePanel topNavigatorPanel = new SimplePanel();
+ private HTML dummy = new HTML("&nspb");
+ private Label userName = new Label();
+ private HorizontalPanel loginInfoPanel = new HorizontalPanel();
+
+ public AppView() {
+ VerticalPanel vPanel = new VerticalPanel();
+
+ vPanel.setSpacing(3);
+ vPanel.setWidth("100%");
+ vPanel.setHorizontalAlignment(VerticalPanel.ALIGN_CENTER);
+ vPanel.setVerticalAlignment(VerticalPanel.ALIGN_MIDDLE);
+
+ topNavigatorPanel.setHeight("30px");
+ vPanel.add(topNavigatorPanel);
+
+ loginInfoPanel.setSpacing(5);
+ loginInfoPanel.add(new Label(constants.loginAs() +":"));
+ loginInfoPanel.add(userName);
+ userName.getElement().getStyle().setProperty("textDecoration",
"underline");
+ userName.getElement().getStyle().setProperty("fontWeight",
"bold");
+
+ northTop.setSpacing(5);
+ northTop.setStyleName("hupa-MainButtonBar");
+ northTop.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT);
+ northTop.setWidth("100%");
+ northTop.setHeight("100%");
+ northTop.add(loginInfoPanel);
+ northTop.setCellHorizontalAlignment(loginInfoPanel,
HorizontalPanel.ALIGN_LEFT);
+ northTop.add(logoutButton);
+
+
+ Label header = new Label(constants.productName());
+ header.setHeight("25px");
+ header.setStyleName("hupa-LoginWidgetHeader");
+ vPanel.add(header);
+ vPanel.setCellHorizontalAlignment(header, VerticalPanel.ALIGN_LEFT);
+ vPanel.setCellVerticalAlignment(header, VerticalPanel.ALIGN_MIDDLE);
+
+ vPanel.add(mainPanel);
+
+ //dummy.setHeight("20px");
+ dummy.setHeight("100%");
+ showTopNavigation(false);
+ initWidget(vPanel);
+ }
+
+ public void setMain(Widget w) {
+ mainPanel.setWidget(w);
+ }
+
+ public Widget asWidget() {
+ return this;
+ }
+
+ public void startProcessing() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void stopProcessing() {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.client.mvp.AppPresenter.Display#getLogoutClick()
+ */
+ public HasClickHandlers getLogoutClick() {
+ return logoutButton;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.hupa.client.mvp.AppPresenter.Display#showTopNavigation(boolean)
+ */
+ public void showTopNavigation(boolean show) {
+ if (show) {
+ topNavigatorPanel.setWidget(northTop);
+ } else {
+ topNavigatorPanel.setWidget(dummy);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.hupa.client.mvp.AppPresenter.Display#getUserText()
+ */
+ public HasText getUserText() {
+ return userName;
+ }
+
+}
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
(original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
Sun Aug 30 18:30:52 2009
@@ -63,13 +63,6 @@
vPanel.setHorizontalAlignment(VerticalPanel.ALIGN_CENTER);
vPanel.setVerticalAlignment(VerticalPanel.ALIGN_MIDDLE);
- Label header = new Label(constants.productName());
-
- header.setHeight("25px");
- header.setStyleName("hupa-LoginWidgetHeader");
- vPanel.add(header);
- vPanel.setCellHorizontalAlignment(header, VerticalPanel.ALIGN_LEFT);
-
VerticalPanel formPanel = new VerticalPanel();
formPanel.setHorizontalAlignment(VerticalPanel.ALIGN_CENTER);
formPanel.setSpacing(5);
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
Sun Aug 30 18:30:52 2009
@@ -43,7 +43,6 @@
import org.apache.hupa.shared.events.ForwardMessageEventHandler;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
-import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
import org.apache.hupa.shared.events.MessagesReceivedEventHandler;
import org.apache.hupa.shared.events.NewMessageEvent;
@@ -54,18 +53,11 @@
import org.apache.hupa.shared.events.SentMessageEventHandler;
import org.apache.hupa.shared.rpc.ExposeMessage;
import org.apache.hupa.shared.rpc.ExposeMessageResult;
-import org.apache.hupa.shared.rpc.LogoutUser;
-import org.apache.hupa.shared.rpc.LogoutUserResult;
import com.google.gwt.core.client.GWT;
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.user.client.Cookies;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.Window.ClosingEvent;
-import com.google.gwt.user.client.Window.ClosingHandler;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
@@ -74,8 +66,6 @@
public interface Display extends WidgetDisplay{
- public HasClickHandlers getLogoutClick();
-
public HasClickHandlers getSearchClick();
public HasValue<String> getSearchValue();
public void fillOracle(ArrayList<IMAPMessage> messages);
@@ -105,24 +95,6 @@
- private void doLogout() {
- if (user != null) {
- cachingDispatcher.execute(new
LogoutUser(user.getSessionId()), new AsyncCallback<LogoutUserResult>() {
-
- public void onFailure(Throwable caught) {
- GWT.log("ERROR",caught);
- }
-
- public void onSuccess(LogoutUserResult result) {
- Cookies.removeCookie("sessionId");
-
- eventBus.fireEvent(new
LogoutEvent(result.getUser()));
- }
-
- });
- }
- }
-
private void showMessageTable(User user, IMAPFolder folder, String
searchValue) {
this.user = user;
this.folder = folder;
@@ -285,22 +257,7 @@
showMessageTable(user,event.getFolder(),searchValue);
}
- }));
- registerHandler(Window.addWindowClosingHandler(new
ClosingHandler() {
-
- public void onWindowClosing(ClosingEvent event) {
- doLogout();
- }
-
- }));
-
- registerHandler(display.getLogoutClick().addClickHandler(new
ClickHandler() {
-
- public void onClick(ClickEvent event) {
- doLogout();
- }
-
- }));
+ }));
registerHandler(display.getSearchClick().addClickHandler(new
ClickHandler() {
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
(original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainView.java Sun
Aug 30 18:30:52 2009
@@ -37,7 +37,6 @@
import com.google.gwt.user.client.ui.DockPanel;
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.MultiWordSuggestOracle;
import com.google.gwt.user.client.ui.SuggestBox;
import com.google.gwt.user.client.ui.Tree;
@@ -58,7 +57,6 @@
private Button searchButton = new Button(constants.searchButton());
private Loading loading = new Loading(false);
private Widget centerWidget;
- private Button logoutButton = new Button(constants.logoutButton());
private RoundedPanel center;
private IMAPMessageListView mListView;
@@ -92,18 +90,7 @@
private void createNorth() {
north = new VerticalPanel();
north.setWidth("100%");
- HorizontalPanel northTop = new HorizontalPanel();
- northTop.setSpacing(5);
- northTop.setStyleName("hupa-Northpanel");
- northTop.setHorizontalAlignment(HorizontalPanel.ALIGN_LEFT);
-
- northTop.setWidth("100%");
- northTop.add(new Label(constants.productName()));
-
- northTop.add(logoutButton);
- northTop.setCellHorizontalAlignment(logoutButton,
- HorizontalPanel.ALIGN_RIGHT);
- north.add(northTop);
+
HorizontalPanel barPanel = new HorizontalPanel();
barPanel.setWidth("100%");
@@ -146,11 +133,6 @@
}
-
- public HasClickHandlers getLogoutClick() {
- return logoutButton;
- }
-
public HasClickHandlers getSearchClick() {
return searchButton;
}
Modified: labs/hupa/client/war/Hupa.css
URL:
http://svn.apache.org/viewvc/labs/hupa/client/war/Hupa.css?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/client/war/Hupa.css (original)
+++ labs/hupa/client/war/Hupa.css Sun Aug 30 18:30:52 2009
@@ -56,6 +56,11 @@
background-color: #E0ECFF;
}
+.hupa-MainButtonBar {
+ border-bottom: 1pt solid silver;
+ border-top: 1pt solid silver;
+}
+
.hupa-Mailtable-row-notseen {
font-weight: bold;
}
Modified: labs/hupa/server/pom.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/server/pom.xml?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/server/pom.xml (original)
+++ labs/hupa/server/pom.xml Sun Aug 30 18:30:52 2009
@@ -38,79 +38,80 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.hupa</groupId>
- <artifactId>hupa-shared</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <exclusions>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.customware.gwt.dispatch</groupId>
- <artifactId>gwt-dispatch</artifactId>
- </dependency>
-
- <dependency>
- <groupId>gwtupload</groupId>
- <artifactId>gwtupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-shared</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.customware.gwt.dispatch
+ </groupId>
+ <artifactId>gwt-dispatch</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>gwtupload</groupId>
+ <artifactId>gwtupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+</dependencies>
</project>
\ No newline at end of file
Modified:
labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
URL:
http://svn.apache.org/viewvc/labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
(original)
+++ labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
Sun Aug 30 18:30:52 2009
@@ -21,7 +21,6 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.List;
/**
* IMAPFolder
@@ -37,7 +36,7 @@
public static final String DEFAULT_TRASH = "Trash";
public static final String DEFAULT_SENT = "Sent";
- private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
+ private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
private String fullName;
private String delimiter;
private int msgCount;
@@ -70,7 +69,7 @@
*
* @param childs
*/
- public void setChildIMAPFolders(List<IMAPFolder> childs) {
+ public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
this.childs = childs;
}
@@ -79,7 +78,7 @@
*
* @return childs
*/
- public List<IMAPFolder> getChildIMAPFolders() {
+ public ArrayList<IMAPFolder> getChildIMAPFolders() {
return childs;
}
Modified: labs/hupa/war/Hupa.css
URL:
http://svn.apache.org/viewvc/labs/hupa/war/Hupa.css?rev=809397&r1=809396&r2=809397&view=diff
==============================================================================
--- labs/hupa/war/Hupa.css (original)
+++ labs/hupa/war/Hupa.css Sun Aug 30 18:30:52 2009
@@ -56,6 +56,11 @@
background-color: #E0ECFF;
}
+.hupa-MainButtonBar {
+ border-bottom: 1pt solid silver;
+ border-top: 1pt solid
silver;
+}
+
.hupa-Mailtable-row-notseen {
font-weight: bold;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
