From 4f853966c36109f2a04fdf7dcb35667fd5078b68 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Fri, 19 Sep 2014 12:19:37 +1000 Subject: [PATCH] rhbz1139950 - move method to parent class --- .../client/commands/pull/AbstractPullStrategy.java | 14 ++++++++++++++ .../client/commands/pull/GettextDirStrategy.java | 9 --------- .../client/commands/pull/GettextPullStrategy.java | 9 --------- .../client/commands/pull/PropertiesStrategy.java | 7 ------- .../zanata/client/commands/pull/XliffStrategy.java | 7 ------- .../zanata/client/commands/pull/XmlStrategy.java | 9 --------- ...gyTest.java => GettextDirStrategyPullTest.java} | 2 +- .../commands/pull/PublicanPullCommandTest.java | 1 + 8 files changed, 16 insertions(+), 42 deletions(-) rename zanata-client-commands/src/test/java/org/zanata/client/commands/pull/{GettextDirStrategyTest.java => GettextDirStrategyPullTest.java} (98%) diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractPullStrategy.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractPullStrategy.java index fdf794d1..ef9ba956 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractPullStrategy.java +++ b/zanata-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 index 7fecb713..e3a5ed6c 100644 --- 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/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java index f53f926f..9d53d4e3 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java +++ b/zanata-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 index e9c8ea6c..5b5cbb0d 100644 --- 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 index 2bcc8ad4..08629b0e 100644 --- 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 index ba77c64c..8c0c6da9 100644 --- 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/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyPullTest.java similarity index 98% rename from zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyTest.java rename to zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyPullTest.java index 46fd7385..280dd86b 100644 --- a/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyTest.java +++ b/zanata-client-commands/src/test/java/org/zanata/client/commands/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/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java index 1ef0a425..4fc46830 100644 --- a/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java +++ b/zanata-client-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();