Author: adietish Date: 2010-08-18 12:44:38 -0400 (Wed, 18 Aug 2010) New Revision: 24265 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF trunk/usage/plugins/org.jboss.tools.usage/plugin.xml trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.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/preferences/messages.properties trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java Log: [JBIDE-6376] * internal package renamed to reporting * preference storage fixed Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 16:44:38 UTC (rev 24265) @@ -6,7 +6,7 @@ <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-18 16:44:38 UTC (rev 24265) @@ -6,12 +6,12 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.usage, org.jboss.tools.usage.googleanalytics, - org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.preferences, + org.jboss.tools.usage.reporting, org.jboss.tools.usage.util Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui;bundle-version="3.5.0" -Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator +Bundle-Activator: org.jboss.tools.usage.reporting.JBossToolsUsageActivator Bundle-Vendor: %BundleVendor Bundle-ActivationPolicy: lazy Modified: trunk/usage/plugins/org.jboss.tools.usage/plugin.xml =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 16:44:38 UTC (rev 24265) @@ -4,7 +4,7 @@ <extension point="org.eclipse.ui.startup"> <startup - class="org.jboss.tools.usage.internal.UsageReportDispatcher"> + class="org.jboss.tools.usage.reporting.UsageReportDispatcher"> </startup> </extension> <extension Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -14,7 +14,7 @@ import java.text.MessageFormat; import org.jboss.tools.usage.ITracker; -import org.jboss.tools.usage.internal.HttpGetMethod; +import org.jboss.tools.usage.reporting.HttpGetMethod; /** * Reports (tracks) usage Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -14,9 +14,11 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.usage.preferences.messages"; //$NON-NLS-1$ + + public static String UsageReportPreferencePage_Description; public static String UsageReportPreferencePage_AllowReporting; - public static String UsageReportPreferencePage_Error_Saving; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); 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-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -11,9 +11,7 @@ package org.jboss.tools.usage.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.core.runtime.preferences.ConfigurationScope; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.util.PreferencesUtils; /** * @author Andre Dietisheim @@ -22,7 +20,8 @@ AbstractPreferenceInitializer { public void initializeDefaultPreferences() { - IEclipsePreferences preferences = new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); - preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); + PreferencesUtils.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-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -15,8 +15,8 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.jboss.tools.usage.internal.JBossToolsUsageActivator; -import org.jboss.tools.usage.util.PreferencesUtil; +import org.jboss.tools.usage.reporting.JBossToolsUsageActivator; +import org.jboss.tools.usage.reporting.UsageReportPreferences; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; @@ -27,7 +27,6 @@ public UsageReportPreferencePage() { super(GRID); - setPreferenceStore(PreferencesUtil.createConfigurationPreferencesStore()); } public void createFieldEditors() { @@ -38,12 +37,14 @@ } public void init(IWorkbench workbench) { + setPreferenceStore(UsageReportPreferences.createPreferenceStore()); + setDescription(Messages.UsageReportPreferencePage_Description); } @Override public boolean performOk() { try { - PreferencesUtil.getConfigurationPreferences().flush(); + UsageReportPreferences.flush(); } catch (BackingStoreException e) { IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, Messages.UsageReportPreferencePage_Error_Saving, e); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-08-18 16:44:38 UTC (rev 24265) @@ -1,2 +1,3 @@ -UsageReportPreferencePage_AllowReporting=&Allow JBoss Tools to report usage anonymously.\n Data is used for statistical matters only. +UsageReportPreferencePage_Description=Preference page with options for anonymous usage data reporting. Usage data is used for statistical matters only. +UsageReportPreferencePage_AllowReporting=&Allow Red Hat Inc. to report usage anonymously. UsageReportPreferencePage_Error_Saving=Could not save the preferences. Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -1,31 +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.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; - -/** - * @author Andre Dietisheim - */ -public class PreferencesUtil { - - public static IEclipsePreferences getConfigurationPreferences() { - return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); - } - - public static IPersistentPreferenceStore createConfigurationPreferencesStore() { - return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID); - } -} Added: 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 (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -0,0 +1,32 @@ +/******************************************************************************* + * 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.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.reporting.JBossToolsUsageActivator; + +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); + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -23,8 +23,8 @@ import java.util.regex.Pattern; import org.eclipse.core.runtime.Platform; -import org.jboss.tools.usage.internal.EclipseEnvironment; -import org.jboss.tools.usage.internal.JBossBundleGroups; +import org.jboss.tools.usage.reporting.EclipseEnvironment; +import org.jboss.tools.usage.reporting.JBossBundleGroups; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.usage.test; -import org.jboss.tools.usage.internal.EclipseEnvironment; +import org.jboss.tools.usage.reporting.EclipseEnvironment; /** * @author Andre Dietisheim Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Platform; import org.jboss.tools.usage.googleanalytics.FocusPoint; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; -import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy; +import org.jboss.tools.usage.reporting.GoogleAnalyticsUrlStrategy; import org.junit.Before; import org.junit.Test; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -15,7 +15,7 @@ import java.net.HttpURLConnection; import org.jboss.tools.usage.googleanalytics.ILoggingAdapter; -import org.jboss.tools.usage.internal.HttpGetMethod; +import org.jboss.tools.usage.reporting.HttpGetMethod; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-18 16:42:12 UTC (rev 24264) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-18 16:44:38 UTC (rev 24265) @@ -17,8 +17,8 @@ import org.jboss.tools.usage.googleanalytics.ILoggingAdapter; import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy; import org.jboss.tools.usage.googleanalytics.Tracker; -import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy; -import org.jboss.tools.usage.internal.PluginLogger; +import org.jboss.tools.usage.reporting.GoogleAnalyticsUrlStrategy; +import org.jboss.tools.usage.reporting.PluginLogger; import org.junit.Test; /**