← Back to branch summary

~ubuntu-branches/ubuntu/karmic/classpath/karmic

« back to all changes in this revision

Viewing changes to gnu/java/nio/charset/EncodingHelper.java

  • Committer: Bazaar Package Importer
  • Author(s): Manny Vindiola, Manny Vindiola, James Westby
  • Date: 2008-12-18 21:24:48 UTC
  • mfrom: (1.1.6 upstream) (8.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081218212448-ax2jaxx9r5175dkl
Tags: 2:0.97.2-1.1ubuntu1
https://launchpad.net/bugs/309549
https://launchpad.net/bugs/237668
https://launchpad.net/bugs/272772
[ Manny Vindiola ]
* Merge from debian unstable (LP: #309549)(LP: #237668), remaining changes:
  * debian/control:
    - Recommend firefox instead of mozilla-firefox.
  * Fix FTBFS caused by -Werror where return value of 'chdir' was ignored
    - add debian/patches/20_fix_ftbfs_warn_unused_result.dpatch
    - update debian/patches/00list
  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
     (meta-package) must alternatively Depend/Recommend/Suggest abrowser
* Fix FTBFS due to missing mozilla-plugin build dependency 
  - changed to build-depends on libxul-dev instead of iceape-dev

[ James Westby ]
* Add libsamplerate0-dev to Build-Depends to fix build error by not being
  able to find the .a file from it. This is a dependency of jack, but not
  specified in it's depends. This is probably due to bug 258491, and so if
  that is fixed try building without the extra Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnu/java/nio/charset/EncodingHelper.java
57
57
     * Contains the mapping from java.io canonical names 
58
58
     * to java.nio canonical names.
59
59
     */
60
 
    private static HashMap canonicalNames;
 
60
    private static final HashMap<String,String> canonicalNames;
61
61
 
62
62
    static {
63
 
        canonicalNames = new HashMap();
 
63
        canonicalNames = new HashMap<String,String>();
64
64
        canonicalNames.put("US-ASCII", "ASCII");
65
65
        canonicalNames.put("windows-1250", "Cp1250");
66
66
        canonicalNames.put("windows-1251", "Cp1251");
94
94
     */
95
95
    public static String getDefaultEncoding()
96
96
    {
97
 
        String encoding;
98
97
        try 
99
98
            {
100
99
                return System.getProperty("file.encoding");