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

…tegration/master
zanata · Oct 3, 2012 · c653edb · c653edb
2 parents 2fa4862 + 76a46ff
commit c653edb
Show file tree

Hide file tree

Showing 31 changed files with 517 additions and 108 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
@@ -15,8 +15,8 @@
 import org.zanata.webtrans.shared.auth.Identity;
 import org.zanata.webtrans.shared.model.Person;
 import org.zanata.webtrans.shared.rpc.HasWorkspaceChatData.MESSAGE_TYPE;
+import org.zanata.webtrans.shared.rpc.NoOpResult;
 import org.zanata.webtrans.shared.rpc.PublishWorkspaceChatAction;
-import org.zanata.webtrans.shared.rpc.PublishWorkspaceChatResult;
 import com.google.common.base.Strings;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.inject.Inject;
@@ -74,7 +74,7 @@ protected void dispatchChatAction(String person, String msg, MESSAGE_TYPE messag
    {
       if (!Strings.isNullOrEmpty(msg))
       {
-         dispatcher.execute(new PublishWorkspaceChatAction(person, msg, messageType), new NoOpAsyncCallback<PublishWorkspaceChatResult>());
+         dispatcher.execute(new PublishWorkspaceChatAction(person, msg, messageType), new NoOpAsyncCallback<NoOpResult>());
          display.setChatInputText("");
       }
    }

diff --git a/...ta-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java b/...ta-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java
@@ -27,8 +27,8 @@
 import org.zanata.webtrans.shared.auth.Identity;
 import org.zanata.webtrans.shared.model.Person;
 import org.zanata.webtrans.shared.model.TransUnit;
+import org.zanata.webtrans.shared.rpc.NoOpResult;
 import org.zanata.webtrans.shared.rpc.TransUnitEditAction;
-import org.zanata.webtrans.shared.rpc.TransUnitEditResult;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -50,7 +50,7 @@ public TranslatorInteractionService(Identity identity, CachingDispatchAsync disp
 
    public void transUnitSelected(TransUnit selectedTransUnit)
    {
-      dispatcher.execute(new TransUnitEditAction(identity.getPerson(), selectedTransUnit), new NoOpAsyncCallback<TransUnitEditResult>());
+      dispatcher.execute(new TransUnitEditAction(identity.getPerson(), selectedTransUnit), new NoOpAsyncCallback<NoOpResult>());
    }
 
    public EditorClientId getCurrentEditorClientId()
@@ -62,7 +62,7 @@ public void personExit(Person person, TransUnit selectedTransUnit)
    {
       if (selectedTransUnit != null)
       {
-         dispatcher.execute(new TransUnitEditAction(person, selectedTransUnit), new NoOpAsyncCallback<TransUnitEditResult>());
+         dispatcher.execute(new TransUnitEditAction(person, selectedTransUnit), new NoOpAsyncCallback<NoOpResult>());
       }
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
@@ -32,7 +32,6 @@
         .targetContainer {
             width: 100%;
             height: 100%;
-            table-layout: fixed;
         }
 
     </ui:style>

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java
@@ -19,14 +19,16 @@
 @ActionHandlerFor(EventServiceConnectedAction.class)
 public class EventServiceConnectedHandler extends AbstractActionHandler<EventServiceConnectedAction, NoOpResult>
 {
+   @In
+   private ZanataIdentity identity;
 
    @In
-   TranslationWorkspaceManager translationWorkspaceManager;
+   private TranslationWorkspaceManager translationWorkspaceManager;
 
    @Override
    public NoOpResult execute(EventServiceConnectedAction action, ExecutionContext context) throws ActionException
    {
-      ZanataIdentity.instance().checkLoggedIn();
+      identity.checkLoggedIn();
       TranslationWorkspace workspace = translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId());
       workspace.onEventServiceConnected(action.getEditorClientId(), action.getConnectionId());
       return new NoOpResult();

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java
@@ -19,15 +19,17 @@
 @ActionHandlerFor(ExitWorkspaceAction.class)
 public class ExitWorkspaceHandler extends AbstractActionHandler<ExitWorkspaceAction, ExitWorkspaceResult>
 {
+   @In
+   private ZanataIdentity identity;
 
    @In
-   TranslationWorkspaceManager translationWorkspaceManager;
+   private TranslationWorkspaceManager translationWorkspaceManager;
 
    @Override
    public ExitWorkspaceResult execute(ExitWorkspaceAction action, ExecutionContext context) throws ActionException
    {
 
-      ZanataIdentity.instance().checkLoggedIn();
+      identity.checkLoggedIn();
 
       TranslationWorkspace workspace = translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId());
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetStatusCountHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetStatusCountHandler.java
@@ -24,21 +24,16 @@
 @ActionHandlerFor(GetStatusCount.class)
 public class GetStatusCountHandler extends AbstractActionHandler<GetStatusCount, GetStatusCountResult>
 {
-
-   @In
-   Session session;
-
    @In
-   TranslationWorkspaceManager translationWorkspaceManager;
+   private ZanataIdentity identity;
 
    @In
-   DocumentDAO documentDAO;
+   private DocumentDAO documentDAO;
 
    @Override
    public GetStatusCountResult execute(GetStatusCount action, ExecutionContext context) throws ActionException
    {
-
-      ZanataIdentity.instance().checkLoggedIn();
+      identity.checkLoggedIn();
 
       Long docId = action.getDocumentId().getValue();
       LocaleId localeId = action.getWorkspaceId().getLocaleId();

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java
@@ -27,6 +27,7 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
+import org.zanata.security.ZanataIdentity;
 import org.zanata.webtrans.server.ActionHandlerFor;
 import org.zanata.webtrans.shared.model.TransUnitUpdatePreview;
 import org.zanata.webtrans.shared.model.TransUnitUpdateRequest;
@@ -37,7 +38,7 @@
 import net.customware.gwt.dispatch.shared.ActionException;
 
 /**
- * Show the result of a {@link ReplaceText} action without making any persistent
+ * Show the result of a {@link org.zanata.webtrans.shared.rpc.ReplaceText} action without making any persistent
  * changes.
  * 
  * @author David Mason, damason@redhat.com
@@ -48,13 +49,14 @@
 @ActionHandlerFor(PreviewReplaceText.class)
 public class PreviewReplaceTextHandler extends AbstractActionHandler<PreviewReplaceText, PreviewReplaceTextResult>
 {
-
-   @In(value = "webtrans.gwt.UpdateTransUnitHandler", create = true)
-   UpdateTransUnitHandler updateTransUnitHandler;
+   @In
+   private ZanataIdentity identity;
 
    @Override
    public PreviewReplaceTextResult execute(PreviewReplaceText previewAction, ExecutionContext context) throws ActionException
    {
+      identity.checkLoggedIn();
+
       ReplaceTextHandler.replaceTextInUpdateRequests(previewAction.getAction());
       List<TransUnitUpdatePreview> previews = new ArrayList<TransUnitUpdatePreview>();
       for (TransUnitUpdateRequest request : previewAction.getAction().getUpdateRequests())

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
@@ -35,22 +35,25 @@
 import org.zanata.webtrans.server.ActionHandlerFor;
 import org.zanata.webtrans.server.TranslationWorkspace;
 import org.zanata.webtrans.server.TranslationWorkspaceManager;
+import org.zanata.webtrans.shared.rpc.NoOpResult;
 import org.zanata.webtrans.shared.rpc.PublishWorkspaceChat;
 import org.zanata.webtrans.shared.rpc.PublishWorkspaceChatAction;
-import org.zanata.webtrans.shared.rpc.PublishWorkspaceChatResult;
 
 @Name("webtrans.gwt.PublishWorkspaceChatHandler")
 @Scope(ScopeType.STATELESS)
 @ActionHandlerFor(PublishWorkspaceChatAction.class)
-public class PublishWorkspaceChatHandler extends AbstractActionHandler<PublishWorkspaceChatAction, PublishWorkspaceChatResult>
+public class PublishWorkspaceChatHandler extends AbstractActionHandler<PublishWorkspaceChatAction, NoOpResult>
 {
+   @In
+   private ZanataIdentity identity;
+
    @In
    private TranslationWorkspaceManager translationWorkspaceManager;
 
    @Override
-   public PublishWorkspaceChatResult execute(PublishWorkspaceChatAction action, ExecutionContext context) throws ActionException
+   public NoOpResult execute(PublishWorkspaceChatAction action, ExecutionContext context) throws ActionException
    {
-      ZanataIdentity.instance().checkLoggedIn();
+      identity.checkLoggedIn();
 
       TranslationWorkspace workspace = translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId());
       // Send PublishWorkspaceChat event to client
@@ -61,11 +64,11 @@ public PublishWorkspaceChatResult execute(PublishWorkspaceChatAction action, Exe
       PublishWorkspaceChat event = new PublishWorkspaceChat(action.getPerson(), formatter.format(currentDate), action.getMsg(), action.getMessageType());
       workspace.publish(event);
 
-      return new PublishWorkspaceChatResult();
+      return new NoOpResult();
    }
 
    @Override
-   public void rollback(PublishWorkspaceChatAction action, PublishWorkspaceChatResult result, ExecutionContext context) throws ActionException
+   public void rollback(PublishWorkspaceChatAction action, NoOpResult result, ExecutionContext context) throws ActionException
    {
    }
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java
@@ -32,22 +32,25 @@
 import org.zanata.webtrans.server.ActionHandlerFor;
 import org.zanata.webtrans.server.TranslationWorkspace;
 import org.zanata.webtrans.server.TranslationWorkspaceManager;
+import org.zanata.webtrans.shared.rpc.NoOpResult;
 import org.zanata.webtrans.shared.rpc.TransUnitEdit;
 import org.zanata.webtrans.shared.rpc.TransUnitEditAction;
-import org.zanata.webtrans.shared.rpc.TransUnitEditResult;
 
 @Name("webtrans.gwt.TransUnitEditHandler")
 @Scope(ScopeType.STATELESS)
 @ActionHandlerFor(TransUnitEditAction.class)
-public class TransUnitEditHandler extends AbstractActionHandler<TransUnitEditAction, TransUnitEditResult>
+public class TransUnitEditHandler extends AbstractActionHandler<TransUnitEditAction, NoOpResult>
 {
+   @In
+   private ZanataIdentity identity;
+
    @In
    private TranslationWorkspaceManager translationWorkspaceManager;
 
    @Override
-   public TransUnitEditResult execute(TransUnitEditAction action, ExecutionContext context) throws ActionException
+   public NoOpResult execute(TransUnitEditAction action, ExecutionContext context) throws ActionException
    {
-      ZanataIdentity.instance().checkLoggedIn();
+      identity.checkLoggedIn();
 
       TranslationWorkspace workspace = translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId());
       // Send TranslatorStatusUpdate event to client
@@ -57,11 +60,11 @@ public TransUnitEditResult execute(TransUnitEditAction action, ExecutionContext
 
       workspace.publish(event);
 
-      return new TransUnitEditResult();
+      return new NoOpResult();
    }
 
    @Override
-   public void rollback(TransUnitEditAction action, TransUnitEditResult result, ExecutionContext context) throws ActionException
+   public void rollback(TransUnitEditAction action, NoOpResult result, ExecutionContext context) throws ActionException
    {
    }
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonSessionDetails.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonSessionDetails.java
@@ -1,5 +1,6 @@
 package org.zanata.webtrans.shared.model;
 
+import com.google.common.base.Objects;
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 public class PersonSessionDetails implements IsSerializable
@@ -52,19 +53,30 @@ public int hashCode()
    public boolean equals(Object obj)
    {
       if (this == obj)
+      {
          return true;
+      }
       if (obj == null)
+      {
          return false;
+      }
       if (getClass() != obj.getClass())
+      {
          return false;
+      }
       PersonSessionDetails other = (PersonSessionDetails) obj;
+//      return Objects.equal(person, other.person);
       if (person == null)
       {
          if (other.person != null)
+         {
             return false;
+         }
       }
       else if (!person.equals(other.person))
+      {
          return false;
+      }
       return true;
    }
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
@@ -2,7 +2,7 @@
 
 import org.zanata.webtrans.shared.rpc.HasWorkspaceChatData.MESSAGE_TYPE;
 
-public class PublishWorkspaceChatAction extends AbstractWorkspaceAction<PublishWorkspaceChatResult>
+public class PublishWorkspaceChatAction extends AbstractWorkspaceAction<NoOpResult>
 {
    private static final long serialVersionUID = -8145724589597122017L;
    private String person;

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatResult.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatResult.java
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditAction.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditAction.java
@@ -4,7 +4,7 @@
 import org.zanata.webtrans.shared.model.TransUnit;
 
 
-public class TransUnitEditAction extends AbstractWorkspaceAction<TransUnitEditResult>
+public class TransUnitEditAction extends AbstractWorkspaceAction<NoOpResult>
 {
    private static final long serialVersionUID = -9165857458963498055L;
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditResult.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditResult.java
diff --git a/zanata-war/src/test/java/org/zanata/model/TestFixture.java b/zanata-war/src/test/java/org/zanata/model/TestFixture.java
@@ -28,6 +28,8 @@
 import org.zanata.common.ContentType;
 import org.zanata.common.LocaleId;
 
+import org.zanata.webtrans.shared.model.Person;
+import org.zanata.webtrans.shared.model.PersonId;
 import org.zanata.webtrans.shared.model.ProjectIterationId;
 import org.zanata.webtrans.shared.model.TransUnit;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
@@ -88,18 +90,29 @@ public static HTextFlow makeHTextFlow(long id, HLocale hLocale, ContentState con
 
    public static UserWorkspaceContext userWorkspaceContext()
    {
-      return userWorkspaceContext(true, true, "project", "master");
+      return userWorkspaceContext(true, true);
    }
 
    public static UserWorkspaceContext userWorkspaceContext(boolean projectActive, boolean hasWriteAccess, String projectSlug, String iterationSlug)
    {
-      return new UserWorkspaceContext(workspaceContext(new LocaleId("en-US")), projectActive, hasWriteAccess, true);
+      ProjectIterationId projectIterationId = new ProjectIterationId(projectSlug, iterationSlug);
+      return new UserWorkspaceContext(new WorkspaceContext(new WorkspaceId(projectIterationId, LocaleId.EN_US), "workspaceName", LocaleId.EN_US.getId()), projectActive, hasWriteAccess, true);
    }
 
-   public static WorkspaceContext workspaceContext(LocaleId localeId)
+   public static UserWorkspaceContext userWorkspaceContext(boolean projectActive, boolean hasWriteAccess)
+   {
+      return new UserWorkspaceContext(new WorkspaceContext(workspaceId(), "workspaceName", LocaleId.EN_US.getId()), projectActive, hasWriteAccess, true);
+   }
+
+   public static WorkspaceId workspaceId()
    {
       ProjectIterationId projectIterationId = new ProjectIterationId("project", "master");
-      return new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId());
+      return new WorkspaceId(projectIterationId, LocaleId.EN_US);
+   }
+
+   public static Person person()
+   {
+      return new Person(new PersonId("pid"), "admin", null);
    }
 
    public static  <E extends GwtEvent<?>> E extractFromEvents(List<? extends GwtEvent> events, final Class<E> eventType)

diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
@@ -63,7 +63,7 @@ public class AppPresenterTest
    private DocumentListPresenter documentListPresenter;
    @Mock
    private SearchResultsPresenter searchResultPresenter;
-   private UserWorkspaceContext userWorkspace = TestFixture.userWorkspaceContext(true, true, "project", "master");
+   private UserWorkspaceContext userWorkspace = TestFixture.userWorkspaceContext();
    @Mock
    private WebTransMessages messages;
    @Mock

diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.java
@@ -70,7 +70,7 @@ public void testUpdateEditorTranslatorsWithConcurrentEdit()
       when(sessionService.getUserSessionMap()).thenReturn(sessionMap);
       when(sessionService.getColor(editorClientId)).thenReturn("red");
       when(panelSessionItem.getSelectedTransUnit()).thenReturn(TestFixture.makeTransUnit(1));
-      Person person = new Person(new PersonId("pid"), "admin", null);
+      Person person = TestFixture.person();
       when(panelSessionItem.getPerson()).thenReturn(person);
       EditorClientId ourClientId = new EditorClientId("another client id", 2);
       when(identity.getEditorClientId()).thenReturn(ourClientId);
@@ -92,7 +92,7 @@ public void testUpdateEditorTranslatorsWithoutConcurrentEdit()
       when(sessionService.getUserSessionMap()).thenReturn(sessionMap);
       when(sessionService.getColor(editorClientId)).thenReturn("red");
       when(panelSessionItem.getSelectedTransUnit()).thenReturn(TestFixture.makeTransUnit(1));
-      Person person = new Person(new PersonId("pid"), "admin", null);
+      Person person = TestFixture.person();
       when(panelSessionItem.getPerson()).thenReturn(person);
       EditorClientId ourClientId = new EditorClientId("another client id", 2);
       when(identity.getEditorClientId()).thenReturn(ourClientId);

diff --git a/...a-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java b/...a-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
@@ -130,7 +130,7 @@ public void beforeMethod()
    {
       MockitoAnnotations.initMocks(this);
       configHolder = new UserConfigHolder();
-      userWorkspaceContext = TestFixture.userWorkspaceContext(true, true, "project", "master");
+      userWorkspaceContext = TestFixture.userWorkspaceContext();
       presenter = new TargetContentsPresenter(displayProvider, editorTranslators, eventBus, tableEditorMessages, sourceContentPresenter, configHolder, userWorkspaceContext, editorKeyShortcuts, historyPresenter);
 
       verify(eventBus).addHandler(UserConfigChangeEvent.getType(), presenter);