rhbz844820 - in preparation of refactor SCP and TCP to have single view

zanata · Aug 23, 2012 · 66f5bfd · 66f5bfd
1 parent 23e02a5
commit 66f5bfd
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 39 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
@@ -27,6 +27,7 @@
 import org.zanata.webtrans.client.ui.SourcePanel;
 import org.zanata.webtrans.shared.model.TransUnit;
 
+import com.google.common.base.Objects;
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
@@ -361,7 +361,7 @@ public void onTransUnitUpdated(TransUnitUpdatedEvent event)
             // assume update was successful
             if (documentId != null && documentId.equals(event.getUpdateInfo().getDocumentId()))
             {
-               navigationService.updateMap(event.getUpdateInfo().getTransUnit().getId().getId(), event.getUpdateInfo().getTransUnit().getStatus());
+               navigationService.updateState(event.getUpdateInfo().getTransUnit().getId().getId(), event.getUpdateInfo().getTransUnit().getStatus());
 
                boolean editing = targetContentsPresenter.isEditing();
                Integer rowIndex = navigationService.getRowNumber(event.getUpdateInfo().getTransUnit(), display.getRowValues());

diff --git a/...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java b/...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
@@ -829,4 +829,9 @@ public void addUndoLink(int row, UndoLink undoLink)
          targetContentsDisplay.addUndo(undoLink);
       }
    }
+
+   public TargetContentsDisplay getDisplay()
+   {
+      return displayList.get(0);
+   }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
@@ -140,4 +140,9 @@ public void initWidgets(int pageSize)
          displayList.add(display);
       }
    }
+
+   public SourceContentsDisplay getDisplay()
+   {
+      return displayList.get(0);
+   }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
@@ -48,7 +48,6 @@ public class TransUnitEditPresenter extends WidgetPresenter<TransUnitEditDisplay
    private final TransUnitEditDisplay display;
    private final EventBus eventBus;
    private final PageNavigation pageNavigation;
-   private final TransUnitListDisplay transUnitListDisplay;
    private final SourceContentsPresenter sourceContentsPresenter;
    private final TargetContentsPresenter targetContentsPresenter;
    private final TransUnitsDataProvider dataProvider;
@@ -63,14 +62,14 @@ public TransUnitEditPresenter(TransUnitEditDisplay display, EventBus eventBus, P
       this.display = display;
       this.eventBus = eventBus;
       this.pageNavigation = pageNavigation;
-      this.transUnitListDisplay = transUnitListDisplay;
       this.sourceContentsPresenter = sourceContentsPresenter;
       this.targetContentsPresenter = targetContentsPresenter;
-      display.setDisplayTable(transUnitListDisplay);
 
       //TODO we only have one row now
       sourceContentsPresenter.initWidgets(1);
       targetContentsPresenter.initWidgets(1);
+      display.init(transUnitListDisplay, sourceContentsPresenter.getDisplay(), targetContentsPresenter.getDisplay());
+
       dataProvider = pageNavigation.getDataProvider();
       dataProvider.addDataDisplay(transUnitListDisplay);
    }
@@ -106,12 +105,11 @@ public void onSelectionChange(SelectionChangeEvent event)
       if (selectedTransUnit != null)
       {
          display.scrollToRow(selectedTransUnit);
+         sourceContentsPresenter.getDisplay().setValue(selectedTransUnit);
+         targetContentsPresenter.getDisplay().setTargets(selectedTransUnit.getTargets());
          //TODO we only have one row now
-         SourceContentsDisplay sourceDisplay = sourceContentsPresenter.getSourceContent(0, selectedTransUnit);
-         //TODO need to handle findMessage
-         TargetContentsDisplay targetDisplay = targetContentsPresenter.getNextTargetContentsDisplay(0, selectedTransUnit, null);
+         sourceContentsPresenter.setSelectedSource(0);
          targetContentsPresenter.showEditors(0, 0);
-         display.openEditor(sourceDisplay, targetDisplay);
       }
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditDisplay.java
@@ -29,9 +29,8 @@
 
 public interface TransUnitEditDisplay extends WidgetDisplay
 {
-   void setDisplayTable(TransUnitListDisplay displayTable);
+   void init(TransUnitListDisplay transUnitListDisplay, SourceContentsDisplay sourceContentsDisplay, TargetContentsDisplay targetContentsDisplay);
 
    void scrollToRow(TransUnit selected);
 
-   void openEditor(SourceContentsDisplay sourceDisplay, TargetContentsDisplay targetDisplay);
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
@@ -27,11 +27,11 @@
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
-import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.SplitLayoutPanel;
 import com.google.gwt.user.client.ui.Widget;
 
 /**
@@ -43,26 +43,15 @@ public class TransUnitEditView extends Composite implements TransUnitEditDisplay
 
    private TransUnitListDisplay displayTable;
 
-   private ScrollPanel rootPanel;
-   private final DialogBox editorDialog;
+   private SplitLayoutPanel rootPanel;
+   @UiField
+   ScrollPanel tuTablePanel;
+   @UiField
+   HorizontalPanel editorPanel;
 
    public TransUnitEditView()
    {
       rootPanel = uiBinder.createAndBindUi(this);
-
-      //editor popup
-      editorDialog = new DialogBox(true, true);
-      editorDialog.setWidth("100%");
-      //TODO caption can be used to display current editing translator or some other information
-      editorDialog.setText("Translation Unit Editor");
-
-   }
-
-   @Override
-   public void setDisplayTable(TransUnitListDisplay displayTable)
-   {
-      rootPanel.setWidget(displayTable);
-      this.displayTable = displayTable;
    }
 
    @Override
@@ -73,18 +62,16 @@ public void scrollToRow(TransUnit selected)
 
       Log.debug("absolute top: " + absoluteTop + " selection top:" + selectedRowAbsoluteTop);
       //TODO this will scroll to top and cell table header won't be visible.
-      rootPanel.setVerticalScrollPosition(selectedRowAbsoluteTop - absoluteTop + rootPanel.getVerticalScrollPosition());
+      tuTablePanel.setVerticalScrollPosition(selectedRowAbsoluteTop - absoluteTop + tuTablePanel.getVerticalScrollPosition());
    }
 
    @Override
-   public void openEditor(SourceContentsDisplay sourceDisplay, TargetContentsDisplay targetDisplay)
+   public void init(TransUnitListDisplay transUnitListDisplay, SourceContentsDisplay sourceContentsDisplay, TargetContentsDisplay targetContentsDisplay)
    {
-      HorizontalPanel editorMain = new HorizontalPanel();
-      editorMain.setWidth("100%");
-      editorMain.add(sourceDisplay);
-      editorMain.add(targetDisplay);
-      editorDialog.setWidget(editorMain);
-      editorDialog.center();
+      tuTablePanel.setWidget(transUnitListDisplay);
+      this.displayTable = transUnitListDisplay;
+      editorPanel.add(sourceContentsDisplay);
+      editorPanel.add(targetContentsDisplay);
    }
 
    @Override
@@ -93,7 +80,7 @@ public Widget asWidget()
       return rootPanel;
    }
 
-   interface TransUnitTableViewUiBinder extends UiBinder<ScrollPanel, TransUnitEditView>
+   interface TransUnitTableViewUiBinder extends UiBinder<SplitLayoutPanel, TransUnitEditView>
    {
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.ui.xml
@@ -1,6 +1,18 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
              xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-    <g:ScrollPanel width="100%">
 
-    </g:ScrollPanel>
+    <g:SplitLayoutPanel>
+        <g:north size="500" min-size="100">
+            <g:ScrollPanel width="100%" ui:field="tuTablePanel">
+
+            </g:ScrollPanel>
+        </g:north>
+        <g:center>
+            <g:ScrollPanel width="100%" >
+               <g:HorizontalPanel ui:field="editorPanel" width="100%">
+
+               </g:HorizontalPanel>
+            </g:ScrollPanel>
+        </g:center>
+    </g:SplitLayoutPanel>
 </ui:UiBinder>