package org.eclipse.linuxtools.tmf.core.tests.event;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import java.util.Map;
import java.util.TimeZone;
assertEquals(DefaultScope.INSTANCE.getNode(Activator.PLUGIN_ID).get(ITmfTimePreferencesConstants.DATIME, null), ITmfTimePreferencesConstants.TIME_HOUR_FMT);
}
- /**
- * Test that getInstance returns an instance
- */
- @Test
- public void testGetInstance() {
- assertNotNull(TmfTimePreferences.getInstance());
- }
-
/**
* Test that getTimePattern returns the appropriate time pattern (from the default)
*/
@Test
public void testGetTimePattern() {
- assertEquals(TIME_PATTERN, TmfTimePreferences.getInstance().getTimePattern());
+ assertEquals(TIME_PATTERN, TmfTimePreferences.getTimePattern());
}
/**
*/
@Test
public void testGetIntervalPattern() {
- assertEquals(INTERVAL_PATTERN, TmfTimePreferences.getInstance().getIntervalPattern());
+ assertEquals(INTERVAL_PATTERN, TmfTimePreferences.getIntervalPattern());
}
/**
*/
@Test
public void testGetTimeZone() {
- assertEquals(TimeZone.getDefault(), TmfTimePreferences.getInstance().getTimeZone());
+ assertEquals(TimeZone.getDefault(), TmfTimePreferences.getTimeZone());
}
/**
*/
@Test
public void testGetPreferenceMap() {
- Map<String, String> defaultPreferenceMap = TmfTimePreferences.getInstance().getDefaultPreferenceMap();
+ Map<String, String> defaultPreferenceMap = TmfTimePreferences.getDefaultPreferenceMap();
assertEquals(ITmfTimePreferencesConstants.TIME_HOUR_FMT, defaultPreferenceMap.get(ITmfTimePreferencesConstants.DATIME));
// Modify the preferences
} catch (BackingStoreException e) {
}
// Make sure the modification is in the map
- Map<String, String> preferenceMap = TmfTimePreferences.getInstance().getPreferenceMap();
+ Map<String, String> preferenceMap = TmfTimePreferences.getPreferenceMap();
assertEquals(testValue, preferenceMap.get(ITmfTimePreferencesConstants.DATIME));
// Make sure the default is still the same
- defaultPreferenceMap = TmfTimePreferences.getInstance().getDefaultPreferenceMap();
+ defaultPreferenceMap = TmfTimePreferences.getDefaultPreferenceMap();
assertEquals(ITmfTimePreferencesConstants.TIME_HOUR_FMT, defaultPreferenceMap.get(ITmfTimePreferencesConstants.DATIME));
}
*/
@Test
public void testComputeTimePattern() {
- assertEquals(TIME_PATTERN, TmfTimePreferences.getInstance().computeTimePattern(TmfTimePreferences.getInstance().getPreferenceMap()));
+ assertEquals(TIME_PATTERN, TmfTimePreferences.computeTimePattern(TmfTimePreferences.getPreferenceMap()));
}
}
*/
@Test
public void testGetDefaulTimeFormat() {
- assertEquals(TmfTimestampFormat.getDefaulTimeFormat().toPattern(), TmfTimePreferences.getInstance().getTimePattern());
+ assertEquals(TmfTimestampFormat.getDefaulTimeFormat().toPattern(), TmfTimePreferences.getTimePattern());
}
/**
*/
@Test
public void testGetDefaulIntervalFormat() {
- assertEquals(TmfTimestampFormat.getDefaulIntervalFormat().toPattern(), TmfTimePreferences.getInstance().getIntervalPattern());
+ assertEquals(TmfTimestampFormat.getDefaulIntervalFormat().toPattern(), TmfTimePreferences.getIntervalPattern());
}
/**
* @version 1.0
* @since 2.1
*/
-public class TmfTimePreferences {
+public final class TmfTimePreferences {
// ------------------------------------------------------------------------
// Constants
private static final String TIME_DELIMITER_DEFAULT = ITmfTimePreferencesConstants.DELIMITER_COLON;
private static final String SSEC_DELIMITER_DEFAULT = ITmfTimePreferencesConstants.DELIMITER_SPACE;
private static final String TIME_ZONE_DEFAULT = TimeZone.getDefault().getID();
- // ------------------------------------------------------------------------
- // Attributes
- // ------------------------------------------------------------------------
-
- private static TmfTimePreferences fPreferences;
// ------------------------------------------------------------------------
// Constructor
defaultPreferences.put(ITmfTimePreferencesConstants.SSEC_DELIMITER, SSEC_DELIMITER_DEFAULT);
defaultPreferences.put(ITmfTimePreferencesConstants.TIME_ZONE, TIME_ZONE_DEFAULT);
- // Create the singleton and update default formats
- getInstance();
- }
-
- /**
- * Get the TmfTimePreferences singleton
- *
- * @return The TmfTimePreferences instance
- */
- public static synchronized TmfTimePreferences getInstance() {
- if (fPreferences == null) {
- fPreferences = new TmfTimePreferences();
- TmfTimestampFormat.updateDefaultFormats();
- }
- return fPreferences;
+ TmfTimestampFormat.updateDefaultFormats();
}
/**
*
* @return the timestamp pattern
*/
- public String getTimePattern() {
+ public static String getTimePattern() {
return computeTimePattern(getPreferenceMap(false));
}
*
* @return the interval pattern
*/
- public String getIntervalPattern() {
+ public static String getIntervalPattern() {
return computeIntervalPattern(getPreferenceMap(false));
}
*
* @return the time zone
*/
- public TimeZone getTimeZone() {
+ public static TimeZone getTimeZone() {
return TimeZone.getTimeZone(Platform.getPreferencesService().getString(Activator.PLUGIN_ID, ITmfTimePreferencesConstants.TIME_ZONE, TimeZone.getDefault().getID(), null));
}
*
* @return a collection containing the default preferences
*/
- public Map<String, String> getDefaultPreferenceMap() {
+ public static Map<String, String> getDefaultPreferenceMap() {
return getPreferenceMap(true);
}
*
* @return a collection containing the current preferences
*/
- public Map<String, String> getPreferenceMap() {
+ public static Map<String, String> getPreferenceMap() {
return getPreferenceMap(false);
}
* @param prefsMap the preferences to apply when computing the time pattern
* @return the time pattern resulting in applying the preferences
*/
- public String computeTimePattern(Map<String, String> prefsMap) {
+ public static String computeTimePattern(Map<String, String> prefsMap) {
String dateTimeFormat = prefsMap.get(ITmfTimePreferencesConstants.DATIME);
if (dateTimeFormat == null) {
dateTimeFormat = ITmfTimePreferencesConstants.DEFAULT_TIME_PATTERN;
* The default constructor (uses the default pattern)
*/
public TmfTimestampFormat() {
- this(TmfTimePreferences.getInstance().getTimePattern());
+ this(TmfTimePreferences.getTimePattern());
}
/**
* @since 2.1
*/
public static void updateDefaultFormats() {
- fDefaultTimeFormat = new TmfTimestampFormat(TmfTimePreferences.getInstance().getTimePattern(), TmfTimePreferences.getInstance().getTimeZone());
- fDefaultIntervalFormat = new TmfTimestampFormat(TmfTimePreferences.getInstance().getIntervalPattern());
+ fDefaultTimeFormat = new TmfTimestampFormat(TmfTimePreferences.getTimePattern(), TmfTimePreferences.getTimeZone());
+ fDefaultIntervalFormat = new TmfTimestampFormat(TmfTimePreferences.getIntervalPattern());
}
/**
*/
public static TmfTimestampFormat getDefaulTimeFormat() {
if (fDefaultTimeFormat == null) {
- fDefaultTimeFormat = new TmfTimestampFormat(TmfTimePreferences.getInstance().getTimePattern(), TmfTimePreferences.getInstance().getTimeZone());
+ fDefaultTimeFormat = new TmfTimestampFormat(TmfTimePreferences.getTimePattern(), TmfTimePreferences.getTimeZone());
}
return fDefaultTimeFormat;
}
*/
public static TmfTimestampFormat getDefaulIntervalFormat() {
if (fDefaultIntervalFormat == null) {
- fDefaultIntervalFormat = new TmfTimestampFormat(TmfTimePreferences.getInstance().getIntervalPattern());
+ fDefaultIntervalFormat = new TmfTimestampFormat(TmfTimePreferences.getIntervalPattern());
}
return fDefaultIntervalFormat;
}
// General stuff
private Composite fPage;
private IPreferenceStore fPreferenceStore;
- private TmfTimePreferences fTimePreference;
// Example section
private Composite fExampleSection;
*/
public TmfTimestampFormatPage() {
fPreferenceStore = getPreferenceStore();
- fTimePreference = TmfTimePreferences.getInstance();
- fPreferenceMap = fTimePreference.getPreferenceMap();
+ fPreferenceMap = TmfTimePreferences.getPreferenceMap();
}
// ------------------------------------------------------------------------
fSSecFieldDelim.loadDefault();
fCombo.loadDefault();
- fPreferenceMap = TmfTimePreferences.getInstance().getDefaultPreferenceMap();
+ fPreferenceMap = TmfTimePreferences.getDefaultPreferenceMap();
displayExample();
}
private void displayExample() {
long ts = 1332170682500677380L;
- String timePattern = fTimePreference.computeTimePattern(fPreferenceMap);
+ String timePattern = TmfTimePreferences.computeTimePattern(fPreferenceMap);
fPatternDisplay.setText(timePattern);
fPatternDisplay.redraw();
* Updates the timezone using the preferences.
*/
public static void updateTimeZone() {
- final TimeZone timeZone = TmfTimePreferences.getInstance().getTimeZone();
+ final TimeZone timeZone = TmfTimePreferences.getTimeZone();
for (SimpleDateFormat sdf : formatArray) {
sdf.setTimeZone(timeZone);
}
* @since 2.1
*/
public static void updateTimeZone() {
- TimeZone timeZone = TmfTimePreferences.getInstance().getTimeZone();
+ TimeZone timeZone = TmfTimePreferences.getTimeZone();
TIME_FORMAT.setTimeZone(timeZone);
DATE_FORMAT.setTimeZone(timeZone);
}
projects / deliverable / tracecompass.git / commitdiff
