From 70f14acba9a21c24797b5e9ad6082ff9a569cff3 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 3 Apr 2014 09:01:38 +1000 Subject: [PATCH] Fix lists and sets to use guava library rather than testNG lib --- .../src/main/java/org/zanata/database/ConnectionWrapper.java | 3 +-- .../zanata/webtrans/server/rpc/TransMemoryMergeHandler.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java b/zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java index 3c32f49a41..31aefd32a3 100644 --- a/zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java +++ b/zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java @@ -31,12 +31,11 @@ import java.sql.Statement; import java.util.Set; +import com.google.common.collect.Sets; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.testng.internal.annotations.Sets; - /** * @author Sean Flanigan sflaniga@redhat.com diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java index e12844571c..9cd1bc14ae 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java @@ -30,7 +30,6 @@ 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.dao.TextFlowDAO; import org.zanata.dao.TransMemoryUnitDAO; @@ -52,6 +51,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import net.customware.gwt.dispatch.server.ExecutionContext;