Author: adietish Date: 2010-09-10 08:27:03 -0400 (Fri, 10 Sep 2010) New Revision: 24861 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java Log: [JBIDE-7041] referrer test failed, not reported in GA, getting back to no-referrer implementation Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java 2010-09-10 11:03:07 UTC (rev 24860) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/AbstractGoogleAnalyticsParameters.java 2010-09-10 12:27:03 UTC (rev 24861) @@ -18,12 +18,18 @@ private String accountName; private String hostName; + private String referrer; - public AbstractGoogleAnalyticsParameters(String accountName, String hostName) { + public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referrer) { this.accountName = accountName; this.hostName = hostName; + this.referrer = referrer; } + public String getReferrer() { + return referrer; + } + public String getAccountName() { return accountName; } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-10 11:03:07 UTC (rev 24860) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/AbstractEclipseEnvironment.java 2010-09-10 12:27:03 UTC (rev 24861) @@ -26,7 +26,8 @@ /** * @author Andre Dietisheim */ -public abstract class AbstractEclipseEnvironment extends AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters { +public abstract class AbstractEclipseEnvironment extends AbstractGoogleAnalyticsParameters implements + IGoogleAnalyticsParameters { private static final String SYSPROP_JAVA_VERSION = "java.version"; @@ -41,7 +42,12 @@ private IUserAgent eclipseUserAgent; public AbstractEclipseEnvironment(String accountName, String hostName, IEclipsePreferences preferences) { - super(accountName, hostName); + this(accountName, hostName, IGoogleAnalyticsParameters.VALUE_NO_REFERRAL, preferences); + } + + public AbstractEclipseEnvironment(String accountName, String hostName, String referrer, + IEclipsePreferences preferences) { + super(accountName, hostName, referrer); this.random = new Random(); this.preferences = preferences; eclipseUserAgent = createEclipseUserAgent(); @@ -111,7 +117,8 @@ if (userId == null) { userId = createIdentifier(); preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); - PreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), GoogleAnalyticsEclipseMessages.EclipseEnvironment_Error_SavePreferences); + PreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), + GoogleAnalyticsEclipseMessages.EclipseEnvironment_Error_SavePreferences); } return userId; } @@ -129,7 +136,7 @@ } public abstract String getKeyword(); - + public String getCurrentVisit() { return currentVisit; } @@ -152,7 +159,8 @@ currentVisit = String.valueOf(System.currentTimeMillis()); visitCount++; preferences.putLong(IUsageReportPreferenceConstants.VISIT_COUNT, visitCount); - PreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), GoogleAnalyticsEclipseMessages.EclipseEnvironment_Error_SavePreferences); + PreferencesUtils.checkedSavePreferences(preferences, JBossToolsUsageActivator.getDefault(), + GoogleAnalyticsEclipseMessages.EclipseEnvironment_Error_SavePreferences); } public String getFlashVersion() {