Attachment 103606 Details for Bug 235621 – Updated code will correctly choose country specific dll's before the general .dll

[patch] Updated code will correctly choose country specific dll's before the general .dll

CountrySpecificLocale.patch (text/plain), 2.06 KB, created by James Bruck

on 2008-06-04 13:30:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Bruck

Created: 2008-06-04 13:30:28 EDT

Size: 2.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.common.ui.printing.win32
>Index: src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java,v
>retrieving revision 1.8
>diff -u -r1.8 PrintHelper.java
>--- src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java	3 Jun 2008 19:38:03 -0000	1.8
>+++ src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java	4 Jun 2008 17:25:11 -0000
>@@ -78,24 +78,20 @@
>         // with one line of code
>         // System.loadLibrary("DiagramPrint");
> 
>+    	List<String> supported = new ArrayList<String>(Arrays.asList(SUPPORTED));
>     	String localizedVersion = DEFAULT_LOCALE;
>-
>-        List supported = new ArrayList();
>-        supported.addAll(Arrays.asList(SUPPORTED));
>-
>-        String language = Locale.getDefault().getLanguage().toLowerCase();
>-        if (supported.contains(language)) {
>-            localizedVersion = language;
>-        } else {
>-            String country = Locale.getDefault().getCountry().toUpperCase();
>-            if (country != null) {
>-                String locale = language + SEPARATOR + country;
>-                if (supported.contains(locale)) {
>-                    localizedVersion = locale;
>-                }
>-            }
>-        }
>-
>+    	
>+        Locale defaultLocale = Locale.getDefault();
>+		String language = defaultLocale.getLanguage().toLowerCase();
>+		String country = defaultLocale.getCountry().toUpperCase();
>+		String countrySpecificLocale = language + SEPARATOR + country;
>+
>+		if (supported.contains(countrySpecificLocale)) {
>+			localizedVersion = countrySpecificLocale;
>+		} else if (supported.contains(language)) {
>+			localizedVersion = language;
>+		} 
>+         
>         try {
>             System.loadLibrary(DLL_NAME + SEPARATOR + localizedVersion);
>         } catch (UnsatisfiedLinkError ule) {

Flags:

ahunter.eclipse: iplog+

Actions: View | Diff

Attachments on bug 235621: 103606