[zanata/zanata] 8149d0: fix post merge compile error

[GitHub]

  Branch: refs/heads/editorRewrite
  Home:   https://github.com/zanata/zanata
  Commit: 8149d061d7d7a61ad1973547a9ee8f55f66eb24a
      https://github.com/zanata/zanata/commit/8149d061d7d7a61ad1973547a9ee8f55f66eb24a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-01 (Sun, 01 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java

  Log Message:
  -----------
  fix post merge compile error


  Commit: 49e7c3135b2bb0b85a6b0003be856ee2651c4d0c
      https://github.com/zanata/zanata/commit/49e7c3135b2bb0b85a6b0003be856ee2651c4d0c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-01 (Sun, 01 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java

  Log Message:
  -----------
  concurrent edit prevention


  Commit: 231302dc35ef9910e7c6e2c932218230576e5635
      https://github.com/zanata/zanata/commit/231302dc35ef9910e7c6e2c932218230576e5635
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-01 (Sun, 01 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  add concurrent translator display to editor and remove unused mothods


Compare: https://github.com/zanata/zanata/compare/fc3cfee0b6d7...231302dc35ef