[zanata/zanata] ddce34: refactor TransMemory Presenter and View for testab...

[GitHub]

  Branch: refs/heads/rhbz788294
  Home:   https://github.com/zanata/zanata
  Commit: ddce34b193afc4e45eb90cf8794f80af45fabc87
      https://github.com/zanata/zanata/commit/ddce34b193afc4e45eb90cf8794f80af45fabc87
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml

  Log Message:
  -----------
  refactor TransMemory Presenter and View for testability


  Commit: e091c3dcbd9e4cf44eb1f616aa9b23f714a91676
      https://github.com/zanata/zanata/commit/e091c3dcbd9e4cf44eb1f616aa9b23f714a91676
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  initial test setup for TransMemoryPresenter test


  Commit: 386fea970ab3b68008e1fb70b438fc76e9129214
      https://github.com/zanata/zanata/commit/386fea970ab3b68008e1fb70b438fc76e9129214
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Merge branch 'trans-presenter-test'


  Commit: 35ab9acf7b42380f88d7be3b09d33c796a7e32d0
      https://github.com/zanata/zanata/commit/35ab9acf7b42380f88d7be3b09d33c796a7e32d0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  Fix TM shortcut key bug: https://bugzilla.redhat.com/show_bug.cgi?id=802191


  Commit: 5e34fc504347aff160d647ae58e837a5fc85ff11
      https://github.com/zanata/zanata/commit/5e34fc504347aff160d647ae58e837a5fc85ff11
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  Merge branch 'master' into rhbz788294


  Commit: 3c721a321990b624a8b5e22ef3edd4ad4e787b22
      https://github.com/zanata/zanata/commit/3c721a321990b624a8b5e22ef3edd4ad4e787b22
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  Merge branch '1.5'


  Commit: 97e6e2139b355ba5932b34aff63c40a787094c16
      https://github.com/zanata/zanata/commit/97e6e2139b355ba5932b34aff63c40a787094c16
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz788294

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml


  Commit: 3918afcfc02486baba72130ccb86ff7454df1748
      https://github.com/zanata/zanata/commit/3918afcfc02486baba72130ccb86ff7454df1748
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Resolve merge conflict from master


Compare: https://github.com/zanata/zanata/compare/8974d0a...3918afc