--- a/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/LocalizationUtils.d	Sat May 02 11:27:24 2009 +0200
+++ b/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/LocalizationUtils.d	Sun Nov 08 12:42:30 2009 +0100
@@ -7,53 +7,56 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     Frank Benoit <benoit@tionex.de>
  *******************************************************************************/
-module org.eclipse.core.internal.runtime.LocalizationUtils;
+// Port to the D programming language:
+//     Frank Benoit <benoit@tionex.de>
+module org.eclipse.core.internal.runtimeLocalizationUtils;
 
 import java.lang.all;
 
+import org.eclipse.core.internal.runtimeCommonMessages; // packageimport
+
+import java.lang.reflect.Field;
+
 /**
  * Helper methods related to string localization.
- *
+ * 
  * @since org.eclipse.equinox.common 3.3
  */
 public class LocalizationUtils {
     /**
-     * This method can be used in the absence of NLS class. The method tries to
+     * This method can be used in the absence of NLS class. The method tries to 
      * use the NLS-based translation routine. If it falls, the method returns the original
      * non-translated key.
-     *
+     * 
      * @param key case-sensitive name of the filed in the translation file representing 
      * the string to be translated
      * @return The localized message or the non-translated key
      */
     static public String safeLocalize(String key) {
-//TODO: LocalizationUtils tries to load module CommonMessages. How to handle this?
-//         try {
-//             Class messageClass = Class.forName("org.eclipse.core.internal.runtime.CommonMessages"); //$NON-NLS-1$
-//             if (messageClass is null)
-//                 return key;
-//             Field field = messageClass.getDeclaredField(key);
-//             if (field is null)
-//                 return key;
-//             Object value = field.get(null);
-//             if (value instanceof String)
-//                 return (String) value;
-//         } catch (ClassNotFoundException e) {
-//             // eat exception and fall through
-//         } catch (NoClassDefFoundError e) {
-//             // eat exception and fall through
-//         } catch (SecurityException e) {
-//             // eat exception and fall through
-//         } catch (NoSuchFieldException e) {
-//             // eat exception and fall through
-//         } catch (IllegalArgumentException e) {
-//             // eat exception and fall through
-//         } catch (IllegalAccessException e) {
-//             // eat exception and fall through
-//         }
+        try {
+            Class messageClass = Class.forName("org.eclipse.core.internal.runtime.CommonMessages"); //$NON-NLS-1$
+            if (messageClass is null)
+                return key;
+            Field field = messageClass.getDeclaredField(key);
+            if (field is null)
+                return key;
+            Object value = field.get(null);
+            if ( null !is cast(String)value )
+                return cast(String) value;
+        } catch (ClassNotFoundException e) {
+            // eat exception and fall through
+        } catch (NoClassDefFoundError e) {
+            // eat exception and fall through
+        } catch (SecurityException e) {
+            // eat exception and fall through
+        } catch (NoSuchFieldException e) {
+            // eat exception and fall through
+        } catch (IllegalArgumentException e) {
+            // eat exception and fall through
+        } catch (IllegalAccessException e) {
+            // eat exception and fall through
+        }
         return key;
     }
 }