rhbz953734 - refactor to move TransUnitSaveService out of TransUnitsT…

…ablePresenter
zanata · May 17, 2013 · 5ae7f3f · 5ae7f3f
1 parent e1aeeb8
commit 5ae7f3f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java b/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
@@ -200,6 +200,7 @@ public void onSuccess(GetDocumentListResult result)
 
             documentListPresenter.queryStats();
             documentListPresenter.showLoading(false);
+            injector.getTransUnitSaveService().init();
 
             stopwatch.stop();
          }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java b/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java
@@ -11,6 +11,7 @@
 import org.zanata.webtrans.client.presenter.UserConfigHolder;
 import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
 import org.zanata.webtrans.client.service.HistoryEventHandlerService;
+import org.zanata.webtrans.client.service.TransUnitSaveService;
 import org.zanata.webtrans.client.service.ValidationService;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
 
@@ -45,4 +46,6 @@ public interface WebTransGinjector extends Ginjector
    TargetContentsPresenter getTargetContentsPresenter();
 
    ValidationService getValidationService();
+
+   TransUnitSaveService getTransUnitSaveService();
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
@@ -123,10 +123,9 @@ public TransUnitsTablePresenter(TransUnitsTableDisplay display, EventBus eventBu
                                    SourceContentsPresenter sourceContentsPresenter,
                                    TargetContentsPresenter targetContentsPresenter,
                                    TranslatorInteractionService translatorService,
-                                   TransUnitSaveService transUnitSaveService,
                                    TranslationHistoryPresenter translationHistoryPresenter,
                                    Provider<GoToRowLink> goToRowLinkProvider,
-                                   WebTransMessages messages,UserOptionsService userOptionsService)
+                                   WebTransMessages messages, UserOptionsService userOptionsService)
    // @formatter:on
    {
       super(display, eventBus);
@@ -144,12 +143,6 @@ public TransUnitsTablePresenter(TransUnitsTableDisplay display, EventBus eventBu
       this.targetContentsPresenter = targetContentsPresenter;
       this.translatorService = translatorService;
       this.userOptionsService = userOptionsService;
-
-      // we register it here because we can't use eager singleton on it (it
-      // references TargetContentsPresenter). And if it's not eagerly created,
-      // it won't get created at all!!
-      eventBus.addHandler(TransUnitSaveEvent.TYPE, transUnitSaveService);
-      eventBus.addHandler(CheckStateHasChangedEvent.TYPE, transUnitSaveService);
    }
 
    @Override

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
@@ -82,6 +82,12 @@ public TransUnitSaveService(EventBus eventBus, CachingDispatchAsync dispatcher,
       this.queue = queue;
    }
 
+   public void init()
+   {
+      eventBus.addHandler(TransUnitSaveEvent.TYPE, this);
+      eventBus.addHandler(CheckStateHasChangedEvent.TYPE, this);
+   }
+
    @Override
    public void onTransUnitSave(TransUnitSaveEvent event)
    {

diff --git a/...-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java b/...-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
@@ -74,8 +74,6 @@ public class TransUnitsTablePresenterTest
    @Mock
    private TranslatorInteractionService translatorService;
    @Mock
-   private TransUnitSaveService saveService;
-   @Mock
    private WebTransMessages messages;
    @Mock
    private TranslationHistoryPresenter translationHistoryPresenter;
@@ -91,13 +89,11 @@ public class TransUnitsTablePresenterTest
    public void setUp() throws Exception
    {
       MockitoAnnotations.initMocks(this);
-      presenter = new TransUnitsTablePresenter(display, eventBus, navigationService, sourceContentsPresenter, targetContentsPresenter, translatorService, saveService, translationHistoryPresenter, goToRowProvider, messages, userOptionsService);
+      presenter = new TransUnitsTablePresenter(display, eventBus, navigationService, sourceContentsPresenter, targetContentsPresenter, translatorService, translationHistoryPresenter, goToRowProvider, messages, userOptionsService);
 
       verify(display).setRowSelectionListener(presenter);
       verify(display).addFilterConfirmationHandler(presenter);
       verify(navigationService).addPageDataChangeListener(presenter);
-      verify(eventBus).addHandler(TransUnitSaveEvent.TYPE, saveService);
-      verify(eventBus).addHandler(CheckStateHasChangedEvent.TYPE, saveService);
    }
 
    @Test