diff --git a/tools/unicodetools/com/ibm/rbm/RBxliffExporter.java b/tools/unicodetools/com/ibm/rbm/RBxliffExporter.java
index 2e1bf4861fa..87e7b6b6a99 100644
--- a/tools/unicodetools/com/ibm/rbm/RBxliffExporter.java
+++ b/tools/unicodetools/com/ibm/rbm/RBxliffExporter.java
@@ -21,7 +21,8 @@ import org.w3c.dom.*;
/**
* This class is a plug-in to RBManager that allows the user to export Resource Bundles
* along with some of the meta-data associated by RBManager to the XLIFF specification.
- * For more information on XLIFF visit the web site http://www.lisa.org/xliff/
+ * For more information on XLIFF visit the web site
+ * http://www.lisa.org/xliff/
*
* @author George Rhoten
* @see com.ibm.rbm.RBManager
@@ -83,13 +84,6 @@ public class RBxliffExporter extends RBExporter {
return "";
}
-/* private String getLocale(BundleItem item) {
- if (item != null && item.getParentGroup() != null && item.getParentGroup().getParentBundle() != null) {
- return getLocale(item.getParentGroup().getParentBundle());
- }
- return "";
- }*/
-
private String getParentLocale(String locale) {
int truncIndex = locale.lastIndexOf('-');
@@ -104,9 +98,6 @@ public class RBxliffExporter extends RBExporter {
private void addTransUnit(Document xml, Element groupElem, BundleItem item, BundleItem parent_item) {
Element transUnit = xml.createElement("trans-unit");
- //tuv.setAttribute("lang", convertEncoding(item));
- //tuv.setAttribute("creationdate",convertToISO(item.getCreatedDate()));
- //tuv.setAttribute("creationid",item.getCreator());
transUnit.setAttribute("date",convertToISO(item.getModifiedDate()));
transUnit.setAttribute("id",item.getKey());
@@ -177,9 +168,9 @@ public class RBxliffExporter extends RBExporter {
if (ret_val != JFileChooser.APPROVE_OPTION)
return;
// Retrieve basic file information
- File file = chooser.getSelectedFile(); // The file(s) we will be working with
- File directory = new File(file.getParent()); // The directory we will be writing to
- String base_name = file.getName(); // The base name of the files we will write
+ File file = chooser.getSelectedFile(); // The file(s) we will be working with
+ File directory = new File(file.getParent()); // The directory we will be writing to
+ String base_name = file.getName(); // The base name of the files we will write
if (base_name == null || base_name.equals(""))
base_name = rbm.getBaseClass();
if (base_name.endsWith(".xlf"))
@@ -194,6 +185,64 @@ public class RBxliffExporter extends RBExporter {
}
}
+ private void addHeaderProperties(Document xml, Element header, Bundle main_bundle) {
+ if (main_bundle.comment != null && main_bundle.comment.length() > 0) {
+ Element note = xml.createElement("note");
+ header.appendChild(note);
+ note.appendChild(xml.createTextNode(main_bundle.comment));
+ note.setAttribute("xml:space","preserve");
+ }
+ if ((main_bundle.name != null && main_bundle.name.length() > 0)
+ || (main_bundle.manager != null && main_bundle.manager.length() > 0)
+ || (main_bundle.language != null && main_bundle.language.length() > 0)
+ || (main_bundle.country != null && main_bundle.country.length() > 0)
+ || (main_bundle.variant != null && main_bundle.variant.length() > 0))
+ {
+ Element prop_group = xml.createElement("prop-group");
+ header.appendChild(prop_group);
+ if (main_bundle.name != null && main_bundle.name.length() > 0) {
+ Element prop = xml.createElement("prop");
+ header.appendChild(prop);
+ prop.setAttribute("xml:space","preserve");
+ prop.setAttribute("prop-type","name");
+ prop.appendChild(xml.createTextNode(main_bundle.name));
+ prop_group.appendChild(prop);
+ }
+ if (main_bundle.manager != null && main_bundle.manager.length() > 0) {
+ Element prop = xml.createElement("prop");
+ header.appendChild(prop);
+ prop.setAttribute("xml:space","preserve");
+ prop.setAttribute("prop-type","manager");
+ prop.appendChild(xml.createTextNode(main_bundle.manager));
+ prop_group.appendChild(prop);
+ }
+ if (main_bundle.language != null && main_bundle.language.length() > 0) {
+ Element prop = xml.createElement("prop");
+ header.appendChild(prop);
+ prop.setAttribute("xml:space","preserve");
+ prop.setAttribute("prop-type","language");
+ prop.appendChild(xml.createTextNode(main_bundle.language));
+ prop_group.appendChild(prop);
+ }
+ if (main_bundle.country != null && main_bundle.country.length() > 0) {
+ Element prop = xml.createElement("prop");
+ header.appendChild(prop);
+ prop.setAttribute("xml:space","preserve");
+ prop.setAttribute("prop-type","country");
+ prop.appendChild(xml.createTextNode(main_bundle.country));
+ prop_group.appendChild(prop);
+ }
+ if (main_bundle.variant != null && main_bundle.variant.length() > 0) {
+ Element prop = xml.createElement("prop");
+ header.appendChild(prop);
+ prop.setAttribute("xml:space","preserve");
+ prop.setAttribute("prop-type","variant");
+ prop.appendChild(xml.createTextNode(main_bundle.variant));
+ prop_group.appendChild(prop);
+ }
+ }
+ }
+
private void exportFile(RBManager rbm, File directory, String base_name, Bundle main_bundle)
throws IOException
{
@@ -251,12 +300,7 @@ public class RBxliffExporter extends RBExporter {
// TODO Add file attribute
//header.setAttribute("file", "");
header.appendChild(tool);
- if (main_bundle.comment != null && main_bundle.comment.length() > 0) {
- Element note = xml.createElement("note");
- header.appendChild(note);
- note.appendChild(xml.createTextNode(main_bundle.comment));
- note.setAttribute("xml:space","preserve");
- }
+ addHeaderProperties(xml, header, main_bundle);
file_elem.appendChild(header);
Element body = xml.createElement("body");
@@ -323,7 +367,8 @@ public class RBxliffExporter extends RBExporter {
suffix = String.valueOf(array);
// serialize document
- OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(new File(directory,base_name + suffix + ".xlf")), "UTF-8");
+ OutputStreamWriter osw = new OutputStreamWriter(
+ new FileOutputStream(new File(directory, base_name + suffix + ".xlf")), "UTF-8");
try {
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.METHOD, "xml");
diff --git a/tools/unicodetools/com/ibm/rbm/RBxliffImporter.java b/tools/unicodetools/com/ibm/rbm/RBxliffImporter.java
index 87f96a6f8ad..550706bb0f5 100644
--- a/tools/unicodetools/com/ibm/rbm/RBxliffImporter.java
+++ b/tools/unicodetools/com/ibm/rbm/RBxliffImporter.java
@@ -8,19 +8,18 @@ package com.ibm.rbm;
import java.io.*;
-
-import com.ibm.rbm.gui.RBManagerGUI;
-
import java.util.*;
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.parsers.DOMParser;
-import org.w3c.dom.*;
+import javax.xml.parsers.*;
+
+import com.ibm.rbm.gui.RBManagerGUI;
import org.xml.sax.*;
+import org.w3c.dom.*;
/**
* This imports XLIFF files into RBManager.
- * For more information see
+ * For more information see
+ *
* http://www.oasis-open.org/committees/xliff/documents/xliff-specification.htm
*
* @author George Rhoten
@@ -57,17 +56,21 @@ public class RBxliffImporter extends RBImporter {
try {
fis = new FileInputStream(xlf_file);
InputSource is = new InputSource(fis);
- //is.setEncoding("UTF-8");
- DOMParser parser = new DOMParser();
- parser.parse(is);
- xlf_xml = parser.getDocument();
+ DocumentBuilder builder;
+ builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ xlf_xml = builder.parse(is);
fis.close();
- } catch (SAXException e) {
- RBManagerGUI.debugMsg(e.getMessage());
- e.printStackTrace(System.err);
- return;
}
- if (xlf_xml == null) return;
+ catch (SAXException e) {
+ e.printStackTrace(System.err);
+ throw new IOException(e.getMessage());
+ }
+ catch (ParserConfigurationException pce) {
+ pce.printStackTrace(System.err);
+ throw new IOException(pce.getMessage());
+ }
+ if (xlf_xml == null)
+ return;
importDoc();
fis.close();
@@ -78,12 +81,18 @@ public class RBxliffImporter extends RBImporter {
if (xlf_xml == null)
return;
String language = "";
- String bundleNote = null;
+ String bundle_note = null;
+ String bundle_name = null;
+ String manager_name = null;
+ String language_name = null;
+ String country_name = null;
+ String variant_name = null;
+
Element root = xlf_xml.getDocumentElement();
Node fileNode = root.getFirstChild();
Node header = null;
Node node = null;
- while (fileNode != null && !(fileNode.getNodeType() == Node.ELEMENT_NODE && fileNode.getNodeName().equalsIgnoreCase("file"))) {
+ while (fileNode != null && !(fileNode instanceof Element && fileNode.getNodeName().equalsIgnoreCase("file"))) {
fileNode = fileNode.getNextSibling();
}
header = fileNode.getFirstChild();
@@ -101,13 +110,44 @@ public class RBxliffImporter extends RBImporter {
if (text_elem != null) {
String value = text_elem.getNodeValue();
if (value != null && value.length() > 0) {
- bundleNote = value;
+ bundle_note = value;
}
}
}
+ Node prop_group_list = ((Element)header).getElementsByTagName("prop-group").item(0);
+ NodeList prop_list = prop_group_list.getChildNodes();
+ int propertyNum = prop_list.getLength();
+ if (propertyNum > 0) {
+ for (int prop = 0; prop < propertyNum; prop++) {
+ if (prop_list.item(prop) instanceof Element) {
+ Element property_elem = (Element)prop_list.item(prop);
+ String propertyType = property_elem.getAttribute("prop-type");
+ if (propertyType != null) {
+ String value = property_elem.getChildNodes().item(0).getNodeValue();
+ if (value != null && value.length() > 0) {
+ if (propertyType.equals("name")) {
+ bundle_name = value;
+ }
+ else if (propertyType.equals("manager")) {
+ manager_name = value;
+ }
+ else if (propertyType.equals("language")) {
+ language_name = value;
+ }
+ else if (propertyType.equals("country")) {
+ country_name = value;
+ }
+ else if (propertyType.equals("variant")) {
+ variant_name = value;
+ }
+ }
+ }
+ }
+ }
+ }
}
node = header.getNextSibling();
- while (node != null && !(node.getNodeType() == Node.ELEMENT_NODE && node.getNodeName().equalsIgnoreCase("body"))) {
+ while (node != null && !(node instanceof Element && node.getNodeName().equalsIgnoreCase("body"))) {
node = node.getNextSibling();
}
@@ -164,7 +204,13 @@ public class RBxliffImporter extends RBImporter {
language = String.valueOf(array);
localeNames.add(language);
resolveEncodings(localeNames);
- rbm.getBundle(language).comment = bundleNote;
+ Bundle main_bundle = rbm.getBundle(language);
+ main_bundle.name = bundle_name;
+ main_bundle.comment = bundle_note;
+ main_bundle.manager = manager_name;
+ main_bundle.language = language_name;
+ main_bundle.country = country_name;
+ main_bundle.variant = variant_name;
for (int i=0; i < tu_list.getLength(); i++) {
if (!(tu_list.item(i) instanceof Element)) {
@@ -208,12 +254,13 @@ public class RBxliffImporter extends RBImporter {
private void parseTranslationUnit(String language, String group, Element trans_unit_elem) {
// Get the translation value
- ElementImpl target_elem = (ElementImpl)trans_unit_elem.getElementsByTagName("target").item(0);
+ Node target_elem = trans_unit_elem.getElementsByTagName("target").item(0);
if (target_elem == null) {
// This is a template, or a skeleton
- target_elem = (ElementImpl)trans_unit_elem.getElementsByTagName("source").item(0);
+ target_elem = trans_unit_elem.getElementsByTagName("source").item(0);
}
- if (target_elem.getLength() < 1)
+ // If there is a source or target, even if empty, it must be parsed.
+ if (target_elem == null)
return;
target_elem.normalize();
NodeList text_list = target_elem.getChildNodes();
@@ -283,65 +330,8 @@ public class RBxliffImporter extends RBImporter {
}
}
- /*item.setCreatedDate(tuv_elem.getAttribute("creationdate"));
- item.setModifiedDate(tuv_elem.getAttribute("changedate"));
- if (tuv_elem.getAttribute("changeid") != null) item.setModifier(tuv_elem.getAttribute("changeid"));
- if (tuv_elem.getAttribute("creationid") != null) item.setCreator(tuv_elem.getAttribute("creationid"));*/
- // Get properties specified
-/* NodeList prop_list = tuv_elem.getElementsByTagName("prop");
- Hashtable lookups = null;
- for (int k=0; k < prop_list.getLength(); k++) {
- ElementImpl prop_elem = (ElementImpl)prop_list.item(k);
- String type = prop_elem.getAttribute("type");
- } else if (type != null && type.equals("x-Lookup")) {
- // Get a lookup value
- prop_elem.normalize();
- text_list = prop_elem.getChildNodes();
- if (text_list.getLength() < 1) continue;
- text_elem = (TextImpl)text_list.item(0);
- if (text_elem.getNodeValue() != null) {
- String text = text_elem.getNodeValue();
- if (text.indexOf("=") > 0) {
- try {
- if (lookups == null)
- lookups = new Hashtable();
- String lkey = text.substring(0,text.indexOf("="));
- String lvalue = text.substring(text.indexOf("=")+1,text.length());
- lookups.put(lkey, lvalue);
- } catch (Exception ex) {
- //String out of bounds - Ignore and go on
- }
- }
- } else item.setTranslated(getDefaultTranslated());
- }
- }*/
// if (lookups != null)
// item.setLookups(lookups);
importResource(item, language, group);
}
-/* private Vector getEncodingsVector(ElementImpl body) {
- String empty = "";
- if (body == null) return null;
- Hashtable hash = new Hashtable();
- NodeList tu_list = body.getElementsByTagName("tu");
- for (int i=0; i < tu_list.getLength(); i++) {
- ElementImpl tu_elem = (ElementImpl)tu_list.item(i);
- NodeList tuv_list = tu_elem.getElementsByTagName("tuv");
- for (int j=0; j < tuv_list.getLength(); j++) {
- ElementImpl tuv_elem = (ElementImpl)tuv_list.item(j);
- String encoding = tuv_elem.getAttribute("lang");
- if (encoding == null) continue;
- char array[] = encoding.toCharArray();
- for (int k=0; k < array.length; k++) {
- if (array[k] == '-') array[k] = '_';
- }
- encoding = String.valueOf(array);
- if (!(hash.containsKey(encoding))) hash.put(encoding,empty);
- }
- }
- Vector v = new Vector();
- Enumeration enum = hash.keys();
- while (enum.hasMoreElements()) { v.addElement(enum.nextElement()); }
- return v;
- }*/
}