diff --git a/tools/unicodetools/com/ibm/rbm/Bundle.java b/tools/unicodetools/com/ibm/rbm/Bundle.java index 024feb3ade9..2da60a25562 100644 --- a/tools/unicodetools/com/ibm/rbm/Bundle.java +++ b/tools/unicodetools/com/ibm/rbm/Bundle.java @@ -1,14 +1,8 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/Bundle.java,v $ - * $Date: 2002/05/20 18:53:10 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; @@ -21,7 +15,7 @@ import java.util.*; /** * A class representing the entire Bundle of Resources for a particular language, country, variant. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class Bundle { @@ -110,7 +104,7 @@ public class Bundle { } /** - * Encodings are of the form -> language_country_variant <- (e.g. en_us_southern) + * Encodings are of the form -> language_country_variant <- (for example: "en_us_southern"). * This method returns the language encoding string, or null if it is not specified */ @@ -121,7 +115,7 @@ public class Bundle { } /** - * Encodings are of the form -> language_country_variant <- (e.g. en_us_southern) + * Encodings are of the form -> language_country_variant <- (for example: "en_us_southern"). * This method returns the country encoding string, or null if it is not specified */ @@ -134,7 +128,7 @@ public class Bundle { } /** - * Encodings are of the form -> language_country_variant <- (e.g. en_us_southern) + * Encodings are of the form -> language_country_variant <- (for example: "en_us_southern"). * This method returns the variant encoding string, or null if it is not specified */ diff --git a/tools/unicodetools/com/ibm/rbm/Occurance.java b/tools/unicodetools/com/ibm/rbm/Occurance.java index 29acb296d4c..b9bcbda0520 100644 --- a/tools/unicodetools/com/ibm/rbm/Occurance.java +++ b/tools/unicodetools/com/ibm/rbm/Occurance.java @@ -1,25 +1,17 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/Occurance.java,v $ - * $Date: 2002/05/20 18:53:10 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; -import java.util.*; - /** * This is a class used by the RBReporter to track occurances of a resource * key found while scanning a text code file. It is used mainly to produce error * messages with helpful context information. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBReporter */ public class Occurance { diff --git a/tools/unicodetools/com/ibm/rbm/RBExporter.java b/tools/unicodetools/com/ibm/rbm/RBExporter.java index 7e2b253db14..26696bf6711 100644 --- a/tools/unicodetools/com/ibm/rbm/RBExporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBExporter.java @@ -1,26 +1,18 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBExporter.java,v $ - * $Date: 2002/05/20 18:53:10 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; -import java.io.*; import javax.swing.*; -import java.util.*; /** * This is the super class for all exporter plug-in classes. As of yet, there * is little contained in this class. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBExporter { diff --git a/tools/unicodetools/com/ibm/rbm/RBICUExporter.java b/tools/unicodetools/com/ibm/rbm/RBICUExporter.java index 198ed49a985..9bc0a297905 100644 --- a/tools/unicodetools/com/ibm/rbm/RBICUExporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBICUExporter.java @@ -1,14 +1,8 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBICUExporter.java,v $ - * $Date: 2002/05/20 18:53:10 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; diff --git a/tools/unicodetools/com/ibm/rbm/RBImporter.java b/tools/unicodetools/com/ibm/rbm/RBImporter.java index 3cde2ba7d7c..fcdc0f715e8 100644 --- a/tools/unicodetools/com/ibm/rbm/RBImporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBImporter.java @@ -1,14 +1,8 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBImporter.java,v $ - * $Date: 2002/05/20 18:53:10 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; @@ -31,7 +25,7 @@ import java.awt.event.*; * *

* - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBImporter extends JDialog { @@ -104,7 +98,7 @@ public class RBImporter extends JDialog { protected void chooseFile() { int result = chooser.showOpenDialog(this); - if (result == chooser.APPROVE_OPTION) { + if (result == JFileChooser.APPROVE_OPTION) { File f = chooser.getSelectedFile(); sourceLabel.setText(Resources.getTranslation("import_source_file",f.getAbsolutePath())); pathSet = true; @@ -187,11 +181,11 @@ public class RBImporter extends JDialog { */ protected void resolveResource(Bundle bundle, BundleItem item) { - if (this.getResourceConflictOption() == this.RESOURCE_OPTION_IGNORE) return; - else if (this.getResourceConflictOption() == this.RESOURCE_OPTION_OVERWRITE) { + if (this.getResourceConflictOption() == RESOURCE_OPTION_IGNORE) return; + else if (this.getResourceConflictOption() == RESOURCE_OPTION_OVERWRITE) { bundle.removeItem(item.getKey()); bundle.addBundleItem(item); - } else if (this.getResourceConflictOption() == this.RESOURCE_OPTION_PROMPT) { + } else if (this.getResourceConflictOption() == RESOURCE_OPTION_PROMPT) { BundleItem original = (BundleItem)bundle.allItems.get(item.getKey()); if (original == null) return; String trans = original.getTranslation(); @@ -223,12 +217,12 @@ public class RBImporter extends JDialog { if (rbm.hasResource(encoding)) continue; else { // We need to resolve this conflict - if (this.getFileConflictOption() == this.FILE_OPTION_IGNORE) continue; - else if (this.getFileConflictOption() == this.FILE_OPTION_POPULATE) { + if (this.getFileConflictOption() == FILE_OPTION_IGNORE) continue; + else if (this.getFileConflictOption() == FILE_OPTION_POPULATE) { rbm.createResource(null, null, null, encoding, null, null, null, true); - } else if (this.getFileConflictOption() == this.FILE_OPTION_EMPTY) { + } else if (this.getFileConflictOption() == FILE_OPTION_EMPTY) { rbm.createResource(null, null, null, encoding, null, null, null, true); - } else if (this.getFileConflictOption() == this.FILE_OPTION_PROMPT) { + } else if (this.getFileConflictOption() == FILE_OPTION_PROMPT) { String options[] = { Resources.getTranslation("import_file_conflict_generate_populate"), Resources.getTranslation("import_file_conflict_generate_empty"), Resources.getTranslation("import_file_conflict_ignore")}; @@ -252,20 +246,20 @@ public class RBImporter extends JDialog { // Returns an integer mask describing the user's selection for file resolving missing file locale conflicts private int getFileConflictOption() { - if (fileGeneratePopulateRadio.isSelected()) return this.FILE_OPTION_POPULATE; - if (fileGenerateEmptyRadio.isSelected()) return this.FILE_OPTION_EMPTY; - if (fileIgnoreRadio.isSelected()) return this.FILE_OPTION_IGNORE; - if (filePromptRadio.isSelected()) return this.FILE_OPTION_PROMPT; - return this.FILE_OPTION_PROMPT; + if (fileGeneratePopulateRadio.isSelected()) return FILE_OPTION_POPULATE; + if (fileGenerateEmptyRadio.isSelected()) return FILE_OPTION_EMPTY; + if (fileIgnoreRadio.isSelected()) return FILE_OPTION_IGNORE; + if (filePromptRadio.isSelected()) return FILE_OPTION_PROMPT; + return FILE_OPTION_PROMPT; } // Returns an integer mask describing the user's selection for duplicate resource key conflicts private int getResourceConflictOption() { - if (resourceOverwriteRadio.isSelected()) return this.RESOURCE_OPTION_OVERWRITE; - if (resourceIgnoreRadio.isSelected()) return this.RESOURCE_OPTION_IGNORE; - if (resourcePromptRadio.isSelected()) return this.RESOURCE_OPTION_PROMPT; - return this.RESOURCE_OPTION_PROMPT; + if (resourceOverwriteRadio.isSelected()) return RESOURCE_OPTION_OVERWRITE; + if (resourceIgnoreRadio.isSelected()) return RESOURCE_OPTION_IGNORE; + if (resourcePromptRadio.isSelected()) return RESOURCE_OPTION_PROMPT; + return RESOURCE_OPTION_PROMPT; } // Returns the group name for use when no group name is specified diff --git a/tools/unicodetools/com/ibm/rbm/RBJavaImporter.java b/tools/unicodetools/com/ibm/rbm/RBJavaImporter.java index 78517c276fd..d57d1e62bb6 100644 --- a/tools/unicodetools/com/ibm/rbm/RBJavaImporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBJavaImporter.java @@ -1,31 +1,22 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBJavaImporter.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; import java.io.*; -import javax.swing.*; import javax.swing.filechooser.*; import java.util.*; -import java.awt.*; -import java.awt.event.*; import java.net.*; /** * This is the super class for all importer plug-in classes. As of yet, there * is little contained in this class. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBJavaImporter extends RBImporter { diff --git a/tools/unicodetools/com/ibm/rbm/RBManager.java b/tools/unicodetools/com/ibm/rbm/RBManager.java index e5b829ce7d0..7a29de28dce 100644 --- a/tools/unicodetools/com/ibm/rbm/RBManager.java +++ b/tools/unicodetools/com/ibm/rbm/RBManager.java @@ -1,21 +1,13 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBManager.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; import java.util.*; import java.io.*; -import java.text.SimpleDateFormat; -import java.text.ParseException; import javax.swing.UIManager; import javax.swing.JOptionPane; @@ -26,7 +18,7 @@ import javax.swing.JOptionPane; * through a constructor, or it can be run from the command line. For additional information on the * command line results, see the main method. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBManager { @@ -513,7 +505,7 @@ public class RBManager { * @param name The unique key of the item * @param value The translation of the item for the base class * @param groupName The group name, should all ready exist in the base class - * @param Comment An optional comment to be added to the item, can be null + * @param comment An optional comment to be added to the item, can be null * @return An error response. If the creation was successful true is returned, if there was an error false is returned. */ diff --git a/tools/unicodetools/com/ibm/rbm/RBManagerGUI.java b/tools/unicodetools/com/ibm/rbm/RBManagerGUI.java index 6ea814581ab..e697a33d363 100644 --- a/tools/unicodetools/com/ibm/rbm/RBManagerGUI.java +++ b/tools/unicodetools/com/ibm/rbm/RBManagerGUI.java @@ -1,14 +1,8 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/Attic/RBManagerGUI.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; @@ -22,14 +16,13 @@ import javax.swing.event.*; import javax.swing.table.*; import javax.swing.text.*; import javax.swing.tree.*; -import javax.swing.filechooser.*; /** * The Graphical User Interface for working with and through a Resource Bundle Manager. The GUI has no public main * method. It is instead instantiated from running the main method in RBManager. For help with using this interface, * consult the documentation included in the project. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBManagerGUI extends JFrame implements ActionListener, MouseListener, ChangeListener, TreeSelectionListener diff --git a/tools/unicodetools/com/ibm/rbm/RBPropertiesImporter.java b/tools/unicodetools/com/ibm/rbm/RBPropertiesImporter.java index 9805b2747e6..e5f9110607c 100644 --- a/tools/unicodetools/com/ibm/rbm/RBPropertiesImporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBPropertiesImporter.java @@ -1,19 +1,12 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBPropertiesImporter.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; import java.io.*; -import javax.swing.*; import javax.swing.filechooser.*; import java.util.*; @@ -21,7 +14,7 @@ import java.util.*; * This is the super class for all importer plug-in classes. As of yet, there * is little contained in this class. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBPropertiesImporter extends RBImporter { diff --git a/tools/unicodetools/com/ibm/rbm/RBReporter.java b/tools/unicodetools/com/ibm/rbm/RBReporter.java index 6c3496c13aa..df4da50c995 100644 --- a/tools/unicodetools/com/ibm/rbm/RBReporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBReporter.java @@ -1,29 +1,20 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBReporter.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; import javax.swing.*; import java.awt.*; -import javax.swing.event.*; import java.awt.event.*; import java.io.*; import java.util.*; -import org.apache.xerces.parsers.*; import org.apache.xerces.dom.*; import org.apache.xml.serialize.*; import org.w3c.dom.*; -import org.xml.sax.*; /** * RBReporter is a fully functional application that runs separate from RBManager. @@ -32,7 +23,7 @@ import org.xml.sax.*; * generated. For more information on command line arguments and usage see the * comments for the main() method. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBReporter extends JFrame { diff --git a/tools/unicodetools/com/ibm/rbm/RBReporterScanner.java b/tools/unicodetools/com/ibm/rbm/RBReporterScanner.java index 0eb985c5928..7425269089d 100644 --- a/tools/unicodetools/com/ibm/rbm/RBReporterScanner.java +++ b/tools/unicodetools/com/ibm/rbm/RBReporterScanner.java @@ -1,29 +1,18 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBReporterScanner.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; -import javax.swing.*; -import java.awt.*; -import javax.swing.event.*; import javax.swing.filechooser.*; -import java.awt.event.*; import java.io.*; import java.util.*; import org.apache.xerces.parsers.*; import org.apache.xerces.dom.*; -import org.apache.xml.serialize.*; import org.w3c.dom.*; import org.xml.sax.*; @@ -31,7 +20,7 @@ import org.xml.sax.*; * RBReporterScaner is a utility class for RBReporter. It creates a report from an xml settings * file that scans code for resources and compares them against a resource bundle. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBReporter */ public class RBReporterScanner { diff --git a/tools/unicodetools/com/ibm/rbm/RBTMXExporter.java b/tools/unicodetools/com/ibm/rbm/RBTMXExporter.java index 14102ff21ec..59e3e64c68f 100644 --- a/tools/unicodetools/com/ibm/rbm/RBTMXExporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBTMXExporter.java @@ -1,14 +1,8 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBTMXExporter.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; @@ -18,7 +12,6 @@ import javax.swing.*; import javax.swing.filechooser.*; import java.util.*; -import org.apache.xerces.parsers.*; import org.apache.xerces.dom.*; import org.apache.xml.serialize.*; import org.w3c.dom.*; @@ -28,7 +21,7 @@ import org.w3c.dom.*; * along with some of the meta-data associated by RBManager to the TMX specification. * For more information on TMX visit the web site http://www.lisa.org/tmx * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBTMXExporter extends RBExporter { diff --git a/tools/unicodetools/com/ibm/rbm/RBTMXImporter.java b/tools/unicodetools/com/ibm/rbm/RBTMXImporter.java index 313c9376a38..e1addd56234 100644 --- a/tools/unicodetools/com/ibm/rbm/RBTMXImporter.java +++ b/tools/unicodetools/com/ibm/rbm/RBTMXImporter.java @@ -1,25 +1,17 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/RBTMXImporter.java,v $ - * $Date: 2002/05/20 18:53:09 $ - * $Revision: 1.1 $ - * - ***************************************************************************** */ package com.ibm.rbm; import java.io.*; -import javax.swing.*; import javax.swing.filechooser.*; import java.util.*; import org.apache.xerces.parsers.*; import org.apache.xerces.dom.*; -import org.apache.xml.serialize.*; import org.w3c.dom.*; import org.xml.sax.*; @@ -30,7 +22,7 @@ import org.xml.sax.*; * displaying it to the user, performing the actual insertions into the resource bundle manager, * and managing any import conflicts. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class RBTMXImporter extends RBImporter { diff --git a/tools/unicodetools/com/ibm/rbm/Resources.java b/tools/unicodetools/com/ibm/rbm/Resources.java index 9b03680ad8e..4b5092e5d14 100644 --- a/tools/unicodetools/com/ibm/rbm/Resources.java +++ b/tools/unicodetools/com/ibm/rbm/Resources.java @@ -1,21 +1,14 @@ /* ***************************************************************************** - * Copyright (C) 2000-2002, International Business Machines Corporation and * + * Copyright (C) 2000-2004, International Business Machines Corporation and * * others. All Rights Reserved. * ***************************************************************************** - * - * $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/rbm/Resources.java,v $ - * $Date: 2002/05/20 23:04:00 $ - * $Revision: 1.2 $ - * - ***************************************************************************** */ package com.ibm.rbm; import java.io.*; import java.net.URL; -import java.net.URLClassLoader; import java.net.JarURLConnection; import java.text.MessageFormat; import java.util.*; @@ -26,7 +19,7 @@ import java.util.zip.ZipEntry; * make sure you first call initBundle(). Once this is done, calling any of the getTranslation() methods will return * the appropriate String. * - * @author Jared Jackson - Email: jjared@almaden.ibm.com + * @author Jared Jackson * @see com.ibm.rbm.RBManager */ public class Resources {