Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Jun 18, 2012
1 parent 1d1e10d commit 8e34be5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 28 deletions.
1 change: 0 additions & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
View file
Expand Up @@ -22,7 +22,6 @@
package org.zanata.webtrans.client.ui;

import org.zanata.webtrans.client.resources.EnumMessages;
import org.zanata.webtrans.shared.rpc.HasSearchType.SearchType;
import org.zanata.webtrans.shared.rpc.MergeOption;
import com.google.inject.Inject;
import com.google.inject.Singleton;
Expand Down
46 changes: 21 additions & 25 deletions zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
View file
Expand Up @@ -23,47 +23,32 @@

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.annotation.Nullable;

import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.testng.collections.Lists;
import org.zanata.common.ContentState;
import org.zanata.common.LocaleId;
import org.zanata.dao.TextFlowDAO;
import org.zanata.model.HLocale;
import org.zanata.model.HTextFlow;
import org.zanata.model.HTextFlowTarget;
import org.zanata.security.ZanataIdentity;
import org.zanata.service.LocaleService;
import org.zanata.service.SecurityService;
import org.zanata.service.TranslationService;
import org.zanata.webtrans.server.ActionHandlerFor;
import org.zanata.webtrans.server.TranslationWorkspace;
import org.zanata.webtrans.server.TranslationWorkspaceManager;
import org.zanata.webtrans.shared.model.ProjectIterationId;
import org.zanata.webtrans.shared.model.TransMemoryDetails;
import org.zanata.webtrans.shared.model.TransMemoryQuery;
import org.zanata.webtrans.shared.model.TransMemoryResultItem;
import org.zanata.webtrans.shared.model.TransUnitId;
import org.zanata.webtrans.shared.model.TransUnitUpdateRequest;
import org.zanata.webtrans.shared.model.WorkspaceId;
import org.zanata.webtrans.shared.rpc.HasSearchType.SearchType;
import org.zanata.webtrans.shared.rpc.TransMemoryMerge;
import org.zanata.webtrans.shared.rpc.TransUnitUpdated;
import org.zanata.webtrans.shared.rpc.UpdateTransUnit;
import org.zanata.webtrans.shared.rpc.UpdateTransUnitResult;

import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;

import lombok.extern.slf4j.Slf4j;
import net.customware.gwt.dispatch.server.ExecutionContext;
Expand Down Expand Up @@ -113,17 +98,10 @@ public UpdateTransUnitResult execute(TransMemoryMerge action, ExecutionContext c
{
ArrayList<TransMemoryResultItem> tmResults = getTransMemoryHandler.searchTransMemory(hLocale, new TransMemoryQuery(hTextFlow.getContents(), SearchType.FUZZY_PLURAL), idsWithTranslations);
TransMemoryResultItem tmResult = findTMAboveThreshold(tmResults, predicate);
if (tmResult != null)
TransUnitUpdateRequest request = createRequest(action, hLocale, requestMap, hTextFlow, tmResult);
if (request != null)
{
TransMemoryDetails tmDetail = getTransMemoryDetailsHandler.getTransMemoryDetail(hLocale, hTextFlow);
ContentState statusToSet = new TransMemoryMergeStatusResolver().workOutStatus(action, hTextFlow, tmDetail, tmResult);
if (statusToSet != null)
{
TransUnitUpdateRequest unfilledRequest = requestMap.get(hTextFlow.getId());
TransUnitUpdateRequest request = new TransUnitUpdateRequest(unfilledRequest.getTransUnitId(), tmResult.getTargetContents(), statusToSet, unfilledRequest.getBaseTranslationVersion());
log.debug("auto translate from translation memory {}", request);
updateRequests.add(request);
}
updateRequests.add(request);
}
}

Expand Down Expand Up @@ -155,6 +133,24 @@ private TransMemoryResultItem findTMAboveThreshold(ArrayList<TransMemoryResultIt
}
}

private TransUnitUpdateRequest createRequest(TransMemoryMerge action, HLocale hLocale, Map<Long, TransUnitUpdateRequest> requestMap, HTextFlow hTextFlow, TransMemoryResultItem tmResult)
{
if (tmResult == null)
{
return null;
}
TransMemoryDetails tmDetail = getTransMemoryDetailsHandler.getTransMemoryDetail(hLocale, hTextFlow);
ContentState statusToSet = new TransMemoryMergeStatusResolver().workOutStatus(action, hTextFlow, tmDetail, tmResult);
if (statusToSet != null)
{
TransUnitUpdateRequest unfilledRequest = requestMap.get(hTextFlow.getId());
TransUnitUpdateRequest request = new TransUnitUpdateRequest(unfilledRequest.getTransUnitId(), tmResult.getTargetContents(), statusToSet, unfilledRequest.getBaseTranslationVersion());
log.debug("auto translate from translation memory {}", request);
return request;
}
return null;
}

@Override
public void rollback(TransMemoryMerge action, UpdateTransUnitResult result, ExecutionContext context) throws ActionException
{
Expand Down
2 changes: 0 additions & 2 deletions zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
View file
Expand Up @@ -21,8 +21,6 @@

package org.zanata.webtrans.shared.rpc;

import com.google.common.base.Strings;

public enum MergeOption
{
FUZZY, SKIP, APPROVED
Expand Down

0 comments on commit 8e34be5

Please sign in to comment.