Author: adietish Date: 2010-09-21 11:24:25 -0400 (Tue, 21 Sep 2010) New Revision: 25062 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencesUtils.java Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java Log: usage reporting: renamed and moved preferences classes Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -21,7 +21,7 @@ import org.jboss.tools.usage.googleanalytics.IUserAgent; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; -import org.jboss.tools.usage.util.PreferencesUtils; +import org.jboss.tools.usage.preferences.UsageReportPreferencesUtils; /** * @author Andre Dietisheim @@ -117,7 +117,7 @@ if (userId == null) { userId = createIdentifier(); preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); - PreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), + UsageReportPreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), GoogleAnalyticsEclipseMessages.EclipseEnvironment_Error_SavePreferences); } return userId; @@ -159,7 +159,7 @@ currentVisit = String.valueOf(System.currentTimeMillis()); visitCount++; preferences.putLong(IUsageReportPreferenceConstants.VISIT_COUNT, visitCount); - PreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), + UsageReportPreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), GoogleAnalyticsEclipseMessages.EclipseEnvironment_Error_SavePreferences); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -11,7 +11,6 @@ package org.jboss.tools.usage.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.jboss.tools.usage.util.PreferencesUtils; /** * @author Andre Dietisheim @@ -20,11 +19,11 @@ AbstractPreferenceInitializer { public void initializeDefaultPreferences() { - PreferencesUtils.getStore().setDefault( + UsageReportPreferencesUtils.getStore().setDefault( IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE); - PreferencesUtils.getStore().setDefault( + UsageReportPreferencesUtils.getStore().setDefault( IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -16,7 +16,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; -import org.jboss.tools.usage.reporting.UsageReportPreferences; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferences.java (from rev 25055, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferences.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferences.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.usage.preferences; + +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.jface.preference.IPreferenceStore; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.reporting.ReportingMessages; +import org.jboss.tools.usage.util.StatusUtils; +import org.osgi.service.prefs.BackingStoreException; + +/** + * @author Andre Dietisheim + */ +public class UsageReportPreferences { + + public static void setEnabled(boolean enabled) { + UsageReportPreferencesUtils.getStore().putValue( + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled)); + } + + public static boolean isEnabled() { + return UsageReportPreferencesUtils.getPreferences().getBoolean( + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); + } + + public static boolean isAskUser() { + return UsageReportPreferencesUtils.getPreferences().getBoolean( + IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, + IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE); + } + + public static void setAskUser(boolean askUser) { + try { + IEclipsePreferences preferences = UsageReportPreferencesUtils.getPreferences(); + preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, askUser); + preferences.flush(); + } catch (BackingStoreException e) { + JBossToolsUsageActivator.getDefault().getLog().log( + StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, + ReportingMessages.UsageReport_Error_SavePreferences, e, + IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID)); + } + } + + public static void flush() throws BackingStoreException { + UsageReportPreferencesUtils.getPreferences().flush(); + } + + public static IPreferenceStore createPreferenceStore() { + return UsageReportPreferencesUtils.getStore(); + } +} Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencesUtils.java (from rev 25055, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencesUtils.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencesUtils.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.usage.preferences; + +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.IEclipsePreferences; +import org.eclipse.jface.preference.IPersistentPreferenceStore; +import org.eclipse.ui.preferences.ScopedPreferenceStore; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.util.StatusUtils; +import org.osgi.service.prefs.BackingStoreException; + +/** + * @author Andre Dietisheim + */ +public class UsageReportPreferencesUtils { + + private UsageReportPreferencesUtils() { + // inhibit instantiation + } + + public static IEclipsePreferences getPreferences() { + return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); + } + + public static IPersistentPreferenceStore getStore() { + return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID); + } + + public static void checkedSavePreferences(IEclipsePreferences preferences, Plugin plugin, String message) { + try { + preferences.flush(); + } catch (BackingStoreException e) { + IStatus status = StatusUtils.getErrorStatus(plugin.getBundle().getSymbolicName(), + message, + e, preferences.absolutePath()); + plugin.getLog().log(status); + } + + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencesUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -32,7 +32,8 @@ import org.jboss.tools.usage.http.IHttpGetRequest; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.preferences.GlobalUsageSettings; -import org.jboss.tools.usage.util.PreferencesUtils; +import org.jboss.tools.usage.preferences.UsageReportPreferences; +import org.jboss.tools.usage.preferences.UsageReportPreferencesUtils; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; @@ -88,7 +89,7 @@ IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironment( GANALYTICS_ACCOUNTNAME , HOST_NAME - , PreferencesUtils.getPreferences()); + , UsageReportPreferencesUtils.getPreferences()); ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageActivator.getDefault()); IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseEnvironment); IHttpGetRequest httpGetRequest = new HttpGetRequest(eclipseEnvironment.getUserAgent(), loggingAdapter); Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.usage.reporting; - -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.jface.preference.IPreferenceStore; -import org.jboss.tools.usage.internal.JBossToolsUsageActivator; -import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; -import org.jboss.tools.usage.util.PreferencesUtils; -import org.jboss.tools.usage.util.StatusUtils; -import org.osgi.service.prefs.BackingStoreException; - -/** - * @author Andre Dietisheim - */ -public class UsageReportPreferences { - - public static void setEnabled(boolean enabled) { - PreferencesUtils.getStore().putValue( - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled)); - } - - public static boolean isEnabled() { - return PreferencesUtils.getPreferences().getBoolean( - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); - } - - public static boolean isAskUser() { - return PreferencesUtils.getPreferences().getBoolean( - IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, - IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_DEFAULTVALUE); - } - - public static void setAskUser(boolean askUser) { - try { - IEclipsePreferences preferences = PreferencesUtils.getPreferences(); - preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, askUser); - preferences.flush(); - } catch (BackingStoreException e) { - JBossToolsUsageActivator.getDefault().getLog().log( - StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, - ReportingMessages.UsageReport_Error_SavePreferences, e, - IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID)); - } - } - - public static void flush() throws BackingStoreException { - PreferencesUtils.getPreferences().flush(); - } - - public static IPreferenceStore createPreferenceStore() { - return PreferencesUtils.getStore(); - } -} Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-09-21 15:24:25 UTC (rev 25062) @@ -5,5 +5,6 @@ UsageReport_DialogMessage=Please allow the JBoss Tools team to receive anonymous usage statistics for this Eclipse installation with JBoss tools (<a>info</a>). UsageReport_DialogTitle=JBoss Tools Usage UsageReport_Error_SavePreferences=Could not save preferences {0} +# this shall be refactored when we switch away from IStartup UsageReport_GoogleAnalyticsAccount=UA-17645367-1 UsageReport_HostName=jboss.org Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.usage.util; - -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.IEclipsePreferences; -import org.eclipse.jface.preference.IPersistentPreferenceStore; -import org.eclipse.ui.preferences.ScopedPreferenceStore; -import org.jboss.tools.usage.internal.JBossToolsUsageActivator; -import org.osgi.service.prefs.BackingStoreException; - -/** - * @author Andre Dietisheim - */ -public class PreferencesUtils { - - private PreferencesUtils() { - // inhibit instantiation - } - - public static IEclipsePreferences getPreferences() { - return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); - } - - public static IPersistentPreferenceStore getStore() { - return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID); - } - - public static void checkedSavePreferences(IEclipsePreferences preferences, Plugin plugin, String message) { - try { - preferences.flush(); - } catch (BackingStoreException e) { - IStatus status = StatusUtils.getErrorStatus(plugin.getBundle().getSymbolicName(), - message, - e, preferences.absolutePath()); - plugin.getLog().log(status); - } - - } -} Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-09-21 15:22:34 UTC (rev 25061) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-09-21 15:24:25 UTC (rev 25062) @@ -11,7 +11,6 @@ package org.jboss.tools.usage.test; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException;