1.1 --- a/mdr/jmiutils/src/org/netbeans/lib/jmi/mapping/GenericMapper.java	Fri Oct 01 16:09:49 2004 +0000
     1.2 +++ b/mdr/jmiutils/src/org/netbeans/lib/jmi/mapping/GenericMapper.java	Mon Oct 04 10:48:14 2004 +0000
     1.3 @@ -71,15 +71,15 @@
     1.4      // helper function for converting first character of the string to upper case
     1.5      protected static String firstUpper(String text) {
     1.6          if (text == null) return null;
     1.7 -        if (text.length() < 2) return text.toUpperCase();
     1.8 -        return text.substring(0, 1).toUpperCase() + text.substring(1);
     1.9 +        if (text.length() < 2) return text.toUpperCase(Locale.US);
    1.10 +        return text.substring(0, 1).toUpperCase(Locale.US) + text.substring(1);
    1.11      }
    1.12  
    1.13      // helper function for converting first character of the string to lower case
    1.14      protected static String firstLower(String text) {
    1.15          if (text == null) return null;
    1.16 -        if (text.length() < 2) return text.toLowerCase();
    1.17 -        return text.substring(0, 1).toLowerCase() + text.substring(1);
    1.18 +        if (text.length() < 2) return text.toLowerCase(Locale.US);
    1.19 +        return text.substring(0, 1).toLowerCase(Locale.US) + text.substring(1);
    1.20      }
    1.21  
    1.22      // helper function for removing underscore characters from a structure member name
    1.23 @@ -98,7 +98,7 @@
    1.24                  // convert the letter following the "_" to uppercase it
    1.25                  // in case it is not the first character
    1.26                  if (oldPos > 0) {
    1.27 -                    firstChar = firstChar.toUpperCase();
    1.28 +                    firstChar = firstChar.toUpperCase(Locale.US);
    1.29                  }
    1.30                  // and append it
    1.31                  result.append(firstChar);

     2.1 --- a/mdr/jmiutils/src/org/netbeans/lib/jmi/util/ClassFileGenerator.java	Fri Oct 01 16:09:49 2004 +0000
     2.2 +++ b/mdr/jmiutils/src/org/netbeans/lib/jmi/util/ClassFileGenerator.java	Mon Oct 04 10:48:14 2004 +0000
     2.3 @@ -286,7 +286,7 @@
     2.4          }
     2.5          
     2.6          public int hashCode() {
     2.7 -            return name.toUpperCase().hashCode();
     2.8 +            return name.toUpperCase(Locale.US).hashCode();
     2.9          }
    2.10      }
    2.11      
    2.12 @@ -608,7 +608,7 @@
    2.13      
    2.14      protected static String firstUpper(String text) {
    2.15          try {
    2.16 -            return text.substring(0, 1).toUpperCase() + text.substring(1);
    2.17 +            return text.substring(0, 1).toUpperCase(Locale.US) + text.substring(1);
    2.18          } catch (IndexOutOfBoundsException e) {
    2.19              return ""; //NOI18N
    2.20          }
    2.21 @@ -616,7 +616,7 @@
    2.22      
    2.23      protected static String firstLower(String text) {
    2.24          try {
    2.25 -            return text.substring(0, 1).toLowerCase() + text.substring(1);
    2.26 +            return text.substring(0, 1).toLowerCase(Locale.US) + text.substring(1);
    2.27          } catch (IndexOutOfBoundsException e) {
    2.28              return ""; //NOI18N
    2.29          }

     3.1 --- a/mdr/jmiutils/src/org/netbeans/lib/jmi/util/TagProvider.java	Fri Oct 01 16:09:49 2004 +0000
     3.2 +++ b/mdr/jmiutils/src/org/netbeans/lib/jmi/util/TagProvider.java	Mon Oct 04 10:48:14 2004 +0000
     3.3 @@ -218,7 +218,7 @@
     3.4                      if (result == null) {
     3.5                          sb.append("impl"); //NOI18N
     3.6                      } else {
     3.7 -                        result = result.toLowerCase();
     3.8 +                        result = result.toLowerCase(Locale.US);
     3.9                          if ("javax.jmi".equals(result)) { //NOI18N
    3.10                              sb.append("org.netbeans.jmiimpl.mof"); //NOI18N
    3.11                          } else if (result.startsWith("org.netbeans.jmi.")) { //NOI18N
    3.12 @@ -236,7 +236,7 @@
    3.13                          }
    3.14                      }
    3.15                  } else {
    3.16 -                    sb.append(result.toLowerCase());
    3.17 +                    sb.append(result.toLowerCase(Locale.US));
    3.18                  }
    3.19              } else {
    3.20                  getImplPrefix(container, sb);
    3.21 @@ -247,7 +247,7 @@
    3.22                  packageName = mapName(pckg.getName(), false, true);
    3.23              }
    3.24  
    3.25 -            sb.append('.').append(packageName.toLowerCase());
    3.26 +            sb.append('.').append(packageName.toLowerCase(Locale.US));
    3.27              
    3.28              return sb;
    3.29          } catch (Exception e) {
    3.30 @@ -266,7 +266,7 @@
    3.31          if (container == null) {
    3.32              String result = getTagValue(pckg, TagProvider.TAGID_PACKAGE_PREFIX);
    3.33              if (result != null) {
    3.34 -                sb.append(result.toLowerCase()).append('.');
    3.35 +                sb.append(result.toLowerCase(Locale.US)).append('.');
    3.36              }
    3.37          } else {
    3.38              getTypePrefix(container, sb).append('.');
    3.39 @@ -277,6 +277,6 @@
    3.40              packageName = mapName(pckg.getName(), false, true);
    3.41          }
    3.42  
    3.43 -        return sb.append(packageName.toLowerCase());
    3.44 +        return sb.append(packageName.toLowerCase(Locale.US));
    3.45      }
    3.46  }

     4.1 --- a/mdr/jmiutils/src/org/netbeans/lib/jmi/xmi/XmiUtils.java	Fri Oct 01 16:09:49 2004 +0000
     4.2 +++ b/mdr/jmiutils/src/org/netbeans/lib/jmi/xmi/XmiUtils.java	Mon Oct 04 10:48:14 2004 +0000
     4.3 @@ -12,6 +12,7 @@
     4.4   */
     4.5  package org.netbeans.lib.jmi.xmi;
     4.6  
     4.7 +import java.util.Locale;
     4.8  import org.w3c.dom.Node;
     4.9  import org.w3c.dom.NodeList;
    4.10  import java.util.ArrayList;
    4.11 @@ -139,7 +140,7 @@
    4.12  
    4.13      public static String getShortName(String fullyQualifiedName) {
    4.14          String result = fullyQualifiedName;
    4.15 -        if ((fullyQualifiedName != null) && (fullyQualifiedName.toUpperCase().indexOf( XmiConstants.XMI_PREFIX ) > -1)) return fullyQualifiedName;
    4.16 +        if ((fullyQualifiedName != null) && (fullyQualifiedName.toUpperCase(Locale.US).indexOf( XmiConstants.XMI_PREFIX ) > -1)) return fullyQualifiedName;
    4.17          if ((result != null) && (result.indexOf(XmiConstants.NS_SEPARATOR)>-1)) result = result.substring(result.indexOf(XmiConstants.NS_SEPARATOR)+1);
    4.18          if ((result != null) && (result.indexOf(XmiConstants.DOT_SEPARATOR)>-1)) result = result.substring(result.lastIndexOf(XmiConstants.DOT_SEPARATOR)+1);
    4.19          return result;

     5.1 --- a/mdr/src/org/netbeans/mdr/handlers/gen/ContentsFinder.java	Fri Oct 01 16:09:49 2004 +0000
     5.2 +++ b/mdr/src/org/netbeans/mdr/handlers/gen/ContentsFinder.java	Mon Oct 04 10:48:14 2004 +0000
     5.3 @@ -34,8 +34,8 @@
     5.4  
     5.5      private static String firstUpper(String text) {
     5.6          if (text == null) return null;
     5.7 -        if (text.length() < 2) return text.toUpperCase();
     5.8 -        return text.substring(0, 1).toUpperCase() + text.substring(1);
     5.9 +        if (text.length() < 2) return text.toUpperCase(Locale.US);
    5.10 +        return text.substring(0, 1).toUpperCase(Locale.US) + text.substring(1);
    5.11      }
    5.12  
    5.13      private void retrieveContents(StorableBaseObject storable, StorableObject meta) throws Exception {

     6.1 --- a/mdr/src/org/netbeans/mdr/handlers/gen/TagSupport.java	Fri Oct 01 16:09:49 2004 +0000
     6.2 +++ b/mdr/src/org/netbeans/mdr/handlers/gen/TagSupport.java	Mon Oct 04 10:48:14 2004 +0000
     6.3 @@ -12,6 +12,7 @@
     6.4   */
     6.5  package org.netbeans.mdr.handlers.gen;
     6.6  
     6.7 +import java.util.Locale;
     6.8  import org.netbeans.mdr.storagemodel.StorableObject;
     6.9  import org.netbeans.mdr.util.DebugException;
    6.10  import org.netbeans.mdr.util.Logger;
    6.11 @@ -259,7 +260,7 @@
    6.12                      if (result == null) {
    6.13                          sb.append("impl"); //NOI18N
    6.14                      } else {
    6.15 -                        result = result.toLowerCase();
    6.16 +                        result = result.toLowerCase(Locale.US);
    6.17                          if ("javax.jmi".equals(result)) { //NOI18N
    6.18                              sb.append("org.netbeans.jmiimpl.mof"); //NOI18N
    6.19                          } else if (result.startsWith("org.netbeans.jmi.")) { //NOI18N
    6.20 @@ -277,7 +278,7 @@
    6.21                          }
    6.22                      }
    6.23                  } else {
    6.24 -                    sb.append(result.toLowerCase());
    6.25 +                    sb.append(result.toLowerCase(Locale.US));
    6.26                  }
    6.27              } else {
    6.28                  getImplPrefix(container, sb);
    6.29 @@ -288,7 +289,7 @@
    6.30                  packageName = mapName((String) pckg.getAttribute(MOFConstants.SH_MODEL_MODEL_ELEMENT_NAME), false, true);
    6.31              }
    6.32  
    6.33 -            sb.append('.').append(packageName.toLowerCase());
    6.34 +            sb.append('.').append(packageName.toLowerCase(Locale.US));
    6.35              
    6.36              return sb;
    6.37          } catch (Exception e) {
    6.38 @@ -312,7 +313,7 @@
    6.39              if (container == null) {
    6.40                  String result = getTagValue(pckg, TAGID_PACKAGE_PREFIX);
    6.41                  if (result != null) {
    6.42 -                    sb.append(result.toLowerCase()).append('.');
    6.43 +                    sb.append(result.toLowerCase(Locale.US)).append('.');
    6.44                  }
    6.45              } else {
    6.46                  getTypePrefix(container, sb).append('.');
    6.47 @@ -323,7 +324,7 @@
    6.48                  packageName = mapName((String) pckg.getAttribute(MOFConstants.SH_MODEL_MODEL_ELEMENT_NAME), false, true);
    6.49              }
    6.50              
    6.51 -            return sb.append(packageName.toLowerCase());
    6.52 +            return sb.append(packageName.toLowerCase(Locale.US));
    6.53          } catch (Exception e) {
    6.54              throw (DebugException) Logger.getDefault().annotate(new DebugException(), e);
    6.55          }

     7.1 --- a/mdr/src/org/netbeans/mdr/util/IOUtils.java	Fri Oct 01 16:09:49 2004 +0000
     7.2 +++ b/mdr/src/org/netbeans/mdr/util/IOUtils.java	Mon Oct 04 10:48:14 2004 +0000
     7.3 @@ -153,7 +153,7 @@
     7.4          try {
     7.5              storage.writeMOFID (outputStream, mofId);
     7.6          }catch (StorageException se) {
     7.7 -            throw new IOException ();
     7.8 +            throw (IOException) Logger.getDefault().annotate(new IOException(se.getMessage()), se);
     7.9          }
    7.10      }
    7.11      
    7.12 @@ -392,7 +392,7 @@
    7.13          try {
    7.14              return storage.readMOFID (inputStream);
    7.15          } catch (StorageException se) {
    7.16 -            throw new IOException ();
    7.17 +            throw (IOException) Logger.getDefault().annotate(new IOException(se.getMessage()), se);
    7.18          }
    7.19      }
    7.20      

     8.1 --- a/mdr/src/org/netbeans/mdr/util/ImplGenerator.java	Fri Oct 01 16:09:49 2004 +0000
     8.2 +++ b/mdr/src/org/netbeans/mdr/util/ImplGenerator.java	Mon Oct 04 10:48:14 2004 +0000
     8.3 @@ -323,7 +323,7 @@
     8.4          }
     8.5  
     8.6          public int hashCode() {
     8.7 -            return name.toUpperCase().hashCode();
     8.8 +            return name.toUpperCase(Locale.US).hashCode();
     8.9          }
    8.10      }
    8.11  
    8.12 @@ -873,7 +873,7 @@
    8.13  
    8.14      protected static String firstUpper(String text) {
    8.15          try {
    8.16 -            return text.substring(0, 1).toUpperCase() + text.substring(1);
    8.17 +            return text.substring(0, 1).toUpperCase(Locale.US) + text.substring(1);
    8.18          } catch (IndexOutOfBoundsException e) {
    8.19              return "";
    8.20          }
    8.21 @@ -881,7 +881,7 @@
    8.22  
    8.23      protected static String firstLower(String text) {
    8.24          try {
    8.25 -            return text.substring(0, 1).toLowerCase() + text.substring(1);
    8.26 +            return text.substring(0, 1).toLowerCase(Locale.US) + text.substring(1);
    8.27          } catch (IndexOutOfBoundsException e) {
    8.28              return "";
    8.29          }

     9.1 --- a/mdr/src/org/netbeans/mdr/util/XmiUtils.java	Fri Oct 01 16:09:49 2004 +0000
     9.2 +++ b/mdr/src/org/netbeans/mdr/util/XmiUtils.java	Mon Oct 04 10:48:14 2004 +0000
     9.3 @@ -184,7 +184,7 @@
     9.4  
     9.5      public static String getShortName(String fullyQualifiedName) {
     9.6          String result = fullyQualifiedName;
     9.7 -        if ((fullyQualifiedName != null) && (fullyQualifiedName.toUpperCase().indexOf( XmiConstants.XMI_PREFIX ) > -1)) return fullyQualifiedName;
     9.8 +        if ((fullyQualifiedName != null) && (fullyQualifiedName.toUpperCase(Locale.US).indexOf( XmiConstants.XMI_PREFIX ) > -1)) return fullyQualifiedName;
     9.9          if ((result != null) && (result.indexOf(XmiConstants.NS_SEPARATOR)>-1)) result = result.substring(result.indexOf(XmiConstants.NS_SEPARATOR)+1);
    9.10          if ((result != null) && (result.indexOf(XmiConstants.DOT_SEPARATOR)>-1)) result = result.substring(result.lastIndexOf(XmiConstants.DOT_SEPARATOR)+1);
    9.11          return result;