Author: dgolovin Date: 2011-08-26 20:18:39 -0400 (Fri, 26 Aug 2011) New Revision: 34348 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferenceInitializer.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencesUtils.java Log: fix for preferences loading. DefaultScope should be asked for default values because it enables: 1. PreferenceIntializer to be called for default initialization 2. plugin_customization.ini values to be applied for usage preferences Everything else stays the same Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferenceInitializer.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferenceInitializer.java 2011-08-26 21:34:23 UTC (rev 34347) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferenceInitializer.java 2011-08-27 00:18:39 UTC (rev 34348) @@ -22,9 +22,5 @@ UsageReportPreferencesUtils.getStore().setDefault( IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE); - - UsageReportPreferencesUtils.getStore().setDefault( - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); } } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2011-08-26 21:34:23 UTC (rev 34347) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2011-08-27 00:18:39 UTC (rev 34348) @@ -41,7 +41,8 @@ /** * Returns <code>true</code> if the usage reporting enablement is set in the - * preferences. Returns <code>false</code> otherwise. + * preferences. Returns <code>false</code> otherwise. It is intentionally not set + * by UsageReportPreferenceInitializer * * @return */ @@ -60,7 +61,7 @@ public static boolean isEnabled() { return UsageReportPreferencesUtils.getPreferences().getBoolean( IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); + getEnabledDefault()); } /** @@ -71,10 +72,33 @@ public static boolean isAskUser() { return UsageReportPreferencesUtils.getPreferences().getBoolean( IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, + getAskUserDefault()); + } + + /** + * Get default value for isAskUser preference + * + * @return default value set by UsageReportPreferenceInitializer + */ + static boolean getAskUserDefault() { + return UsageReportPreferencesUtils.getDefaultPreferences().getBoolean( + IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE); } /** + * Get default value for isEnabled preference + * + * @return default value that is set in plugin_customization.ini file or + * IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE otherwise + * + */ + public static boolean getEnabledDefault() { + return UsageReportPreferencesUtils.getDefaultPreferences().getBoolean( + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); + } + /** * Sets the ask user. * * @param askUser Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencesUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencesUtils.java 2011-08-26 21:34:23 UTC (rev 34347) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencesUtils.java 2011-08-27 00:18:39 UTC (rev 34348) @@ -13,6 +13,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.preferences.ConfigurationScope; +import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.ui.preferences.ScopedPreferenceStore; @@ -30,11 +31,15 @@ } public static IEclipsePreferences getPreferences() { - return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); + return ConfigurationScope.INSTANCE.getNode(JBossToolsUsageActivator.PLUGIN_ID); } - + + public static IEclipsePreferences getDefaultPreferences() { + return DefaultScope.INSTANCE.getNode(JBossToolsUsageActivator.PLUGIN_ID); + } + public static IPersistentPreferenceStore getStore() { - return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID); + return new ScopedPreferenceStore(ConfigurationScope.INSTANCE, JBossToolsUsageActivator.PLUGIN_ID); } public static void checkedSavePreferences(IEclipsePreferences preferences, Plugin plugin, String message) {