From be49cddc10311c9f9afaddc1ae72e6d8179abe32 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Fri, 5 Dec 2014 14:06:25 +1000 Subject: [PATCH] Fix formatting --- .../glossary/GlossaryCSVReaderTest.java | 3 ++- .../glossary/GlossaryPoReaderTest.java | 10 ++++---- .../java/org/zanata/adapter/po/PoWriter2.java | 4 ++-- .../org/zanata/adapter/xliff/XliffReader.java | 21 +++++++++------- .../org/zanata/adapter/xliff/XliffWriter.java | 24 ++++++++++++------- 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java b/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java index a97a18e..10fde9c 100644 --- a/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java +++ b/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java @@ -76,7 +76,8 @@ public void extractGlossaryTest2() throws IOException { List commentHeaders = new ArrayList(); commentHeaders.add("description1"); commentHeaders.add("description2"); - commentHeaders.add("description3"); // this will be ignored + // this will be ignored + commentHeaders.add("description3"); GlossaryCSVReader reader = new GlossaryCSVReader(commentHeaders, 300); diff --git a/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryPoReaderTest.java b/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryPoReaderTest.java index c6fafe1..446f48b 100644 --- a/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryPoReaderTest.java +++ b/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryPoReaderTest.java @@ -41,14 +41,12 @@ * **/ public class GlossaryPoReaderTest { + // 578 glossary entries private final File sourceFile = new File( - "src/test/resources/glossary/fuel_hi.po"); // 578 - // glossary - // entries + "src/test/resources/glossary/fuel_hi.po"); + // 2645 glossary entries private final File sourceFile2 = new File( - "src/test/resources/glossary/compendium-zh_TW.po"); // 2645 - // glossary - // entries + "src/test/resources/glossary/compendium-zh_TW.po"); private static final int sourceSize1 = 578; private static final int sourceSize2 = 2645; diff --git a/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java b/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java index b954922..7b66416 100644 --- a/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java +++ b/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java @@ -272,8 +272,8 @@ private void write(Writer writer, String charset, Resource document, if (poTargetHeader != null) { copyToHeaderFields(hf, poTargetHeader.getEntries()); headerMessage = hf.unwrap(); - headerMessage.setFuzzy(false); // By default, header message - // unwraps as fuzzy, so avoid it + // By default, header message unwraps as fuzzy, so avoid it + headerMessage.setFuzzy(false); copyCommentsToHeader(poTargetHeader, headerMessage); nPlurals = extractNPlurals(poTargetHeader); } diff --git a/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java b/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java index 1ab8172..7cc5a05 100644 --- a/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java +++ b/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java @@ -123,10 +123,8 @@ private void extractXliff(@Nonnull File file, @Nullable Resource document, } try { - xmlif.setProperty(XMLInputFactory.IS_COALESCING, true); // decode - // entities - // into one - // string + // decode entities into one string + xmlif.setProperty(XMLInputFactory.IS_COALESCING, true); InputSource inputSource = new InputSource(new FileInputStream(file)); @@ -263,17 +261,21 @@ private TextFlowTarget extractTransUnitTarget(XMLStreamReader xmlr) String contextGroup = getAttributeValue(xmlr, ATTRI_NAME); while (xmlr.hasNext() && !endContextGroup) { - xmlr.next();// move to context tag + // move to context tag + xmlr.next(); if (isEndElement(xmlr, ELE_CONTEXT_GROUP)) endContextGroup = true; else { if (isStartElement(xmlr, ELE_CONTEXT)) { StringBuilder sb = new StringBuilder(); - sb.append(contextGroup);// context-group + // context-group + sb.append(contextGroup); sb.append(DELIMITER); - sb.append(getAttributeValue(xmlr, ATTRI_CONTEXT_TYPE));// context-type + // context-type + sb.append(getAttributeValue(xmlr, ATTRI_CONTEXT_TYPE)); sb.append(DELIMITER); - sb.append(getElementValue(xmlr, ELE_CONTEXT, null));// value + // value + sb.append(getElementValue(xmlr, ELE_CONTEXT, null)); contextList.add(new SimpleComment(sb.toString())); } } @@ -300,7 +302,8 @@ private String getElementValue(XMLStreamReader reader, String elementName, } while (keepReading) { - if (reader.hasText()) { // if the value in element is text + // if the value in element is text + if (reader.hasText()) { contents.append(reader.getText()); } else { // if value in element is a xml element; invalid text diff --git a/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java b/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java index 1f89cfe..9fd25f7 100644 --- a/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java +++ b/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java @@ -87,7 +87,8 @@ private static void writeTransUnits(IndentingXMLStreamWriter writer, writeTransUnitTarget(writer, target); } writeTransUnitContext(writer, textFlow); - writer.writeEndElement();// end trans-unit tag + // end trans-unit tag + writer.writeEndElement(); } } @@ -101,7 +102,8 @@ private static void writeTransUnitSource(IndentingXMLStreamWriter writer, + textFlow.getId()); } writer.writeCharacters(contents.get(0)); - writer.writeEndElement();// end source tag + // end source tag + writer.writeEndElement(); } private static void writeTransUnitTarget(IndentingXMLStreamWriter writer, @@ -114,7 +116,8 @@ private static void writeTransUnitTarget(IndentingXMLStreamWriter writer, + target.getResId()); } writer.writeCharacters(contents.get(0)); - writer.writeEndElement();// end target tag + // end target tag + writer.writeEndElement(); } private static void writeTransUnitContext(IndentingXMLStreamWriter writer, @@ -150,10 +153,12 @@ private static void writeTransUnitContext(IndentingXMLStreamWriter writer, writer.writeStartElement(ELE_CONTEXT); writer.writeAttribute(ATTRI_CONTEXT_TYPE, val[0]); writer.writeCharacters(val[1]); - writer.writeEndElement();// end context + // end context + writer.writeEndElement(); } - writer.writeEndElement();// end context-group + // end context-group + writer.writeEndElement(); } } } @@ -191,9 +196,12 @@ public static void write(File baseDir, Resource doc, String locale, } writeTransUnits(writer, doc, targetDoc, createSkeletons); - writer.writeEndElement(); // end body tag - writer.writeEndElement(); // end file tag - writer.writeEndDocument(); // end Xliff tag + // end body tag + writer.writeEndElement(); + // end file tag + writer.writeEndElement(); + // end xliff tag + writer.writeEndDocument(); writer.flush(); } finally { writer.close();