tmf: Bug 476129: NullPointerException in GenerateTestValues.java

The preferences service is not initialized since GenerateTestValues does
not load the Eclipse platform. The default preferences should be used.

Change-Id: I8a033bc59e224e8b9aac79cf5e1e7f21d5b24b75
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/54788
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Tested-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimePreferences.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimePreferences.java
index 4904546c1ba8c7c3921a3dd6f3f6e3d3fa8eaa05..2a1ca50a95d630c61f8280515d8e78d583294463 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimePreferences.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimePreferences.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2014 Ericsson
+ * Copyright (c) 2012, 2015 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -21,6 +21,7 @@ import java.util.TimeZone;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.tracecompass.internal.tmf.core.Activator;
 
@@ -95,7 +96,12 @@ public final class TmfTimePreferences {
      * @return the time zone
      */
     public static TimeZone getTimeZone() {
-        return TimeZone.getTimeZone(Platform.getPreferencesService().getString(Activator.PLUGIN_ID, ITmfTimePreferencesConstants.TIME_ZONE, TimeZone.getDefault().getID(), null));
+        String defaultId = TimeZone.getDefault().getID();
+        IPreferencesService preferencesService = Platform.getPreferencesService();
+        if (preferencesService == null) {
+            return TimeZone.getTimeZone(defaultId);
+        }
+        return TimeZone.getTimeZone(preferencesService.getString(Activator.PLUGIN_ID, ITmfTimePreferencesConstants.TIME_ZONE, defaultId, null));
     }
 
     /**
@@ -104,7 +110,12 @@ public final class TmfTimePreferences {
      * @return the locale
      */
     public static Locale getLocale() {
-        return Locale.forLanguageTag(Platform.getPreferencesService().getString(Activator.PLUGIN_ID, ITmfTimePreferencesConstants.LOCALE, Locale.getDefault().toLanguageTag(), null));
+        String defaultLanguageTag = Locale.getDefault().toLanguageTag();
+        IPreferencesService preferencesService = Platform.getPreferencesService();
+        if (preferencesService == null) {
+            return Locale.forLanguageTag(defaultLanguageTag);
+        }
+        return Locale.forLanguageTag(preferencesService.getString(Activator.PLUGIN_ID, ITmfTimePreferencesConstants.LOCALE, defaultLanguageTag, null));
     }
 
     /**