Author: adietish Date: 2010-09-30 15:47:05 -0400 (Thu, 30 Sep 2010) New Revision: 25355 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IJBossToolsEclipseEnvironment.java 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 trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java Log: [JBIDE-7229] linux distro info added to prefs page Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IJBossToolsEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IJBossToolsEclipseEnvironment.java 2010-09-30 19:08:04 UTC (rev 25354) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IJBossToolsEclipseEnvironment.java 2010-09-30 19:47:05 UTC (rev 25355) @@ -19,4 +19,5 @@ public String getJBossToolsVersion(); + public boolean isLinuxDistro(); } 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-09-30 19:08:04 UTC (rev 25354) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java 2010-09-30 19:47:05 UTC (rev 25355) @@ -25,6 +25,7 @@ public static String UsageReportPreferencePage_NumberOfUsageHits; public static String UsageReportPreferencePage_OperatingSystem; public static String UsageReportPreferencePage_OperatingSystemVersion; + public static String UsageReportPreferencePage_LinuxDistro; public static String UsageReportPreferencePage_ProductId; public static String UsageReportPreferencePage_ProductOwner; public static String UsageReportPreferencePage_ProductVersion; 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-09-30 19:08:04 UTC (rev 25354) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java 2010-09-30 19:47:05 UTC (rev 25355) @@ -87,6 +87,9 @@ appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_OperatingSystem, eclipseUserAgent.getOS(), builder, styles); appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_OperatingSystemVersion, eclipseUserAgent.getOSVersion(), builder, styles); + if (eclipseEnvironment.isLinuxDistro()) { + appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_LinuxDistro, eclipseEnvironment.getUserDefined(), builder, styles); + } builder.append(StringUtils.getLineSeparator()); appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_Locale, eclipseUserAgent.getBrowserLanguage(), builder, styles); 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-09-30 19:08:04 UTC (rev 25354) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties 2010-09-30 19:47:05 UTC (rev 25355) @@ -8,6 +8,7 @@ UsageReportPreferencePage_NumberOfUsageHits=Number of usage-hits\: UsageReportPreferencePage_OperatingSystem=Operating system\: UsageReportPreferencePage_OperatingSystemVersion=Operating system version\: +UsageReportPreferencePage_LinuxDistro=Linux Distro\: UsageReportPreferencePage_ProductId=Product id\: UsageReportPreferencePage_ProductOwner=Product owner\: UsageReportPreferencePage_ProductVersion=Product version\: Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java 2010-09-30 19:08:04 UTC (rev 25354) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/JBossToolsEclipseEnvironment.java 2010-09-30 19:47:05 UTC (rev 25355) @@ -53,4 +53,8 @@ public String getJBossToolsVersion() { return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString(); } + + public boolean isLinuxDistro() { + return getLinuxDistroNameAndVersion() != null; + } }