Author: adietish Date: 2010-10-01 07:03:33 -0400 (Fri, 01 Oct 2010) New Revision: 25389 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties Log: [JBDS-1338] removed unneeded JBDS error message Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2010-10-01 10:49:44 UTC (rev 25388) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2010-10-01 11:03:33 UTC (rev 25389) @@ -31,17 +31,16 @@ public static String UsageReportPreferencePage_ProductVersion; public static String UsageReportPreferencePage_ScreenColors; public static String UsageReportPreferencePage_ScreenResolution; + public static String UsageReportPreferencePage_Error_Saving; public static String UsageReportPreferencePage_Description; public static String UsageReportPreferencePage_AllowReporting; - public static String UsageReportPreferencePage_Error_Saving; public static String GlobalUsageSettings_RemoteProps_URL; public static String UsageReportPreferencePage_Description_JBDS; public static String UsageReportPreferencePage_AllowReporting_JBDS; - public static String UsageReportPreferencePage_Error_Saving_JBDS; - + public static String GlobalUsageSettings_RemoteProps_URL_JBDS; static { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-10-01 10:49:44 UTC (rev 25388) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-10-01 11:03:33 UTC (rev 25389) @@ -183,20 +183,12 @@ UsageReportPreferences.flush(); } catch (BackingStoreException e) { IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, - getPrefsSaveErrorMessage(), e); + PreferencesMessages.UsageReportPreferencePage_Error_Saving, e); JBossToolsUsageActivator.getDefault().getLog().log(status); } return super.performOk(); } - private String getPrefsSaveErrorMessage() { - if (JBDSUtils.isJBDS()) { - return PreferencesMessages.UsageReportPreferencePage_Error_Saving_JBDS; - } else { - return PreferencesMessages.UsageReportPreferencePage_Error_Saving; - } - } - private String getFormattedDate(String timeStamp) { try { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2010-10-01 10:49:44 UTC (rev 25388) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2010-10-01 11:03:33 UTC (rev 25389) @@ -24,6 +24,5 @@ # this is a hack to get into the code freeze deadline. this stuff will be removed with a proper implementatino UsageReportPreferencePage_Description_JBDS=Preference page with options for anonymous usage data reporting.\nUsage data is used for statistical matters only. UsageReportPreferencePage_AllowReporting_JBDS=&Please allow Red Hat Inc. to receive anonymous usage\n statistics for this JBoss Developer Studio installation. -UsageReportPreferencePage_Error_Saving_JBDS=Could not save the preferences. GlobalUsageSettings_RemoteProps_URL_JBDS=http://devstudio.jboss.com/usage...