Merge branch 'master' of github.com:zanata/zanata into integration/ma…

…ster
zanata · May 4, 2012 · cc082ee · cc082ee
2 parents 1b4b278 + 9f8b1e0
commit cc082ee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/...anata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java b/...anata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
@@ -78,7 +78,7 @@
 import org.zanata.webtrans.shared.rpc.GetTransUnitsNavigation;
 import org.zanata.webtrans.shared.rpc.GetTransUnitsNavigationResult;
 import org.zanata.webtrans.shared.rpc.TranslatorStatusUpdateAction;
-import org.zanata.webtrans.shared.rpc.TranslatorUpdateStatusResult;
+import org.zanata.webtrans.shared.rpc.TranslatorStatusUpdateResult;
 import org.zanata.webtrans.shared.rpc.UpdateTransUnit;
 import org.zanata.webtrans.shared.rpc.UpdateTransUnitResult;
 
@@ -1173,15 +1173,15 @@ public void execute()
                eventBus.fireEvent(new TransUnitSelectionEvent(selectedTransUnit));
                display.getTargetCellEditor().savePendingChange(true);
 
-               dispatcher.execute(new TranslatorStatusUpdateAction(identity.getPerson(), selectedTransUnit), new AsyncCallback<TranslatorUpdateStatusResult>()
+               dispatcher.execute(new TranslatorStatusUpdateAction(identity.getPerson(), selectedTransUnit), new AsyncCallback<TranslatorStatusUpdateResult>()
                {
                   @Override
                   public void onFailure(Throwable caught)
                   {
                   }
 
                   @Override
-                  public void onSuccess(TranslatorUpdateStatusResult result)
+                  public void onSuccess(TranslatorStatusUpdateResult result)
                   {
                   }
                });

diff --git a/...anata-war/src/main/java/org/zanata/webtrans/server/rpc/TranslatorStatusUpdateHandler.java b/...anata-war/src/main/java/org/zanata/webtrans/server/rpc/TranslatorStatusUpdateHandler.java
@@ -34,18 +34,18 @@
 import org.zanata.webtrans.server.TranslationWorkspaceManager;
 import org.zanata.webtrans.shared.rpc.TranslatorStatusUpdate;
 import org.zanata.webtrans.shared.rpc.TranslatorStatusUpdateAction;
-import org.zanata.webtrans.shared.rpc.TranslatorUpdateStatusResult;
+import org.zanata.webtrans.shared.rpc.TranslatorStatusUpdateResult;
 
 @Name("webtrans.gwt.TranslatorStatusUpdateHandler")
 @Scope(ScopeType.STATELESS)
 @ActionHandlerFor(TranslatorStatusUpdateAction.class)
-public class TranslatorStatusUpdateHandler extends AbstractActionHandler<TranslatorStatusUpdateAction, TranslatorUpdateStatusResult>
+public class TranslatorStatusUpdateHandler extends AbstractActionHandler<TranslatorStatusUpdateAction, TranslatorStatusUpdateResult>
 {
    @In
    private TranslationWorkspaceManager translationWorkspaceManager;
 
    @Override
-   public TranslatorUpdateStatusResult execute(TranslatorStatusUpdateAction action, ExecutionContext context) throws ActionException
+   public TranslatorStatusUpdateResult execute(TranslatorStatusUpdateAction action, ExecutionContext context) throws ActionException
    {
       ZanataIdentity.instance().checkLoggedIn();
 
@@ -55,11 +55,11 @@ public TranslatorUpdateStatusResult execute(TranslatorStatusUpdateAction action,
       TranslatorStatusUpdate event = new TranslatorStatusUpdate(action.getSessionId(), action.getPerson(), action.getSelectedTransUnit());
       workspace.publish(event);
 
-      return new TranslatorUpdateStatusResult();
+      return new TranslatorStatusUpdateResult();
    }
 
    @Override
-   public void rollback(TranslatorStatusUpdateAction action, TranslatorUpdateStatusResult result, ExecutionContext context) throws ActionException
+   public void rollback(TranslatorStatusUpdateAction action, TranslatorStatusUpdateResult result, ExecutionContext context) throws ActionException
    {
    }
 

diff --git a/...zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateAction.java b/...zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateAction.java
@@ -7,7 +7,7 @@
 import net.customware.gwt.dispatch.shared.Result;
 
 
-public class TranslatorStatusUpdateAction extends AbstractWorkspaceAction<TranslatorUpdateStatusResult>
+public class TranslatorStatusUpdateAction extends AbstractWorkspaceAction<TranslatorStatusUpdateResult>
 {
    private static final long serialVersionUID = -9165857458963498055L;
 

diff --git a/...red/rpc/TranslatorUpdateStatusResult.java → ...red/rpc/TranslatorStatusUpdateResult.java b/...red/rpc/TranslatorUpdateStatusResult.java → ...red/rpc/TranslatorStatusUpdateResult.java
@@ -2,12 +2,12 @@
 
 import net.customware.gwt.dispatch.shared.Result;
 
-public class TranslatorUpdateStatusResult implements Result
+public class TranslatorStatusUpdateResult implements Result
 {
    private static final long serialVersionUID = -950617414456103445L;
 
    @SuppressWarnings("unused")
-   public TranslatorUpdateStatusResult()
+   public TranslatorStatusUpdateResult()
    {
    }
 }