[jbosstools-commits] JBoss Tools SVN: r24300 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2010-08-19 10:42:34 -0400 (Thu, 19 Aug 2010)
New Revision: 24300

Added:
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java
Removed:
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
Modified:
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
Log:
[JBIDE-6376] enforce order of reported plugins

Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java (from rev 24298, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java	                        (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java	2010-08-19 14:42:34 UTC (rev 24300)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+import org.eclipse.core.runtime.Assert;
+
+public class GoogleAnalyticsCookie {
+
+	private CharSequence value;
+	private String identifier;
+	private char delimiter;
+
+	public GoogleAnalyticsCookie(String identifier, CharSequence value, char delimiter) {
+		Assert.isTrue(identifier != null && identifier.length() > 0);
+		Assert.isTrue(value != null && value.length() > 0);
+
+		this.identifier = identifier;
+		this.value = value;
+		this.delimiter = delimiter;
+	}
+
+	public GoogleAnalyticsCookie(String identifier, CharSequence value) {
+		this(identifier, value, (char) -1);
+	}
+
+	public void appendTo(StringBuilder builder) {
+		builder.append(identifier)
+				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+				.append(value);
+		if (delimiter != (char) -1) {
+			builder.append(delimiter);
+		}
+	}
+}


Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java	2010-08-19 14:23:05 UTC (rev 24299)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java	2010-08-19 14:42:34 UTC (rev 24300)
@@ -143,7 +143,7 @@
 	private String getCookies(FocusPoint focusPoint) {
 		StringBuilder builder = new StringBuilder();
 
-		new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
+		new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
 				new StringBuilder().append("999.")
 						.append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
 						.append('0').append(IGoogleAnalyticsParameters.DOT)
@@ -154,7 +154,7 @@
 				IGoogleAnalyticsParameters.PLUS_SIGN)
 				.appendTo(builder);
 
-		new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
+		new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
 						new StringBuilder()
 							.append("999.")
 							.append("-1")
@@ -162,22 +162,22 @@
 							.append("1.1."))
 				.appendTo(builder);
 
-		new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
+		new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
 						"(direct)",
 						IGoogleAnalyticsParameters.PIPE)
 				.appendTo(builder);
 
-		new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN,
+		new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN,
 						"(direct)",
 						IGoogleAnalyticsParameters.PIPE)
 				.appendTo(builder);
 
-		new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD,
+		new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD,
 						"(none)", 
 						IGoogleAnalyticsParameters.PIPE)
 				.appendTo(builder);
 
-		new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
+		new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
 					googleParameters.getKeyword())
 		.appendTo(builder);
 		

Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java	2010-08-19 14:23:05 UTC (rev 24299)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java	2010-08-19 14:42:34 UTC (rev 24300)
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * 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.googleanalytics;
-
-import org.eclipse.core.runtime.Assert;
-
-public class UrlCookie {
-
-	private CharSequence value;
-	private String identifier;
-	private char delimiter;
-
-	public UrlCookie(String identifier, CharSequence value, char delimiter) {
-		Assert.isTrue(identifier != null && identifier.length() > 0);
-		Assert.isTrue(value != null && value.length() > 0);
-
-		this.identifier = identifier;
-		this.value = value;
-		this.delimiter = delimiter;
-	}
-
-	public UrlCookie(String identifier, CharSequence value) {
-		this(identifier, value, (char) -1);
-	}
-
-	public void appendTo(StringBuilder builder) {
-		builder.append(identifier)
-				.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
-				.append(value);
-		if (delimiter != (char) -1) {
-			builder.append(delimiter);
-		}
-	}
-}