Author: adietish Date: 2010-08-19 06:56:56 -0400 (Thu, 19 Aug 2010) New Revision: 24291 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/messages.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/FocusPoint.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/ILoggingAdapter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IURLBuildingStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java 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/preferences/PreferencesMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java Log: [JBIDE-6376] packages refactored, strings externalized Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-19 10:56:56 UTC (rev 24291) @@ -6,12 +6,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.usage, org.jboss.tools.usage.googleanalytics, - org.jboss.tools.usage.preferences, - org.jboss.tools.usage.reporting, + org.jboss.tools.usage.reporting; x-internal:=true; x-friends="org.jboss.tools.usage.test", org.jboss.tools.usage.util Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui;bundle-version="3.5.0" -Bundle-Activator: org.jboss.tools.usage.JBossToolsUsageActivator +Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator Bundle-Vendor: %BundleVendor Bundle-ActivationPolicy: lazy Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/FocusPoint.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/FocusPoint.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/FocusPoint.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,72 +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.jboss.tools.usage.util.EncodingUtils; - -/** - * Focus point of the application. It can represent data points like application - * load, application module load, user actions, error events etc. - */ -public class FocusPoint { - - private String name; - private FocusPoint childFocusPoint; - public static final String URI_SEPARATOR = "/"; - public static final String TITLE_SEPARATOR = "-"; - - public FocusPoint(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public FocusPoint setChild(FocusPoint childFocusPoint) { - this.childFocusPoint = childFocusPoint; - return this; - } - - public FocusPoint getChild() { - return childFocusPoint; - } - - public String getContentURI() { - StringBuilder builder = new StringBuilder(); - appendContentURI(builder, this); - return EncodingUtils.checkedEncodeUtf8(builder.toString()); - } - - private void appendContentURI(StringBuilder builder, FocusPoint focusPoint) { - FocusPoint parentFocuPoint = focusPoint.getChild(); - builder.append(URI_SEPARATOR); - builder.append(focusPoint.getName()); - if (parentFocuPoint != null) { - appendContentURI(builder, parentFocuPoint); - } - } - - public String getContentTitle() { - StringBuilder builder = new StringBuilder(); - appendContentTitle(builder, this); - return EncodingUtils.checkedEncodeUtf8(builder.toString()); - } - - private void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) { - FocusPoint childFocusPoint = focusPoint.getChild(); - builder.append(focusPoint.getName()); - if (childFocusPoint != null) { - builder.append(TITLE_SEPARATOR); - appendContentTitle(builder, childFocusPoint); - } - } -} Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -3,13 +3,7 @@ import org.eclipse.osgi.util.NLS; public class GoogleAnalyticsMessages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.googleanalytics_messages"; //$NON-NLS-1$ - public static String HttpGetMethod_Error_Http; - public static String HttpGetMethod_Error_Io; - public static String HttpGetMethod_Success; - public static String Tracker_Synchronous; - public static String Tracker_Asynchronous; - public static String Tracker_Error; + private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$ static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, GoogleAnalyticsMessages.class); 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 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -12,12 +12,17 @@ import java.io.UnsupportedEncodingException; +import org.jboss.tools.usage.FocusPoint; +import org.jboss.tools.usage.IURLBuildingStrategy; import org.jboss.tools.usage.util.EncodingUtils; /** * Class that builds an URL that passes given parameters to google analytics * * @author Andre Dietisheim + * + * @see <a + * href="http://code.google.com/apis/analytics/docs/tracking/gaTracking... Request Parameters</a> */ public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy { @@ -119,7 +124,7 @@ appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_HID, getRandomNumber(), builder); +// appendParameter(IGoogleAnalyticsParameters.PARAM_HID, getRandomNumber(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder); appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); @@ -131,7 +136,7 @@ } private String getCookies(FocusPoint focusPoint) { - long timeStamp = System.currentTimeMillis(); + long timeStamp = System.currentTimeMillis(); StringBuilder builder = new StringBuilder(); builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT) .append(IGoogleAnalyticsParameters.EQUALS_SIGN) @@ -193,8 +198,9 @@ /** * Appends the keyword to the cookies. - * - * @param builder the builder to append to + * + * @param builder + * the builder to append to */ private void appendCookieKeyword(StringBuilder builder) { String keyword = googleParameters.getKeyword(); Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/HttpGetMethod.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,97 +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 java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.text.MessageFormat; - - -/** - * Class that executes a HTTP Get request to the given url. - * - * @author Andre Dietisheim - */ -public class HttpGetMethod { - - private static final String USER_AGENT = "User-Agent"; //$NON-NLS-1$ - - private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ - - private ILoggingAdapter loggingAdapter = null; - -// private CookieHandler cookieHandler; - - private String userAgent; - - public HttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) { - this.userAgent = userAgent; - this.loggingAdapter = loggingAdapter; -// this.cookieHandler = new CookieHandler(); -// this.cookieHandler = CookieHandler.getDefault(); -// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); - } - - public void request(String urlString) { - -// CookieHandler currentCookieHandler = setCookieHandler(cookieHandler); - try { - HttpURLConnection urlConnection = createURLConnection(urlString, userAgent); - urlConnection.connect(); - int responseCode = getResponseCode(urlConnection); - if (responseCode != HttpURLConnection.HTTP_OK) { - loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.HttpGetMethod_Error_Http, urlString, responseCode)); - } else { - loggingAdapter.logError(MessageFormat.format(GoogleAnalyticsMessages.HttpGetMethod_Success, urlString)); - } - } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.HttpGetMethod_Error_Io, urlString, e.toString())); - } finally { -// setCookieHandler(currentCookieHandler); - } - } - - /** - * Returns the return code from the given {@link HttpURLConnection}. - * Provided to be called by test cases so that they can retrieve the return code. - * - * @param urlConnection to get the response code from - * @return the return code the HttpUrlConnection received - * @throws IOException Signals that an I/O exception has occurred. - */ - protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { - return urlConnection.getResponseCode(); - } - -// private CookieHandler setCookieHandler(CookieHandler cookieHandler) { -// CookieHandler currentCookieHandler = CookieHandler.getDefault(); -// CookieHandler.setDefault(cookieHandler); -// return currentCookieHandler; -// } - - /** - * Creates a new url connection. - * - * @param urlString the url string - * @param userAgent the user agent - * @return the http url connection - * @throws IOException Signals that an I/O exception has occurred. - */ - protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException { - URL url = new URL(urlString); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setInstanceFollowRedirects(true); - urlConnection.setRequestMethod(GET_METHOD_NAME); - urlConnection.setRequestProperty(USER_AGENT, userAgent); - return urlConnection; - } -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/ILoggingAdapter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/ILoggingAdapter.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/ILoggingAdapter.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,22 +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; - -/** - * @author Andre Dietisheim - */ -public interface ILoggingAdapter { - - public void logError(String errorMessage); - - public void logMessage(String message); - -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IURLBuildingStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IURLBuildingStrategy.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IURLBuildingStrategy.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,25 +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 java.io.UnsupportedEncodingException; - -/** - * Interface for the URL building strategy - * - * @author Andre Dietisheim - * - */ -public interface IURLBuildingStrategy { - - public String build(FocusPoint focusPoint) throws UnsupportedEncodingException; - -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/PluginLogger.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -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.IStatus; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.runtime.Status; - -/** - * @author Andre Dietisheim - */ -public class PluginLogger implements ILoggingAdapter { - - private Plugin plugin; - - public PluginLogger(Plugin plugin) { - this.plugin = plugin; - } - - public void logError(String message) { - log(IStatus.ERROR, message); - } - - public void logMessage(String message) { - log(IStatus.INFO, message); - } - - private void log(int severity, String message) { - if (plugin != null) { - IStatus status = new Status(severity, plugin.getBundle().getSymbolicName(), message); - plugin.getLog().log(status); - } - } -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,66 +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 java.text.MessageFormat; - -import org.jboss.tools.usage.ITracker; - -/** - * Reports (tracks) usage - * - * @author Andre Dietisheim - * @see based on <a - * href="http://jgoogleAnalytics.googlecode.com">http://jgoogleAnalytics.googlecode.com</a> - */ -public class Tracker implements ITracker { - - private IURLBuildingStrategy urlBuildingStrategy = null; - private HttpGetMethod httpRequest; - private ILoggingAdapter loggingAdapter; - - public Tracker(IURLBuildingStrategy urlBuildingStrategy, String userAgent, ILoggingAdapter loggingAdapter) { - this.httpRequest = new HttpGetMethod(userAgent, loggingAdapter); - this.loggingAdapter = loggingAdapter; - this.urlBuildingStrategy = urlBuildingStrategy; - } - - public void trackSynchronously(FocusPoint focusPoint) { - loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Synchronous, focusPoint.getContentTitle())); - try { - httpRequest.request(urlBuildingStrategy.build(focusPoint)); - } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Error, e.getMessage())); - } - } - - public void trackAsynchronously(FocusPoint focusPoint) { - loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Asynchronous, focusPoint.getContentTitle())); - new TrackingThread(focusPoint).start(); - } - - private class TrackingThread extends Thread { - private FocusPoint focusPoint; - - public TrackingThread(FocusPoint focusPoint) { - this.focusPoint = focusPoint; - this.setPriority(Thread.MIN_PRIORITY); - } - - public void run() { - try { - httpRequest.request(urlBuildingStrategy.build(focusPoint)); - } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(GoogleAnalyticsMessages.Tracker_Error, e.getMessage())); - } - } - } -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,7 +0,0 @@ -HttpGetMethod_Error_Http=HTTP GET to \"{0}\" failed, response code received \"{1}\" -HttpGetMethod_Error_Io=HTTP GET to \"{0}\" failed, exception occured: \"{1}\" -HttpGetMethod_Success=HTTP GET to url \"{0}\" successfull\! - -Tracker_Asynchronous=Tracking asynchronously focusPoint \"{0}\" -Tracker_Error=Tracking failed, exception thrown: \"{0}\" -Tracker_Synchronous=Tracking synchronously focusPoint \"{0}\" Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/messages.properties (from rev 24289, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/googleanalytics_messages.properties) =================================================================== Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java (from rev 24289, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsUsageActivator.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossToolsUsageActivator.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -0,0 +1,47 @@ +/******************************************************************************* + * 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.internal; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * @author Andre Dietisheim + */ +public class JBossToolsUsageActivator extends AbstractUIPlugin { + + public static final String PLUGIN_ID = "org.jboss.tools.usage"; //$NON-NLS-1$ + + private static JBossToolsUsageActivator plugin; + + public JBossToolsUsageActivator() { + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + public static JBossToolsUsageActivator getDefault() { + return plugin; + } + + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } + + public void start(BundleContext context) throws Exception { + super.start(context); + } +} Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/PreferencesMessages.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -13,7 +13,7 @@ import org.eclipse.osgi.util.NLS; public class PreferencesMessages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.usage.preferences.preferences_messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.usage.preferences.messages"; //$NON-NLS-1$ public static String UsageReportPreferencePage_Description; public static String UsageReportPreferencePage_AllowReporting; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -15,7 +15,7 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.jboss.tools.usage.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.reporting.UsageReportPreferences; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -19,9 +19,9 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; -import org.jboss.tools.usage.JBossToolsUsageActivator; import org.jboss.tools.usage.googleanalytics.AbstractGoogleAnalyticsParameters; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; import org.jboss.tools.usage.util.BundleUtils; import org.jboss.tools.usage.util.PreferencesUtils; @@ -35,11 +35,15 @@ */ public class EclipseEnvironment extends AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters { + private static final String USERAGENT_WIN = "{0}/{1} (Windows; U; Windows NT 6.1; {2})"; //$NON-NLS-1$ + private static final String USERAGENT_MAC = "{0}/{1} (Macintosh; U; Intel Mac OS X 10.5; {2})"; //$NON-NLS-1$ + private static final String USERAGENT_LINUX = "{0}/{1} (X11; U; Linux i686; {2})"; //$NON-NLS-1$ + private static final char BUNDLE_GROUP_DELIMITER = '-'; - private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+"; + private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+"; //$NON-NLS-1$ - private static final String ECLIPSE_RUNTIME_BULDEID = "org.eclipse.core.runtime"; + private static final String ECLIPSE_RUNTIME_BULDEID = "org.eclipse.core.runtime"; //$NON-NLS-1$ private String screenResolution; @@ -56,7 +60,7 @@ public String getBrowserLanguage() { String nl = getNL(); if (nl == null) { - return ""; + return ""; //$NON-NLS-1$ } int indexOf = nl.indexOf(JAVA_LOCALE_DELIMITER); //$NON-NLS-1$ @@ -124,7 +128,7 @@ * localLocale.getCountry().toLowerCase() : "" , Build.MODEL, Build.ID * }); */ - + return MessageFormat.format( getUserAgentPattern(getOS()) , productId @@ -134,24 +138,24 @@ } private String getUserAgentPattern(String os) { - String userAgentPattern = ""; + String userAgentPattern = ""; //$NON-NLS-1$ /* * TODO: implement architecture (i686, x86_64 etc.), Windows version, MacOS version etc. */ if (Platform.OS_LINUX.equals(os)) { - return "{0}/{1} (X11; U; Linux i686; {2})"; + return USERAGENT_LINUX; //$NON-NLS-1$ } else if (Platform.OS_MACOSX.equals(os)) { - return "{0}/{1} (Macintosh; U; Intel Mac OS X 10.5; {2})"; + return USERAGENT_MAC; //$NON-NLS-1$ } else if (Platform.OS_WIN32.equals(os)) { - return "{0}/{1} (Windows; U; Windows NT 6.1; {2})"; + return USERAGENT_WIN; //$NON-NLS-1$ } return userAgentPattern; } - + protected String getOS() { return Platform.getOS(); } - + protected String getApplicationName() { return getApplicationBundle().getSymbolicName(); } @@ -183,17 +187,22 @@ public String getUserId() { IEclipsePreferences preferences = PreferencesUtils.getPreferences(); String userId = preferences.get(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, null); + if (userId == null) { + userId = createIdentifier(); + preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); + savePreferences(preferences); + } + return userId; + } + + private void savePreferences(IEclipsePreferences preferences) { try { - if (userId == null) { - userId = createIdentifier(); - preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); - preferences.flush(); - } + preferences.flush(); } catch (BackingStoreException e) { - StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not retrieve {0} from preferences.", + StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, + ReportingMessages.EclipseEnvironment_Error_SavePreferences7, e, IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID); } - return userId; } /** @@ -213,22 +222,22 @@ IBundleEntryFilter jbossToolsFilter = new BundleUtils.BundleSymbolicNameFilter(JBOSS_TOOLS_BUNDLES_PREFIX); IBundleEntryFilter compositeFilter = new BundleUtils.CompositeFilter( jbossToolsFilter - , jbossBundleGroups ); + , jbossBundleGroups); BundleUtils.getBundles(compositeFilter, getBundles()); - + return bundleGroupsToKeywordString(jbossBundleGroups); } protected Bundle[] getBundles() { return JBossToolsUsageActivator.getDefault().getBundle().getBundleContext().getBundles(); } - + private String bundleGroupsToKeywordString(JBossBundleGroups jbossBundleGroups) { char delimiter = BUNDLE_GROUP_DELIMITER; StringBuilder builder = new StringBuilder(); for (String bundleGroupId : jbossBundleGroups.getBundleGroupIds()) { builder.append(bundleGroupId) - .append(delimiter); + .append(delimiter); } return builder.toString(); } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingMessages.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -14,6 +14,8 @@ public class ReportingMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.usage.reporting.reporting_messages"; //$NON-NLS-1$ + public static String EclipseEnvironment_Error_SavePreferences7; + public static String UsageReport_Checkbox_Text; public static String UsageReport_DialogMessage; public static String UsageReport_DialogTitle; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -10,15 +10,15 @@ ******************************************************************************/ package org.jboss.tools.usage.reporting; +import org.jboss.tools.usage.FocusPoint; +import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.ITracker; -import org.jboss.tools.usage.JBossToolsUsageActivator; -import org.jboss.tools.usage.googleanalytics.FocusPoint; +import org.jboss.tools.usage.IURLBuildingStrategy; +import org.jboss.tools.usage.PluginLogger; +import org.jboss.tools.usage.Tracker; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; -import org.jboss.tools.usage.googleanalytics.ILoggingAdapter; -import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy; -import org.jboss.tools.usage.googleanalytics.PluginLogger; -import org.jboss.tools.usage.googleanalytics.Tracker; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; /** * @author Andre Dietisheim Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -15,7 +15,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IStartup; import org.eclipse.ui.PlatformUI; -import org.jboss.tools.usage.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.reporting.ReportingMessages; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -12,7 +12,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.jboss.tools.usage.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants; import org.jboss.tools.usage.util.PreferencesUtils; import org.jboss.tools.usage.util.StatusUtils; Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties (from rev 24289, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-08-19 10:56:56 UTC (rev 24291) @@ -0,0 +1,7 @@ +EclipseEnvironment_Error_SavePreferences7=Could not sage {0} to preferences. +UsageReport_Checkbox_Text=Report usage anonymously to Red Hat Inc. +UsageReport_DialogMessage=Please allow Red Hat Inc. to report this installation anynomously for statistical matters. +UsageReport_DialogTitle=Report usage +UsageReport_Error_SavePreferences=Could not save preferences {0} +UsageReport_GoogleAnalyticsAccount=UA-17645367-1 +UsageReport_HostName=jboss.org Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/reporting_messages.properties 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,6 +0,0 @@ -UsageReport_Checkbox_Text=Report usage anonymously to Red Hat Inc. -UsageReport_DialogMessage=Please allow Red Hat Inc. to report this installation anynomously for statistical matters. -UsageReport_DialogTitle=Report usage -UsageReport_Error_SavePreferences=Could not save preferences {0} -UsageReport_GoogleAnalyticsAccount=UA-17645367-1 -UsageReport_HostName=jboss.org Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.ui.preferences.ScopedPreferenceStore; -import org.jboss.tools.usage.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; public class PreferencesUtils { Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.usage.test; -import org.jboss.tools.usage.googleanalytics.FocusPoint; +import org.jboss.tools.usage.FocusPoint; import org.jboss.tools.usage.util.EncodingUtils; import junit.framework.TestCase; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -15,7 +15,7 @@ import java.io.UnsupportedEncodingException; import org.eclipse.core.runtime.Platform; -import org.jboss.tools.usage.googleanalytics.FocusPoint; +import org.jboss.tools.usage.FocusPoint; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; import org.junit.Before; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -14,8 +14,8 @@ import java.io.IOException; import java.net.HttpURLConnection; -import org.jboss.tools.usage.googleanalytics.HttpGetMethod; -import org.jboss.tools.usage.googleanalytics.ILoggingAdapter; +import org.jboss.tools.usage.HttpGetMethod; +import org.jboss.tools.usage.ILoggingAdapter; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -11,14 +11,14 @@ package org.jboss.tools.usage.test; import org.eclipse.core.runtime.Platform; +import org.jboss.tools.usage.FocusPoint; +import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.ITracker; -import org.jboss.tools.usage.googleanalytics.FocusPoint; +import org.jboss.tools.usage.IURLBuildingStrategy; +import org.jboss.tools.usage.PluginLogger; +import org.jboss.tools.usage.Tracker; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; -import org.jboss.tools.usage.googleanalytics.ILoggingAdapter; -import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy; -import org.jboss.tools.usage.googleanalytics.PluginLogger; -import org.jboss.tools.usage.googleanalytics.Tracker; import org.junit.Test; /** Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-08-19 10:54:06 UTC (rev 24290) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-08-19 10:56:56 UTC (rev 24291) @@ -1,6 +1,6 @@ package org.jboss.tools.usage.test; -import org.jboss.tools.usage.googleanalytics.ILoggingAdapter; +import org.jboss.tools.usage.ILoggingAdapter; /** * @author Andre Dietisheim