ICU-3501 Fix some compiler warnings, remove CVS keywords, e-mail addresses and other stuff

X-SVN-Rev: 15946
This commit is contained in:
George Rhoten 2004-06-29 01:59:28 +00:00
parent bf95904d79
commit 4e48ae74ff
14 changed files with 48 additions and 155 deletions

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @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
*/

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBReporter
*/
public class Occurance {

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBExporter {

View File

@ -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;

View File

@ -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.*;
* </OL>
* </P>
*
* @author Jared Jackson - Email: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @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

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBJavaImporter extends RBImporter {

View File

@ -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 <CODE>main</CODE> method.
*
* @author Jared Jackson - Email: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @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 <CODE>null</CODE>
* @param comment An optional comment to be added to the item, can be <CODE>null</CODE>
* @return An error response. If the creation was successful <CODE>true</CODE> is returned, if there was an error <CODE>false</CODE> is returned.
*/

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBManagerGUI extends JFrame implements ActionListener, MouseListener, ChangeListener, TreeSelectionListener

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBPropertiesImporter extends RBImporter {

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBReporter extends JFrame {

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBReporter
*/
public class RBReporterScanner {

View File

@ -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 <A HREF=http://www.lis.org/tmx>http://www.lisa.org/tmx</A>
*
* @author Jared Jackson - Email: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBTMXExporter extends RBExporter {

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class RBTMXImporter extends RBImporter {

View File

@ -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: <a href="mailto:jjared@almaden.ibm.com">jjared@almaden.ibm.com</a>
* @author Jared Jackson
* @see com.ibm.rbm.RBManager
*/
public class Resources {