Refactor Listener interfaces

zanata · Sep 26, 2012 · d9736d8 · d9736d8
1 parent 092c5fa
commit d9736d8
Show file tree

Hide file tree

Showing 19 changed files with 261 additions and 176 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java b/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
@@ -30,9 +30,6 @@
 import org.zanata.webtrans.client.editor.filter.TransFilterDisplay;
 import org.zanata.webtrans.client.editor.filter.TransFilterPresenter;
 import org.zanata.webtrans.client.editor.filter.TransFilterView;
-import org.zanata.webtrans.client.view.SideMenuDisplay;
-import org.zanata.webtrans.client.view.SourceContentsDisplay;
-import org.zanata.webtrans.client.view.SourceContentsView;
 import org.zanata.webtrans.client.events.NativeEvent;
 import org.zanata.webtrans.client.events.NativeEventImpl;
 import org.zanata.webtrans.client.history.History;
@@ -55,8 +52,8 @@
 import org.zanata.webtrans.client.presenter.TransMemoryDetailsPresenter;
 import org.zanata.webtrans.client.presenter.TransMemoryMergePresenter;
 import org.zanata.webtrans.client.presenter.TransMemoryPresenter;
-import org.zanata.webtrans.client.presenter.TransUnitsTablePresenter;
 import org.zanata.webtrans.client.presenter.TransUnitNavigationPresenter;
+import org.zanata.webtrans.client.presenter.TransUnitsTablePresenter;
 import org.zanata.webtrans.client.presenter.TranslationEditorPresenter;
 import org.zanata.webtrans.client.presenter.TranslationPresenter;
 import org.zanata.webtrans.client.presenter.ValidationOptionsPresenter;
@@ -70,25 +67,31 @@
 import org.zanata.webtrans.client.ui.TransMemoryMergePopupPanelView;
 import org.zanata.webtrans.client.view.AppDisplay;
 import org.zanata.webtrans.client.view.AppView;
+import org.zanata.webtrans.client.view.DocumentListDisplay;
 import org.zanata.webtrans.client.view.DocumentListView;
 import org.zanata.webtrans.client.view.EditorOptionsDisplay;
 import org.zanata.webtrans.client.view.EditorOptionsView;
 import org.zanata.webtrans.client.view.GlossaryDetailsView;
+import org.zanata.webtrans.client.view.GlossaryDisplay;
 import org.zanata.webtrans.client.view.GlossaryView;
 import org.zanata.webtrans.client.view.KeyShortcutView;
 import org.zanata.webtrans.client.view.NotificationView;
 import org.zanata.webtrans.client.view.SearchResultsView;
+import org.zanata.webtrans.client.view.SideMenuDisplay;
 import org.zanata.webtrans.client.view.SideMenuView;
+import org.zanata.webtrans.client.view.SourceContentsDisplay;
+import org.zanata.webtrans.client.view.SourceContentsView;
 import org.zanata.webtrans.client.view.TargetContentsDisplay;
 import org.zanata.webtrans.client.view.TargetContentsView;
 import org.zanata.webtrans.client.view.TransMemoryDetailsDisplay;
 import org.zanata.webtrans.client.view.TransMemoryDetailsView;
 import org.zanata.webtrans.client.view.TransMemoryView;
 import org.zanata.webtrans.client.view.TransUnitNavigationDisplay;
+import org.zanata.webtrans.client.view.TransUnitNavigationView;
 import org.zanata.webtrans.client.view.TransUnitsTableDisplay;
 import org.zanata.webtrans.client.view.TransUnitsTableView;
-import org.zanata.webtrans.client.view.TransUnitNavigationView;
 import org.zanata.webtrans.client.view.TranslationEditorView;
+import org.zanata.webtrans.client.view.TranslationMemoryDisplay;
 import org.zanata.webtrans.client.view.TranslationView;
 import org.zanata.webtrans.client.view.ValidationOptionsView;
 import org.zanata.webtrans.client.view.WorkspaceUsersView;
@@ -117,13 +120,13 @@ protected void configure()
 
       bindPresenter(AppPresenter.class, AppDisplay.class, AppView.class);
       bindPresenter(KeyShortcutPresenter.class, KeyShortcutPresenter.Display.class, KeyShortcutView.class);
-      bindPresenter(DocumentListPresenter.class, DocumentListPresenter.Display.class, DocumentListView.class);
+      bindPresenter(DocumentListPresenter.class, DocumentListDisplay.class, DocumentListView.class);
       bindPresenter(SearchResultsPresenter.class, SearchResultsPresenter.Display.class, SearchResultsView.class);
       bindPresenter(TranslationPresenter.class, TranslationPresenter.Display.class, TranslationView.class);
       bindPresenter(TransFilterPresenter.class, TransFilterDisplay.class, TransFilterView.class);
       bindPresenter(WorkspaceUsersPresenter.class, WorkspaceUsersPresenter.Display.class, WorkspaceUsersView.class);
-      bindPresenter(TransMemoryPresenter.class, TransMemoryPresenter.Display.class, TransMemoryView.class);
-      bindPresenter(GlossaryPresenter.class, GlossaryPresenter.Display.class, GlossaryView.class);
+      bindPresenter(TransMemoryPresenter.class, TranslationMemoryDisplay.class, TransMemoryView.class);
+      bindPresenter(GlossaryPresenter.class, GlossaryDisplay.class, GlossaryView.class);
       bindPresenter(GlossaryDetailsPresenter.class, GlossaryDetailsPresenter.Display.class, GlossaryDetailsView.class);
       bindPresenter(TransMemoryDetailsPresenter.class, TransMemoryDetailsDisplay.class, TransMemoryDetailsView.class);
       bindPresenter(TransUnitNavigationPresenter.class, TransUnitNavigationDisplay.class, TransUnitNavigationView.class);

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
@@ -25,7 +25,6 @@
 import java.util.HashSet;
 
 import net.customware.gwt.presenter.client.EventBus;
-import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 import net.customware.gwt.presenter.client.widget.WidgetPresenter;
 
 import org.zanata.common.TransUnitCount;
@@ -42,46 +41,21 @@
 import org.zanata.webtrans.client.resources.WebTransMessages;
 import org.zanata.webtrans.client.ui.DocumentNode;
 import org.zanata.webtrans.client.ui.HasStatsFilter;
+import org.zanata.webtrans.client.view.DocumentListDisplay;
 import org.zanata.webtrans.shared.model.DocumentId;
 import org.zanata.webtrans.shared.model.DocumentInfo;
 import org.zanata.webtrans.shared.model.TransUnitUpdateInfo;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
 
 import com.allen_sauer.gwt.log.client.Log;
-import com.google.gwt.event.logical.shared.HasSelectionHandlers;
 import com.google.gwt.event.logical.shared.SelectionEvent;
-import com.google.gwt.view.client.HasData;
 import com.google.gwt.view.client.ListDataProvider;
 import com.google.gwt.view.client.SelectionChangeEvent;
 import com.google.gwt.view.client.SingleSelectionModel;
 import com.google.inject.Inject;
 
-public class DocumentListPresenter extends WidgetPresenter<DocumentListPresenter.Display> implements HasStatsFilter, HasDocumentListListener, DocumentSelectionHandler, TransUnitUpdatedEventHandler
+public class DocumentListPresenter extends WidgetPresenter<DocumentListDisplay> implements HasStatsFilter, DocumentListDisplay.Listener, DocumentSelectionHandler, TransUnitUpdatedEventHandler
 {
-
-   public interface Display extends WidgetDisplay
-   {
-      void setPageSize(int pageSize);
-
-      HasSelectionHandlers<DocumentInfo> getDocumentList();
-
-      HasData<DocumentNode> getDocumentListTable();
-
-      ListDataProvider<DocumentNode> getDataProvider();
-
-      void renderTable(SingleSelectionModel<DocumentNode> selectionModel);
-
-      String getSelectedStatsOption();
-
-      void addStatsOption(String item, String value);
-
-      void setStatsFilter(String option);
-
-      void setListener(HasDocumentListListener documentListPresenter);
-
-      void updateFilter(boolean docFilterCaseSensitive, boolean docFilterExact, String docFilterText);
-   }
-
    private static final int PAGE_SIZE = 20;
 
    private final UserWorkspaceContext userworkspaceContext;
@@ -125,7 +99,7 @@ public void setSelected(DocumentNode object, boolean selected)
    };
 
    @Inject
-   public DocumentListPresenter(final Display display, EventBus eventBus, UserWorkspaceContext userworkspaceContext, final WebTransMessages messages, History history)
+   public DocumentListPresenter(DocumentListDisplay display, EventBus eventBus, UserWorkspaceContext userworkspaceContext, final WebTransMessages messages, History history)
    {
       super(display, eventBus);
       this.userworkspaceContext = userworkspaceContext;

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
@@ -10,6 +10,7 @@
 import org.zanata.webtrans.client.events.NotificationEvent.Severity;
 import org.zanata.webtrans.client.resources.UiMessages;
 import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
+import org.zanata.webtrans.client.view.GlossaryDisplay;
 import org.zanata.webtrans.shared.model.GlossaryDetails;
 import org.zanata.webtrans.shared.model.GlossaryResultItem;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
@@ -91,7 +92,7 @@ public interface Display extends WidgetDisplay
 
    private final UserWorkspaceContext userWorkspaceContext;
 
-   private GlossaryPresenterListener glossaryListener;
+   private GlossaryDisplay.Listener glossaryListener;
 
    @Inject
    public GlossaryDetailsPresenter(final Display display, final EventBus eventBus, final UiMessages messages, final CachingDispatchAsync dispatcher, final UserWorkspaceContext userWorkspaceContext)
@@ -240,7 +241,7 @@ public void onRevealDisplay()
    {
    }
 
-   public void setGlossaryListener(GlossaryPresenterListener glossaryListener)
+   public void setGlossaryListener(GlossaryDisplay.Listener glossaryListener)
    {
       this.glossaryListener = glossaryListener;
    }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
@@ -20,10 +20,7 @@
  */
 package org.zanata.webtrans.client.presenter;
 
-import java.util.ArrayList;
-
 import net.customware.gwt.presenter.client.EventBus;
-import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 import net.customware.gwt.presenter.client.widget.WidgetPresenter;
 
 import org.zanata.common.LocaleId;
@@ -37,6 +34,7 @@
 import org.zanata.webtrans.client.keys.ShortcutContext;
 import org.zanata.webtrans.client.resources.WebTransMessages;
 import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
+import org.zanata.webtrans.client.view.GlossaryDisplay;
 import org.zanata.webtrans.shared.model.GlossaryResultItem;
 import org.zanata.webtrans.shared.model.TransUnit;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
@@ -47,16 +45,14 @@
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.HasText;
-import com.google.gwt.user.client.ui.HasValue;
 import com.google.inject.Inject;
 
 /**
  * 
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
  * 
  **/
-public class GlossaryPresenter extends WidgetPresenter<GlossaryPresenter.Display> implements GlossaryPresenterListener, TransUnitSelectionHandler
+public class GlossaryPresenter extends WidgetPresenter<GlossaryDisplay> implements GlossaryDisplay.Listener, TransUnitSelectionHandler
 {
    private final UserWorkspaceContext userWorkspaceContext;
    private final CachingDispatchAsync dispatcher;
@@ -68,25 +64,8 @@ public class GlossaryPresenter extends WidgetPresenter<GlossaryPresenter.Display
 
    private boolean isFocused;
 
-   public interface Display extends WidgetDisplay
-   {
-      HasText getGlossaryTextBox();
-
-      HasValue<SearchType> getSearchType();
-
-      void startProcessing();
-
-      void renderTable(ArrayList<GlossaryResultItem> glossaries);
-
-      void setListener(GlossaryPresenterListener listener);
-
-      void stopProcessing(boolean showResult);
-
-      void clearTableContent();
-   }
-
    @Inject
-   public GlossaryPresenter(Display display, EventBus eventBus, CachingDispatchAsync dispatcher, final WebTransMessages messages, GlossaryDetailsPresenter glossaryDetailsPresenter, UserWorkspaceContext userWorkspaceContext, KeyShortcutPresenter keyShortcutPresenter)
+   public GlossaryPresenter(GlossaryDisplay display, EventBus eventBus, CachingDispatchAsync dispatcher, final WebTransMessages messages, GlossaryDetailsPresenter glossaryDetailsPresenter, UserWorkspaceContext userWorkspaceContext, KeyShortcutPresenter keyShortcutPresenter)
    {
       super(display, eventBus);
       this.dispatcher = dispatcher;

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenterListener.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenterListener.java
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentListListener.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentListListener.java
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
@@ -4,7 +4,6 @@
 import java.util.List;
 
 import net.customware.gwt.presenter.client.EventBus;
-import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 import net.customware.gwt.presenter.client.widget.WidgetPresenter;
 
 import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
@@ -19,6 +18,7 @@
 import org.zanata.webtrans.client.keys.ShortcutContext;
 import org.zanata.webtrans.client.resources.WebTransMessages;
 import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
+import org.zanata.webtrans.client.view.TranslationMemoryDisplay;
 import org.zanata.webtrans.shared.model.TransMemoryQuery;
 import org.zanata.webtrans.shared.model.TransMemoryResultItem;
 import org.zanata.webtrans.shared.model.TransUnit;
@@ -30,31 +30,10 @@
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.HasText;
-import com.google.gwt.user.client.ui.HasValue;
 import com.google.inject.Inject;
 
-public class TransMemoryPresenter extends WidgetPresenter<TransMemoryPresenter.Display> implements TranslationMemoryListener, TransUnitSelectionHandler, TransMemoryShorcutCopyHandler
+public class TransMemoryPresenter extends WidgetPresenter<TranslationMemoryDisplay> implements TranslationMemoryDisplay.Listener, TransUnitSelectionHandler, TransMemoryShorcutCopyHandler
 {
-   public interface Display extends WidgetDisplay
-   {
-      HasValue<SearchType> getSearchType();
-
-      HasText getTmTextBox();
-
-      void startProcessing();
-
-      void renderTable(ArrayList<TransMemoryResultItem> memories, List<String> queries);
-
-      void setListener(TranslationMemoryListener listener);
-
-      void stopProcessing(boolean showResult);
-
-      void clearTableContent();
-
-      void showDiffLegend(boolean show);
-   }
-
    private final UserWorkspaceContext userWorkspaceContext;
    private final CachingDispatchAsync dispatcher;
 
@@ -71,7 +50,7 @@ public interface Display extends WidgetDisplay
    private ArrayList<TransMemoryResultItem> currentResult;
 
    @Inject
-   public TransMemoryPresenter(Display display, EventBus eventBus, CachingDispatchAsync dispatcher, final WebTransMessages messages, TransMemoryDetailsPresenter tmInfoPresenter, UserWorkspaceContext userWorkspaceContext, TransMemoryMergePresenter transMemoryMergePresenter, KeyShortcutPresenter keyShortcutPresenter)
+   public TransMemoryPresenter(TranslationMemoryDisplay display, EventBus eventBus, CachingDispatchAsync dispatcher, final WebTransMessages messages, TransMemoryDetailsPresenter tmInfoPresenter, UserWorkspaceContext userWorkspaceContext, TransMemoryMergePresenter transMemoryMergePresenter, KeyShortcutPresenter keyShortcutPresenter)
    {
       super(display, eventBus);
       this.dispatcher = dispatcher;

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationMemoryListener.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationMemoryListener.java
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
@@ -21,7 +21,6 @@
 package org.zanata.webtrans.client.view;
 
 import org.zanata.common.TranslationStats;
-import org.zanata.webtrans.client.presenter.DocumentListPresenter;
 import org.zanata.webtrans.client.presenter.MainView;
 import org.zanata.webtrans.client.presenter.SearchResultsPresenter;
 import org.zanata.webtrans.client.presenter.TranslationPresenter;
@@ -96,7 +95,7 @@ interface Styles extends CssResource
    private final static String STYLE_MINIMIZE = "icon-resize-small-2";
 
    @Inject
-   public AppView(Resources resources, WebTransMessages messages, DocumentListPresenter.Display documentListView, SearchResultsPresenter.Display searchResultsView, TranslationPresenter.Display translationView, SideMenuDisplay sideMenuView, final Identity identity)
+   public AppView(Resources resources, WebTransMessages messages, DocumentListDisplay documentListView, SearchResultsPresenter.Display searchResultsView, TranslationPresenter.Display translationView, SideMenuDisplay sideMenuView, final Identity identity)
    {
       this.resources = resources;
       this.messages = messages;