[zanata/zanata-server] 862493: rhbz953734 - refactor content state

[GitHub]

  Branch: refs/heads/review-2-rhbz953734
  Home:   https://github.com/zanata/zanata-server
  Commit: 862493bd3c72072f3c8c65a2bf462823332f1b45
      https://github.com/zanata/zanata-server/commit/862493bd3c72072f3c8c65a2bf462823332f1b45
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java

  Log Message:
  -----------
  rhbz953734 - refactor content state

- change Approved to Translated and add Approved to 4th, Rejected to 5th in ContentState