Merge pull request #33 from yumaoka/rel-v113-updates

Misc. changes for gp-java-tools 1.1.3 release, fixes #33

Author: yumaoka

gp-cli/pom.xml

@@ -92,7 +92,7 @@
 		<dependency>
 			<groupId>com.ibm.g11n.pipeline</groupId>
 			<artifactId>gp-java-client</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.3</version>
 		</dependency>
 
 		<dependency>

gp-cli/src/main/java/com/ibm/g11n/pipeline/tools/cli/ExportCmd.java

@@ -29,6 +29,7 @@
 import com.ibm.g11n.pipeline.resfilter.Bundle;
 import com.ibm.g11n.pipeline.resfilter.ResourceFilter;
 import com.ibm.g11n.pipeline.resfilter.ResourceFilterFactory;
+import com.ibm.g11n.pipeline.resfilter.ResourceString;
 import com.ibm.g11n.pipeline.resfilter.ResourceType;
 
 /**
@@ -89,7 +90,9 @@ protected void _execute() {
                     if (seqNum != null) {
                         sequenceNumber = seqNum.intValue();
                     }
-                    bundle.addResourceString(key, resVal, sequenceNumber);
+                    ResourceString resString = new ResourceString(key, resVal,
+                            sequenceNumber, data.getNotes());
+                    bundle.addResourceString(resString);
                 }
             }
         } catch (ServiceException e) {

gp-cli/src/main/java/com/ibm/g11n/pipeline/tools/cli/ImportCmd.java

@@ -71,6 +71,7 @@ protected void _execute() {
                 if (seqNum >= 0) {
                     resEntryData.setSequenceNumber(Integer.valueOf(seqNum));
                 }
+                resEntryData.setNotes(resString.getNotes());
                 resEntries.put(resString.getKey(), resEntryData);
             }
         } catch (IOException e) {

gp-cli/src/main/java/com/ibm/g11n/pipeline/tools/cli/ResourceTypeConverter.java

@@ -1,5 +1,5 @@
 /*  
- * Copyright IBM Corp. 2015
+ * Copyright IBM Corp. 2015, 2016
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
  * 
  * @author Yoshito Umaoka
  */
-class ResourceTypeConverter implements IStringConverter<ResourceType>{
+public class ResourceTypeConverter implements IStringConverter<ResourceType>{
 
     @Override
     public ResourceType convert(String type) {

gp-maven-plugin.md

@@ -274,9 +274,9 @@ If you have properties file `src/resources/com/ibm/example/MyStrings.properties`
 instead of `target/classes/com/ibm/example/MyStrings_pt_BR.properties`
 
 Note: The language ID separator used in the mapping should be '-' (Hyphen) for both,
-even you want expect translated file name (or path) to use '_'. So, in above example,
-do not specify `<zh-Hant>zh_TW</zh-Hant>` even you want `MyStrings_zh_TW.properties`
-as the output file name. The language suffix style is configured by `<languageIdStyle>`.
+even you want translated file name (or path) to use '_' for the language part. In the example
+above, do not specify `<zh-Hant>zh_TW</zh-Hant>` even you want `MyStrings_zh_TW.properties`
+as the output file name. The language ID style is configured by `<languageIdStyle>`.
 
 
 ### Translated JSON Files in Language Directories

gp-maven-plugin/pom.xml

@@ -188,7 +188,7 @@
 		<dependency>
 			<groupId>com.ibm.g11n.pipeline</groupId>
 			<artifactId>gp-java-client</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.g11n.pipeline</groupId>

gp-maven-plugin/src/main/java/com/ibm/g11n/pipeline/maven/GPUploadMojo.java

@@ -70,6 +70,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                     // Checks if the bundle already exists
                     String bundleId = bf.getBundleId();
+                    boolean createNew = false;
                     if (bundleIds.contains(bundleId)) {
                         getLog().info("Found bundle:" + bundleId);
                         // Checks if the source language matches.
@@ -82,12 +83,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                         }
                     } else {
                         getLog().info("bundle:" + bundleId + " does not exist, creating a new bundle.");
-                        NewBundleData newBundleData = new NewBundleData(srcLang);
-                        if (!tgtLangs.isEmpty()) {
-                            newBundleData.setTargetLanguages(new TreeSet<String>(tgtLangs));
-                        }
-                        client.createBundle(bundleId, newBundleData);
-                        getLog().info("Created bundle: " + bundleId);
+                        createNew = true;
                     }
 
                     // Parse the resource bundle file
@@ -96,13 +92,27 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                     try (FileInputStream fis = new FileInputStream(bf.getFile())) {
                         Bundle resBundle = filter.parse(fis);
+
+                        if (createNew) {
+                            NewBundleData newBundleData = new NewBundleData(srcLang);
+                            // set target languages
+                            if (!tgtLangs.isEmpty()) {
+                                newBundleData.setTargetLanguages(new TreeSet<String>(tgtLangs));
+                            }
+                            // set bundle notes
+                            newBundleData.setNotes(resBundle.getNotes());
+                            client.createBundle(bundleId, newBundleData);
+                            getLog().info("Created bundle: " + bundleId);
+                        }
                         Collection<ResourceString> resStrings = resBundle.getResourceStrings();
                         for (ResourceString resString : resStrings) {
                             NewResourceEntryData resEntryData = new NewResourceEntryData(resString.getValue());
                             int seqNum = resString.getSequenceNumber();
                             if (seqNum >= 0) {
                                 resEntryData.setSequenceNumber(Integer.valueOf(seqNum));
                             }
+                            // set resource string notes
+                            resEntryData.setNotes(resString.getNotes());
                             resEntries.put(resString.getKey(), resEntryData);
                         }
                     } catch (IOException e) {

gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/Bundle.java

@@ -59,7 +59,7 @@ public void addNote(String note) {
 
     public void addNotes(List<String> inputNotes) {
         for (String note : inputNotes) {
-            notes.add(note);
+            addNote(note);
         }
     }