rhbz1139950 - move method to parent class

zanata · Sep 19, 2014 · 4f85396 · 4f85396
1 parent cd3e32d
commit 4f85396
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 42 deletions.
diff --git a/...a-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractPullStrategy.java b/...a-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractPullStrategy.java
@@ -1,5 +1,12 @@
 package org.zanata.client.commands.pull;
 
+import org.zanata.client.commands.TransFileResolver;
+import org.zanata.client.config.LocaleMapping;
+
+import java.io.File;
+
+import static org.zanata.client.commands.TransFileResolver.UnqualifiedSrcDocName;
+
 public abstract class AbstractPullStrategy implements PullStrategy {
     private final PullOptions opts;
 
@@ -15,4 +22,11 @@ public PullOptions getOpts() {
     public boolean isTransOnly() {
         return false;
     }
+
+    @Override
+    public File getTransFileToWrite(String docName,
+        LocaleMapping localeMapping) {
+        return new TransFileResolver(getOpts()).getTransFile(
+            UnqualifiedSrcDocName.from(docName), localeMapping);
+    }
 }
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
@@ -42,15 +42,6 @@ public GettextDirStrategy(PullOptions opts) {
         super(opts);
     }
 
-    @Override
-    public File
-            getTransFileToWrite(String docName, LocaleMapping localeMapping) {
-        File transFile = new TransFileResolver(getOpts()).getTransFile(
-            UnqualifiedSrcDocName.from(docName),
-            localeMapping);
-        return transFile;
-    }
-
     @Override
     public FileDetails writeTransFile(Resource doc, String docName,
             LocaleMapping locMapping, TranslationsResource targetDoc)

diff --git a/...ta-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java b/...ta-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
@@ -41,15 +41,6 @@ public GettextPullStrategy(PullOptions opts) {
         super(opts);
     }
 
-    @Override
-    public File
-            getTransFileToWrite(String docName, LocaleMapping localeMapping) {
-        File transFile = new TransFileResolver(getOpts()).getTransFile(
-            TransFileResolver.UnqualifiedSrcDocName.from(docName),
-            localeMapping);
-        return transFile;
-    }
-
     @Override
     public FileDetails writeTransFile(Resource doc, String docName,
             LocaleMapping locMapping, TranslationsResource targetDoc)

diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
@@ -61,13 +61,6 @@ public void writeSrcFile(Resource doc) throws IOException {
         PropWriter.write(doc, getOpts().getSrcDir());
     }
 
-    @Override
-    public File
-            getTransFileToWrite(String docName, LocaleMapping localeMapping) {
-        return new TransFileResolver(getOpts()).getTransFile(
-            UnqualifiedSrcDocName.from(docName), localeMapping);
-    }
-
     @Override
     public FileDetails writeTransFile(Resource doc, String docName,
             LocaleMapping localeMapping, TranslationsResource targetDoc)

diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
@@ -61,13 +61,6 @@ public void writeSrcFile(Resource doc) throws IOException {
         XliffWriter.write(getOpts().getSrcDir(), doc, "en-US");
     }
 
-    @Override
-    public File
-            getTransFileToWrite(String docName, LocaleMapping localeMapping) {
-        return new TransFileResolver(getOpts()).getTransFile(
-            UnqualifiedSrcDocName.from(docName), localeMapping);
-    }
-
     @Override
     public FileDetails writeTransFile(Resource doc, String docName,
             LocaleMapping localeMapping, TranslationsResource targetDoc)

diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
@@ -82,15 +82,6 @@ public void writeSrcFile(Resource doc) throws IOException {
         }
     }
 
-    @Override
-    public File
-            getTransFileToWrite(String docName, LocaleMapping localeMapping) {
-        File transFile = new TransFileResolver(getOpts()).getTransFile(
-            UnqualifiedSrcDocName.from(docName),
-            localeMapping);
-        return transFile;
-    }
-
     @Override
     public FileDetails writeTransFile(Resource doc, String docName,
             LocaleMapping locale, TranslationsResource targetDoc)

diff --git a/...commands/pull/GettextDirStrategyTest.java → ...ands/pull/GettextDirStrategyPullTest.java b/...commands/pull/GettextDirStrategyTest.java → ...ands/pull/GettextDirStrategyPullTest.java
@@ -15,7 +15,7 @@
 import static org.junit.Assert.*;
 import static org.zanata.client.TestUtils.createAndAddLocaleMapping;
 
-public class GettextDirStrategyTest {
+public class GettextDirStrategyPullTest {
     private GettextDirStrategy strategy;
     private PullOptionsImpl opts;
 

diff --git a/...lient-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java b/...lient-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
@@ -70,6 +70,7 @@ private void publicanPull(boolean exportPot, boolean mapLocale)
         opts.setDstDir(new File("target/test-output/test2"));
         opts.setExportPot(exportPot);
         opts.setProjectConfig(new File("src/test/resources/test2/zanata.xml"));
+        opts.setLocaleMapList(new LocaleList());
         OptionsUtil.applyConfigFiles(opts);
         if (mapLocale) {
             LocaleList locales = new LocaleList();