[zanata/zanata-server] c471da: Create MergeOptions to hold a group of MergeOption

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: c471da3527dbd4cdc623e9466e64ebf89a39bea6
      https://github.com/zanata/zanata-server/commit/c471da3527dbd4cdc623e9466e64ebf89a39bea6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Create MergeOptions to hold a group of MergeOption


  Commit: 9ce0095f7fa551cefe647277431346533ac1722f
      https://github.com/zanata/zanata-server/commit/9ce0095f7fa551cefe647277431346533ac1722f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Rename MergeOption to MergeRule


Compare: https://github.com/zanata/zanata-server/compare/cc51b96c1be6...9ce0095f7fa5