Author: dongxu Date: Thu Sep 12 04:03:07 2013 New Revision: 1522292 URL: http://svn.apache.org/r1522292 Log: scrub code
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522292&r1=1522291&r2=1522292&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:03:07 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.ui; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import java.util.ArrayList; import java.util.List; @@ -214,6 +215,8 @@ public class FolderListView extends Comp import java.util.logging.Logger; >>>>>>> add a logger to folder list view for logging the switching activity +======= +>>>>>>> scrub code import org.apache.hupa.client.activity.FolderListActivity; import org.apache.hupa.client.place.ComposePlace; @@ -235,7 +238,8 @@ public class FolderListView extends Comp FolderListActivity.Displayable { @UiField SimplePanel thisView; private CellTree cellTree; - // FIXME here we can not support another cell tree, since both of their style + // FIXME here we can not support another cell tree, since both of their + // style // would not be cleared. private HTMLPanel contactPanel; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java?rev=1522292&r1=1522291&r2=1522292&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java Thu Sep 12 04:03:07 2013 @@ -19,8 +19,6 @@ package org.apache.hupa.client.ui; -import org.apache.hupa.client.activity.StatusActivity; - import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -31,7 +29,7 @@ import com.google.gwt.user.client.ui.IsW import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; -public class _ToolPanel extends Composite implements StatusActivity.Displayable { +public class _ToolPanel extends Composite { @UiField SimplePanel toolBarContainer; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522292&r1=1522291&r2=1522292&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java Thu Sep 12 04:03:07 2013 @@ -90,7 +90,6 @@ import com.google.gwt.user.client.ui.Fle import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTMLTable.RowFormatter; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.TextBox; @@ -217,38 +216,6 @@ public class __ComposePanel extends Comp return t; } - /** - * Add a row to the flex table. - */ - private void addRow(FlexTable flexTable) { - int numRows = flexTable.getRowCount(); - ListBox lb = new ListBox(); - lb.addItem("foo"); - lb.addItem("bar"); - Button addRowButton = new Button("cwFlexTableAddRow"); - Button removeRowButton = new Button("cwFlexTableRemoveRow"); - HorizontalPanel buttonPanel = new HorizontalPanel(); - buttonPanel.add(new Anchor("logo")); - buttonPanel.add(lb); - buttonPanel.add(addRowButton); - buttonPanel.add(removeRowButton); - - flexTable.setWidget(numRows, 0, buttonPanel); - flexTable.setWidget(numRows, 1, new TextBox()); - // flexTable.getFlexCellFormatter().setRowSpan(0, 1, numRows + 1); - } - - /** - * Remove a row from the flex table. - */ - private void removeRow(FlexTable flexTable) { - int numRows = flexTable.getRowCount(); - if (numRows > 1) { - flexTable.removeRow(numRows - 1); - flexTable.getFlexCellFormatter().setRowSpan(0, 1, numRows - 1); - } - } - interface __ComposePanelUiBinder extends UiBinder<DockLayoutPanel, __ComposePanel> { } 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=1522292&r1=1522291&r2=1522292&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:03:07 2013 @@ -19,8 +19,6 @@ package org.apache.hupa.client.ui; -import org.apache.hupa.client.activity.StatusActivity; - import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -35,8 +33,7 @@ import com.google.gwt.user.client.ui.Sim import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.Widget; -public class __ContentPanel extends Composite implements - StatusActivity.Displayable { +public class __ContentPanel extends Composite{ @UiField SplitLayoutPanel thisPanel; @UiField DockLayoutPanel messageListBox; @UiField SimpleLayoutPanel messageListContainer; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java?rev=1522292&r1=1522291&r2=1522292&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java Thu Sep 12 04:03:07 2013 @@ -20,10 +20,13 @@ package org.apache.hupa.client.ui; <<<<<<< HEAD +<<<<<<< HEAD ======= import org.apache.hupa.client.activity.StatusActivity; >>>>>>> split the layout panel to more small ones +======= +>>>>>>> scrub code import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -35,6 +38,7 @@ import com.google.gwt.user.client.ui.Scr import com.google.gwt.user.client.ui.Widget; <<<<<<< HEAD +<<<<<<< HEAD public class __OutlinePanel extends Composite { ======= @@ -42,6 +46,10 @@ public class __OutlinePanel extends Comp StatusActivity.Displayable { >>>>>>> split the layout panel to more small ones +======= +public class __OutlinePanel extends Composite { + +>>>>>>> scrub code @UiField ScrollPanel folderListContainer; public __OutlinePanel() { @@ -57,9 +65,13 @@ public class __OutlinePanel extends Comp }; } <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> split the layout panel to more small ones +======= + +>>>>>>> scrub code interface __OutlinePanelUiBinder extends UiBinder<DockLayoutPanel, __OutlinePanel> { } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org