You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 06:29:20 UTC
svn commit: r1522353 - in
/james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ ioc/
mapper/ ui/
Author: dongxu
Date: Thu Sep 12 04:29:20 2013
New Revision: 1522353
URL: http://svn.apache.org/r1522353
Log:
attempt to add label setting feature
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/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.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=1522353&r1=1522352&r2=1522353&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 04:29:20 2013
@@ -82,7 +82,11 @@ import org.apache.hupa.client.place.Defa
=======
>>>>>>> fixed issue#48, and add the original IdleTimer
import org.apache.hupa.client.place.MailFolderPlace;
+<<<<<<< HEAD
>>>>>>> prepare to make composeView's reload work
+=======
+import org.apache.hupa.client.place.SettingPlace;
+>>>>>>> attempt to add label setting feature
import org.apache.hupa.client.rf.CheckSessionRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.IdleRequest;
@@ -348,6 +352,8 @@ public class HupaController {
} else {
this.placeController.goTo(new MailFolderPlace("Mock-Inbox"));
}
+ } else if(place instanceof SettingPlace) {
+ hupaLayout.switchToSetting();
} else {
hupaLayout.switchToMessage();
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java Thu Sep 12 04:29:20 2013
@@ -272,6 +272,7 @@ import org.apache.hupa.client.ui.ToolBar
import org.apache.hupa.client.ui.TopBarView;
import org.apache.hupa.client.ui.TopView;
import org.apache.hupa.client.ui.WestView;
+import org.apache.hupa.client.ui._CenterSettingPanel;
import com.google.gwt.activity.shared.ActivityManager;
<<<<<<< HEAD
@@ -370,6 +371,7 @@ public class AppGinModule extends Abstra
bind(MessageListActivity.class).in(Singleton.class);
bind(ComposeToolBarActivity.class).in(Singleton.class);
bind(ComposeActivity.class).in(Singleton.class);
+<<<<<<< HEAD
bind(SearchBoxActivity.class).in(Singleton.class);
bind(LabelListActivity.class).in(Singleton.class);
@@ -538,6 +540,10 @@ public class AppGinModule extends Abstra
bind(MessageListActivity.class).in(Singleton.class);
bind(ComposeToolBarActivity.class).in(Singleton.class);
bind(ComposeActivity.class).in(Singleton.class);
+=======
+
+ bind(_CenterSettingPanel.class).in(Singleton.class);
+>>>>>>> attempt to add label setting feature
<<<<<<< HEAD
>>>>>>> integrate all of the views to their corresponding activities and mappers
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java Thu Sep 12 04:29:20 2013
@@ -24,6 +24,7 @@ import org.apache.hupa.client.place.Defa
import org.apache.hupa.client.place.IMAPMessagePlace;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
+import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.place.shared.PlaceHistoryMapper;
import com.google.gwt.place.shared.WithTokenizers;
@@ -33,7 +34,8 @@ import com.google.gwt.place.shared.WithT
MailFolderPlace.Tokenizer.class,
MessageSendPlace.Tokenizer.class,
IMAPMessagePlace.Tokenizer.class,
- ComposePlace.Tokenizer.class
+ ComposePlace.Tokenizer.class,
+ SettingPlace.Tokenizer.class
})
public interface AppPlaceHistoryMapper extends PlaceHistoryMapper {
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java Thu Sep 12 04:29:20 2013
@@ -25,6 +25,9 @@ import org.apache.hupa.client.activity.F
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> attempt to add label setting feature
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.activity.shared.Activity;
@@ -71,10 +74,9 @@ public class FolderListActivityMapper ex
public class FolderListActivityMapper extends MainActivityMapper {
>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
private final Provider<FolderListActivity> folderListActivityProvider;
-
+
@Inject
- public FolderListActivityMapper(
- Provider<FolderListActivity> folderListActivityProvider) {
+ public FolderListActivityMapper(Provider<FolderListActivity> folderListActivityProvider) {
this.folderListActivityProvider = folderListActivityProvider;
}
@@ -92,7 +94,12 @@ public class FolderListActivityMapper ex
>>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
=======
Activity asyncLoadActivity(final Place place) {
+<<<<<<< HEAD
>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
+=======
+ if (place instanceof SettingPlace)
+ return null;
+>>>>>>> attempt to add label setting feature
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java Thu Sep 12 04:29:20 2013
@@ -43,6 +43,7 @@ import com.google.gwt.activity.shared.Ac
=======
=======
import org.apache.hupa.client.place.MailFolderPlace;
+import org.apache.hupa.client.place.SettingPlace;
import org.apache.hupa.client.ui.ToolBarView.Parameters;
import com.google.gwt.activity.shared.Activity;
@@ -129,9 +130,13 @@ public class ToolBarActivityMapper exten
=======
Activity asyncLoadActivity(final Place place) {
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> fix the bugs resulted from the no unit tests
=======
+=======
+ if(place instanceof SettingPlace) return null;
+>>>>>>> attempt to add label setting feature
final ToolBarActivity tba = toolBarActivityProvider.get();
if (place instanceof MailFolderPlace) { // might be from login page
MailFolderPlace here = (MailFolderPlace) place;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 04:29:20 2013
@@ -35,6 +35,7 @@ import com.google.gwt.dom.client.Style.U
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.SimpleLayoutPanel;
@@ -252,6 +253,7 @@ import com.google.gwt.user.client.ui.Lay
>>>>>>> deal with onResizeEvent of folder list panel, but found issue #25
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Inject;
public class HupaLayout implements HupaLayoutable {
@@ -264,11 +266,15 @@ public class HupaLayout implements HupaL
@UiField _ToolPanel toolPanel;
@UiField _CenterPanel centerPanel;
+ @UiField DockLayoutPanel mainBox;
+
+ private _CenterSettingPanel settingPanel;
private LayoutPanel hupaMainPanel;
-// @Inject
- public HupaLayout() {
+ @Inject
+ public HupaLayout(_CenterSettingPanel settingPanel) {
+ this.settingPanel = settingPanel;
hupaMainPanel = binder.createAndBindUi(this);
}
@@ -449,5 +455,14 @@ public interface HupaLayout {
=======
private static HupaLayoutUiBinder binder = GWT
.create(HupaLayoutUiBinder.class);
+<<<<<<< HEAD
>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
+=======
+
+ @Override
+ public void switchToSetting() {
+ centerPanel.removeFromParent();
+ mainBox.add(settingPanel);
+ }
+>>>>>>> attempt to add label setting feature
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java Thu Sep 12 04:29:20 2013
@@ -136,5 +136,10 @@ public interface HupaLayoutable extends
=======
AcceptsOneWidget getNotificationView();
+<<<<<<< HEAD
>>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
+=======
+
+ void switchToSetting();
+>>>>>>> attempt to add label setting feature
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java Thu Sep 12 04:29:20 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.core.client.GWT;
@@ -86,10 +87,25 @@ public class _CenterSettingPanel extends
}
interface _CeterSettingPanelUiBinder extends UiBinder<SplitLayoutPanel, _CenterSettingPanel> {
+=======
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DockLayoutPanel;
+
+public class _CenterSettingPanel extends Composite {
+
+ public _CenterSettingPanel() {
+ initWidget(binder.createAndBindUi(this));
+ }
+
+ interface _CeterSettingPanelUiBinder extends UiBinder<DockLayoutPanel, _CenterSettingPanel> {
+>>>>>>> attempt to add label setting feature
}
private static _CeterSettingPanelUiBinder binder = GWT.create(_CeterSettingPanelUiBinder.class);
+<<<<<<< HEAD
public AcceptsOneWidget getLabelListView() {
return settingLabelPanel.getLabelListView();
}
@@ -118,4 +134,6 @@ public class _CenterSettingPanel extends
showOrHideLabel(lyt);
}
+=======
+>>>>>>> attempt to add label setting feature
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml Thu Sep 12 04:29:20 2013
@@ -8,6 +8,7 @@
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. -->
+<<<<<<< HEAD
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
@@ -129,4 +130,24 @@
</g:LayoutPanel>
</g:center>
</g:SplitLayoutPanel>
+=======
+
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+ xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
+ <g:DockLayoutPanel ui:field="thisPanel">
+ <g:west size="373">
+ <g:HTMLPanel>Settings</g:HTMLPanel>
+ </g:west>
+ <g:center>
+ <g:SplitLayoutPanel>
+ <g:west size="373">
+ <g:HTMLPanel>Section</g:HTMLPanel>
+ </g:west>
+ <g:center>
+ <g:HTMLPanel>PlayGround</g:HTMLPanel>
+ </g:center>
+ </g:SplitLayoutPanel>
+ </g:center>
+ </g:DockLayoutPanel>
+>>>>>>> attempt to add label setting feature
</ui:UiBinder>
\ No newline at end of file
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java Thu Sep 12 04:29:20 2013
@@ -45,7 +45,7 @@ public class __ContentPanel extends Comp
public __ContentPanel() {
initWidget(binder.createAndBindUi(this));
- thisPanel.setWidgetHidden(contactBox, true);
+// thisPanel.setWidgetHidden(contactBox, true);
thisPanel.setWidgetMinSize(messageListBox, 130);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org