Author: adietish Date: 2010-08-18 10:32:06 -0400 (Wed, 18 Aug 2010) New Revision: 24262 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties 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.properties Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/plugin.xml trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.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/util/BundleUtils.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java Log: [JBIDE-6376] * texts internationalized * saving preferences fixed * preferences added to JBoss Tools Preferences category 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 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 14:32:06 UTC (rev 24262) @@ -7,7 +7,7 @@ <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> <booleanAttribute key="clearConfig" value="false"/> -<booleanAttribute key="clearws" value="false"/> +<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"/> <booleanAttribute key="default" value="true"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/plugin.xml =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 14:32:06 UTC (rev 24262) @@ -12,7 +12,8 @@ <page class="org.jboss.tools.usage.preferences.UsageReportPreferencePage" id="org.jboss.tools.usage.analytics.preferences.UsageAnalyticsPreferencePage" - name="JBoss Usage Analytics Preferences"> + name="JBoss Usage Reporting Preferences" + category="org.jboss.tools.common.model.ui.MainPreferencePage"> </page> </extension> <extension Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -0,0 +1,20 @@ +package org.jboss.tools.usage.internal; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.usage.internal.messages"; //$NON-NLS-1$ + public static String UsageReport_Checkbox_Text; + public static String UsageReport_DialogMessage; + public static String UsageReport_DialogTitle; + public static String UsageReport_Error_SavePreferences; + public static String UsageReport_GoogleAnalyticsAccount; + public static String UsageReport_HostName; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-18 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.usage.internal; -import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; @@ -22,6 +21,7 @@ import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy; import org.jboss.tools.usage.googleanalytics.Tracker; import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; +import org.jboss.tools.usage.util.PreferencesUtil; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; @@ -30,23 +30,24 @@ */ public class UsageReport { - private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1"; + private static final String GANALYTICS_ACCOUNTNAME = Messages.UsageReport_GoogleAnalyticsAccount; - private static final String HOST_NAME = "jboss.org"; + private static final String HOST_NAME = Messages.UsageReport_HostName; - private FocusPoint focusPoint = new FocusPoint("jboss.org") - .setChild(new FocusPoint("tools").setChild(new FocusPoint("usage").setChild(new FocusPoint("action") - .setChild(new FocusPoint("wsstartup"))))); + private FocusPoint focusPoint = new FocusPoint("jboss.org").setChild(new FocusPoint("tools") //$NON-NLS-1$ //$NON-NLS-2$ + .setChild(new FocusPoint("usage").setChild(new FocusPoint("action") //$NON-NLS-1$ //$NON-NLS-2$ + .setChild(new FocusPoint("wsstartup"))))); //$NON-NLS-1$ public void report() { Display.getDefault().asyncExec(new Runnable() { public void run() { - UsageReportEnablementDialog dialog = new UsageReportEnablementDialog("Report usage", - "Please allow Red Hat Inc. to report this installation anynomously for statistical matters.", - "Report usage anonymously to Red Hat Inc.", true, PlatformUI.getWorkbench() - .getActiveWorkbenchWindow()); + UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(Messages.UsageReport_DialogTitle, + Messages.UsageReport_DialogMessage, + Messages.UsageReport_Checkbox_Text, + true, + PlatformUI.getWorkbench().getActiveWorkbenchWindow()); if (isAskUser()) { if (dialog.open() == Window.OK) { setReportEnabled(dialog.isReportEnabled()); @@ -62,8 +63,8 @@ } private void setReportEnabled(boolean enabled) { - IEclipsePreferences preferences = new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); - preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED, enabled); + PreferencesUtil.getConfigurationPreferences().putBoolean( + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, enabled); } private void report(ITracker tracker) { @@ -81,27 +82,26 @@ } private boolean isAskUser() { - IEclipsePreferences preferences = getPreferences(); - return preferences.getBoolean(IUsageReportPreferenceConstants.ASK_USER, true); + IEclipsePreferences preferences = PreferencesUtil.getConfigurationPreferences(); + return preferences.getBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, true); } private void setAskUser(boolean askUser) { try { - IEclipsePreferences preferences = getPreferences(); - preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER, askUser); + IEclipsePreferences preferences = PreferencesUtil.getConfigurationPreferences(); + preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, askUser); preferences.flush(); } catch (BackingStoreException e) { JBossToolsUsageActivator.getDefault().getLog().log( - StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not save preferences {0}", e, - IUsageReportPreferenceConstants.ASK_USER)); + StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, + Messages.UsageReport_Error_SavePreferences, e, + IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID)); } } private boolean isReportEnabled() { - return getPreferences().getBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED, true); + return PreferencesUtil.getConfigurationPreferences().getBoolean( + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); } - - private IEclipsePreferences getPreferences() { - return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); - } } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties 2010-08-18 14:32:06 UTC (rev 24262) @@ -0,0 +1,6 @@ +UsageReport_Checkbox_Text=Report usage anonymously to Red Hat Inc. +UsageReport_DialogMessage=Please allow Red Hat Inc. to report this installation anynomously for statistical matters. +UsageReport_DialogTitle=Report usage +UsageReport_Error_SavePreferences=Could not save preferences {0} +UsageReport_GoogleAnalyticsAccount=UA-17645367-1 +UsageReport_HostName=jboss.org Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-08-18 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -15,17 +15,24 @@ */ public interface IUsageReportPreferenceConstants { + /** The value that determines if usage shall be reported if there's no user set setting. */ + public static final boolean USAGEREPORT_ENABLED_DEFAULTVALUE = false; + /** - * Identifies the preferences that states whether the user allows us to - * report usage. + * The identifier to be used to identify the value that determines if usage + * shall be reported. */ - public static final String USAGEREPORT_ENABLED = "allowUsageReportPreference"; + public static final String USAGEREPORT_ENABLED_ID = "allowUsageReportPreference"; //$NON-NLS-1$ /** - * Identifies the preferences that states whether the user allows us to - * report usage. + * The identifier to be used for the value that determines if the user shall + * be asked for reporting. */ - public static final String ASK_USER = "askUserPreference"; + public static final String ASK_USER_USAGEREPORT_ID = "askUserForUsageReportPreference"; //$NON-NLS-1$ - public static final String ECLIPSE_INSTANCE_ID = "eclipseInstanceId"; + /** + * The identifier to be used for the value that determines this eclipse + * instance. + */ + public static final String ECLIPSE_INSTANCE_ID = "eclipseInstanceId"; //$NON-NLS-1$ } Added: 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 (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -0,0 +1,27 @@ +/******************************************************************************* + * 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.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.usage.preferences.messages"; //$NON-NLS-1$ + public static String UsageReportPreferencePage_AllowReporting; + + public static String UsageReportPreferencePage_Error_Saving; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -13,8 +13,6 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; /** @@ -24,19 +22,7 @@ AbstractPreferenceInitializer { public void initializeDefaultPreferences() { - // IPreferenceStore store = - // JBossToolsUsageActivator.getDefault().getPreferenceStore(); - // store.setDefault(PreferenceConstants.P_ALLOW_USAGEREPORT, true); -// IPreferenceStore store = getPreferencesStore(); -// store.setDefault(UsageReportPreferenceConstants.P_ALLOW_USAGEREPORT, true); IEclipsePreferences preferences = new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); - preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED, true); + preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE); } - - private IPreferenceStore getPreferencesStore() { - IPreferenceStore preferenceStore = new ScopedPreferenceStore( - new ConfigurationScope(), - JBossToolsUsageActivator.PLUGIN_ID); - return preferenceStore; - } } 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 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -10,41 +10,30 @@ ******************************************************************************/ package org.jboss.tools.usage.preferences; -import java.io.IOException; - import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.util.PreferencesUtil; import org.jboss.tools.usage.util.StatusUtils; +import org.osgi.service.prefs.BackingStoreException; /** * @author Andre Dietisheim */ public class UsageReportPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - private IPersistentPreferenceStore preferences; - public UsageReportPreferencePage() { super(GRID); - setPreferenceStore(this.preferences = createPreferencesStore()); + setPreferenceStore(PreferencesUtil.createConfigurationPreferencesStore()); } - private IPersistentPreferenceStore createPreferencesStore() { - return new ScopedPreferenceStore( - new ConfigurationScope(), - JBossToolsUsageActivator.PLUGIN_ID); - } - public void createFieldEditors() { addField(new BooleanFieldEditor( - IUsageReportPreferenceConstants.USAGEREPORT_ENABLED - , "&Allow JBoss Tools to report usage analytics anonymously for statistical matters" + IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID + , Messages.UsageReportPreferencePage_AllowReporting , getFieldEditorParent())); } @@ -54,10 +43,10 @@ @Override public boolean performOk() { try { - preferences.save(); - } catch (IOException e) { + PreferencesUtil.getConfigurationPreferences().flush(); + } catch (BackingStoreException e) { IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, - "Could not save the preferences.", e); + Messages.UsageReportPreferencePage_Error_Saving, e); JBossToolsUsageActivator.getDefault().getLog().log(status); } return super.performOk(); Added: 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 (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-08-18 14:32:06 UTC (rev 24262) @@ -0,0 +1,2 @@ +UsageReportPreferencePage_AllowReporting=&Allow JBoss Tools to report usage anonymously.\n Data is used for statistical matters only. +UsageReportPreferencePage_Error_Saving=Could not save the preferences. Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-18 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.Assert; import org.osgi.framework.Bundle; - /** * @author Andre Dietisheim */ Modified: 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 13:45:36 UTC (rev 24261) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 14:32:06 UTC (rev 24262) @@ -12,6 +12,8 @@ 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; /** @@ -19,12 +21,11 @@ */ public class PreferencesUtil { - /** - * Returns the preferences used for this plugin. - * - * @return the preferences - */ public static IEclipsePreferences getConfigurationPreferences() { return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID); } + + public static IPersistentPreferenceStore createConfigurationPreferencesStore() { + return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID); + } }