Author: adietish Date: 2010-09-24 10:32:09 -0400 (Fri, 24 Sep 2010) New Revision: 25153 Modified: branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties Log: [JBDS-1321] dialog title for jbtools corrected, various minor text related 'bugs' corrected Modified: branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties =================================================================== --- branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-09-24 14:19:20 UTC (rev 25152) +++ branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-09-24 14:32:09 UTC (rev 25153) @@ -8,4 +8,4 @@ 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/usage.properties \ No newline at end of file +GlobalUsageSettings_RemoteProps_URL_JBDS=http://devstudio.jboss.com/usage/usage.properties Modified: branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java =================================================================== --- branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java 2010-09-24 14:19:20 UTC (rev 25152) +++ branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java 2010-09-24 14:32:09 UTC (rev 25153) @@ -27,9 +27,10 @@ public static String UsageReport_HostName; public static String UsageReport_ExplanationPage; - public static String UsageReport_Checkbox_Text_JBDS; + public static String UsageReport_DialogTitle_JBDS; public static String UsageReport_DialogMessage_JBDS; public static String UsageReport_GoogleAnalytics_Account_JBDS; + public static String UsageReport_Checkbox_Text_JBDS; public static String UsageReport_HostName_JBDS; public static String UsageReport_ExplanationPage_JBDS; Modified: branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java =================================================================== --- branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java 2010-09-24 14:19:20 UTC (rev 25152) +++ branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java 2010-09-24 14:32:09 UTC (rev 25153) @@ -50,9 +50,17 @@ protected void configureShell(Shell shell) { super.configureShell(shell); - shell.setText(ReportingMessages.UsageReport_DialogTitle); + shell.setText(getDialogTitle()); } + private String getDialogTitle() { + if (JBDSUtils.isJBDS()) { + return ReportingMessages.UsageReport_DialogTitle_JBDS; + } else { + return ReportingMessages.UsageReport_DialogTitle; + } + } + protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); Modified: branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties =================================================================== --- branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-09-24 14:19:20 UTC (rev 25152) +++ branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-09-24 14:32:09 UTC (rev 25153) @@ -1,18 +1,20 @@ UsageReport_Reporting_Usage=Reporting JBoss Developer Studio usage UsageReport_Querying_Enablement=Querying whether reporting is globally enabled UsageReport_Asking_User=Asking User to allow reporting -UsageReport_DialogTitle=JBoss Developer Studio Usage +UsageReport_DialogTitle=JBoss Tools Usage UsageReport_Error_SavePreferences=Could not save preferences {0} UsageReport_DialogMessage=Please allow JBoss Tools team to receive anonymous usage statistics for this Eclipse instance with JBoss Tools (<a>info</a>). UsageReport_Checkbox_Text=Report usage of JBoss Tools to JBoss Tools team. UsageReport_GoogleAnalytics_Account=UA-17645367-1 -UsageReport_HostName=jboss.org +UsageReport_HostName_JBDS=jboss.org UsageReport_ExplanationPage=http://jboss.org/tools/usage +# this is a hack to get into the code freeze deadline. this stuff will be removed with a proper implementation +UsageReport_DialogTitle_JBDS=JBoss Developer Studio Usage UsageReport_DialogMessage_JBDS=Please allow Red Hat Inc. to receive anonymous usage statistics for this JBoss Developer Studio installation (<a>info</a>). +UsageReport_GoogleAnalytics_Account_JBDS=UA-18653195-1 UsageReport_Checkbox_Text_JBDS=Report usage of JBoss Developer Studio to Red Hat Inc. -UsageReport_GoogleAnalytics_Account=UA-18653195-1 UsageReport_HostName=devstudio.jboss.com UsageReport_ExplanationPage_JBDS=http://devstudio.jboss.com/usage