Merge branch 'master' into RefactorModelNavigation

Conflicts: zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsModel.java zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
zanata · May 14, 2012 · a0a17db · a0a17db
2 parents a544b28 + 829a432
commit a0a17db
Show file tree

Hide file tree

Showing 16 changed files with 627 additions and 601 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlow.java b/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
@@ -303,7 +303,9 @@ public Map<Integer, HTextFlowHistory> getHistory()
    public Map<HLocale, HTextFlowTarget> getTargets()
    {
       if (targets == null)
+      {
          targets = new HashMap<HLocale, HTextFlowTarget>();
+      }
       return targets;
    }
 

diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
@@ -69,8 +69,11 @@
 import org.zanata.hibernate.search.LocaleIdBridge;
 import org.zanata.hibernate.search.StringListBridge;
 
+import com.google.common.base.Objects;
+
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 /**
  * Represents a flow of translated text that should be processed as a
@@ -317,21 +320,17 @@ private void copyLazyLoadedRelationsToHistory()
       }
    }
 
-   /**
-    * Used for debugging
-    */
    @Override
    public String toString()
    {
-      return new StringBuilder().append("HTextFlowTarget(")
-            .append("contents:").append(getContents())
-            .append(" locale:").append(getLocale())
-            .append(" state:").append(getState())
-            .append(" comment:").append(getComment())
-            .append(" textflow:").append(getTextFlow().getContents())
-            .append(")").toString();
+      return Objects.toStringHelper(this).
+            add("contents", getContents()).
+            add("locale", getLocale()).
+            add("state", getState()).
+            add("comment", getComment()).
+            add("textFlow", getTextFlow().getContents()).
+            toString();
    }
-
    @Transient
    public void clear()
    {

diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
@@ -33,6 +33,7 @@
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.Session;
+import org.hibernate.criterion.CriteriaSpecification;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.search.jpa.FullTextEntityManager;
@@ -123,6 +124,7 @@ public List<HTextFlow> getNavigationByDocumentId(Long documentId)
    {
       Criteria c = getSession().createCriteria(HTextFlow.class);
       c.add(Restrictions.eq("document.id", documentId)).add(Restrictions.eq("obsolete", false));
+      c.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
       c.setCacheable(true).setComment("TextFlowDAO.getNavigationByDocumentId");
 
       c.addOrder(Order.asc("pos"));

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.java
@@ -1,6 +1,8 @@
 package org.zanata.webtrans.client.editor.table;
 
 
+import org.zanata.webtrans.shared.model.TransUnit;
+
 public interface EditRowCallback
 {
    void gotoNextRow();
@@ -22,4 +24,8 @@ public interface EditRowCallback
    void gotoNextNewRow();
 
    void gotoPrevNewRow();
+
+   void gotoCurrentRow(boolean andEdit);
+
+   void setRowValueOverride(int row, TransUnit targetCell);
 }