JBoss Tools SVN: r24266 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-18 13:00:27 -0400 (Wed, 18 Aug 2010)
New Revision: 24266
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
https://jira.jboss.org/browse/JBIDE-6864 Tycho build of org.mozilla.xulrunner.cocoa.macosx_1.9.1.2 missing native libraries
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-08-18 16:44:38 UTC (rev 24265)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-08-18 17:00:27 UTC (rev 24266)
@@ -75,15 +75,16 @@
public static final long NS_ERROR_FAILURE = 0x80004005L;
static {
- XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) //$NON-NLS-1$
- .append(".").append(Platform.getWS()) //$NON-NLS-1$
- .append(".").append(Platform.getOS()) //$NON-NLS-1$
- .append(".").append(Platform.getOSArch()) //$NON-NLS-1$
- .toString();
-
+ StringBuffer buff = new StringBuffer("org.mozilla.xulrunner");
+ buff.append(".").append(Platform.getWS()) //$NON-NLS-1$
+ .append(".").append(Platform.getOS()); //$NON-NLS-1$
+ if(! Platform.OS_MACOSX.equals(Platform.getOS())) {
+ buff.append(Platform.getOSArch());
+ }
+ XULRUNNER_BUNDLE = buff.toString();
mozilla = Mozilla.getInstance();
}
-
+
public XulRunnerBrowser(Composite parent) throws XulRunnerException {
// initXulRunner();
if(Platform.OS_MACOSX.equals(Platform.getOS())){
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24265 - in trunk/usage: plugins/org.jboss.tools.usage/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-18 12:44:38 -0400 (Wed, 18 Aug 2010)
New Revision: 24265
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java
Removed:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
trunk/usage/plugins/org.jboss.tools.usage/plugin.xml
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/preferences/Messages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.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/preferences/messages.properties
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.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
Log:
[JBIDE-6376] * internal package renamed to reporting * preference storage fixed
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 16:44:38 UTC (rev 24265)
@@ -6,7 +6,7 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>
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-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-18 16:44:38 UTC (rev 24265)
@@ -6,12 +6,12 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.usage,
org.jboss.tools.usage.googleanalytics,
- org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.preferences,
+ org.jboss.tools.usage.reporting,
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.internal.JBossToolsUsageActivator
+Bundle-Activator: org.jboss.tools.usage.reporting.JBossToolsUsageActivator
Bundle-Vendor: %BundleVendor
Bundle-ActivationPolicy: lazy
Modified: trunk/usage/plugins/org.jboss.tools.usage/plugin.xml
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 16:44:38 UTC (rev 24265)
@@ -4,7 +4,7 @@
<extension
point="org.eclipse.ui.startup">
<startup
- class="org.jboss.tools.usage.internal.UsageReportDispatcher">
+ class="org.jboss.tools.usage.reporting.UsageReportDispatcher">
</startup>
</extension>
<extension
Modified: 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-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -14,7 +14,7 @@
import java.text.MessageFormat;
import org.jboss.tools.usage.ITracker;
-import org.jboss.tools.usage.internal.HttpGetMethod;
+import org.jboss.tools.usage.reporting.HttpGetMethod;
/**
* Reports (tracks) usage
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -14,9 +14,11 @@
public class Messages extends NLS {
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;
-
public static String UsageReportPreferencePage_Error_Saving;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -11,9 +11,7 @@
package org.jboss.tools.usage.preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
+import org.jboss.tools.usage.util.PreferencesUtils;
/**
* @author Andre Dietisheim
@@ -22,7 +20,8 @@
AbstractPreferenceInitializer {
public void initializeDefaultPreferences() {
- IEclipsePreferences preferences = new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
- preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE);
+ PreferencesUtils.getStore().setDefault(
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID,
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE);
}
}
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-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -15,8 +15,8 @@
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
-import org.jboss.tools.usage.util.PreferencesUtil;
+import org.jboss.tools.usage.reporting.JBossToolsUsageActivator;
+import org.jboss.tools.usage.reporting.UsageReportPreferences;
import org.jboss.tools.usage.util.StatusUtils;
import org.osgi.service.prefs.BackingStoreException;
@@ -27,7 +27,6 @@
public UsageReportPreferencePage() {
super(GRID);
- setPreferenceStore(PreferencesUtil.createConfigurationPreferencesStore());
}
public void createFieldEditors() {
@@ -38,12 +37,14 @@
}
public void init(IWorkbench workbench) {
+ setPreferenceStore(UsageReportPreferences.createPreferenceStore());
+ setDescription(Messages.UsageReportPreferencePage_Description);
}
@Override
public boolean performOk() {
try {
- PreferencesUtil.getConfigurationPreferences().flush();
+ UsageReportPreferences.flush();
} catch (BackingStoreException e) {
IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
Messages.UsageReportPreferencePage_Error_Saving, e);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-08-18 16:44:38 UTC (rev 24265)
@@ -1,2 +1,3 @@
-UsageReportPreferencePage_AllowReporting=&Allow JBoss Tools to report usage anonymously.\n Data is used for statistical matters only.
+UsageReportPreferencePage_Description=Preference page with options for anonymous usage data reporting. Usage data is used for statistical matters only.
+UsageReportPreferencePage_AllowReporting=&Allow Red Hat Inc. to report usage anonymously.
UsageReportPreferencePage_Error_Saving=Could not save the preferences.
Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -1,31 +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.util;
-
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
-
-/**
- * @author Andre Dietisheim
- */
-public class PreferencesUtil {
-
- public static IEclipsePreferences getConfigurationPreferences() {
- return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
- }
-
- public static IPersistentPreferenceStore createConfigurationPreferencesStore() {
- return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID);
- }
-}
Added: 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 (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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.util;
+
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.jface.preference.IPersistentPreferenceStore;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+import org.jboss.tools.usage.reporting.JBossToolsUsageActivator;
+
+public class PreferencesUtils {
+
+ private PreferencesUtils() {
+ // inhibit instantiation
+ }
+
+ public static IEclipsePreferences getPreferences() {
+ return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
+ }
+
+ public static IPersistentPreferenceStore getStore() {
+ return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID);
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -23,8 +23,8 @@
import java.util.regex.Pattern;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.usage.internal.EclipseEnvironment;
-import org.jboss.tools.usage.internal.JBossBundleGroups;
+import org.jboss.tools.usage.reporting.EclipseEnvironment;
+import org.jboss.tools.usage.reporting.JBossBundleGroups;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.usage.test;
-import org.jboss.tools.usage.internal.EclipseEnvironment;
+import org.jboss.tools.usage.reporting.EclipseEnvironment;
/**
* @author Andre Dietisheim
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-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -17,7 +17,7 @@
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.usage.googleanalytics.FocusPoint;
import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
-import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
+import org.jboss.tools.usage.reporting.GoogleAnalyticsUrlStrategy;
import org.junit.Before;
import org.junit.Test;
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-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -15,7 +15,7 @@
import java.net.HttpURLConnection;
import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
-import org.jboss.tools.usage.internal.HttpGetMethod;
+import org.jboss.tools.usage.reporting.HttpGetMethod;
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-18 16:42:12 UTC (rev 24264)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-18 16:44:38 UTC (rev 24265)
@@ -17,8 +17,8 @@
import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy;
import org.jboss.tools.usage.googleanalytics.Tracker;
-import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
-import org.jboss.tools.usage.internal.PluginLogger;
+import org.jboss.tools.usage.reporting.GoogleAnalyticsUrlStrategy;
+import org.jboss.tools.usage.reporting.PluginLogger;
import org.junit.Test;
/**
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24264 - in trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage: reporting and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-18 12:42:12 -0400 (Wed, 18 Aug 2010)
New Revision: 24264
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.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/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.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/UsageReportEnablementDialog.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/reporting/messages.properties
Log:
[JBIDE-6376] package internal renamed to reporting
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/AbstractGoogleAnalyticsParameters.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+
+/**
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters {
+
+ private String accountName;
+ private String referral;
+ private String hostName;
+
+ public AbstractGoogleAnalyticsParameters(String accountName, String hostName, String referral) {
+ this.accountName = accountName;
+ this.hostName = hostName;
+ this.referral = referral;
+ }
+
+ public String getAccountName() {
+ return accountName;
+ }
+
+ public String getHostname() {
+ return hostName;
+ }
+
+ public String getReferral() {
+ return referral;
+ }
+}
Added: 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 (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import java.text.MessageFormat;
+import java.util.Random;
+
+import org.eclipse.core.runtime.IProduct;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
+import org.jboss.tools.usage.util.BundleUtils;
+import org.jboss.tools.usage.util.PreferencesUtils;
+import org.jboss.tools.usage.util.StatusUtils;
+import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter;
+import org.osgi.framework.Bundle;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class EclipseEnvironment extends AbstractGoogleAnalyticsParameters implements IGoogleAnalyticsParameters {
+
+ private static final char BUNDLE_GROUP_DELIMITER = '-';
+
+ private static final String JBOSS_TOOLS_BUNDLES_PREFIX = "org\\.jboss\\.tools.+";
+
+ private static final String ECLIPSE_RUNTIME_BULDEID = "org.eclipse.core.runtime";
+
+ private String screenResolution;
+
+ private String screenColorDepth;
+
+ private Random random;
+
+ public EclipseEnvironment(String accountName, String hostName, String referral) {
+ super(accountName, hostName, referral);
+ this.random = new Random();
+ initScreenSettings();
+ }
+
+ public String getBrowserLanguage() {
+ String nl = getNL();
+ if (nl == null) {
+ return "";
+ }
+
+ int indexOf = nl.indexOf(JAVA_LOCALE_DELIMITER); //$NON-NLS-1$
+ if (indexOf <= 0) {
+ return nl;
+ }
+
+ StringBuilder builder = new StringBuilder();
+ builder.append(nl.substring(0, indexOf));
+ builder.append(BROWSER_LOCALE_DELIMITER);
+ builder.append(nl.substring(indexOf + 1));
+ return builder.toString();
+ }
+
+ protected String getNL() {
+ return Platform.getNL(); //$NON-NLS-1$
+ }
+
+ protected void initScreenSettings() {
+ final Display display = getDisplay();
+ display.syncExec(new Runnable() {
+
+ public void run() {
+ screenColorDepth = display.getDepth() + SCREENCOLORDEPTH_POSTFIX;
+
+ Rectangle bounds = display.getBounds();
+ screenResolution = bounds.width + SCREERESOLUTION_DELIMITER + bounds.height;
+ }
+ });
+ }
+
+ public String getScreenResolution() {
+ return screenResolution;
+ }
+
+ public String getScreenColorDepth() {
+ return screenColorDepth;
+ }
+
+ protected Display getDisplay() {
+ if (PlatformUI.isWorkbenchRunning()) {
+ return PlatformUI.getWorkbench().getDisplay();
+ }
+
+ Display display = Display.getCurrent();
+ if (display == null) {
+ display = Display.getDefault();
+ }
+ return display;
+ }
+
+ public String getUserAgent() {
+
+ String productId = getApplicationName();
+ String productVersion = getApplicationVersion();
+ String browserLanguage = getBrowserLanguage();
+
+ /**
+ * Google API for android: this.userAgent = String.format(
+ * "GoogleAnalytics/%s (Linux; U; Android %s; %s-%s; %s; Build/%s)" ,
+ * new Object[] { "1.0" , Build.VERSION.RELEASE ,
+ * (localLocale.getLanguage() != null) ?
+ * localLocale.getLanguage().toLowerCase() : "en" ,
+ * (localLocale.getCountry() != null) ?
+ * localLocale.getCountry().toLowerCase() : "" , Build.MODEL, Build.ID
+ * });
+ */
+
+ return MessageFormat.format(
+ getUserAgentPattern(getOS())
+ , productId
+ , productVersion
+ , browserLanguage
+ );
+ }
+
+ private String getUserAgentPattern(String os) {
+ String userAgentPattern = "";
+ /*
+ * 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})";
+ } else if (Platform.OS_MACOSX.equals(os)) {
+ return "{0}/{1} (Macintosh; U; Intel Mac OS X 10.5; {2})";
+ } else if (Platform.OS_WIN32.equals(os)) {
+ return "{0}/{1} (Windows; U; Windows NT 6.1; {2})";
+ }
+ return userAgentPattern;
+ }
+
+ protected String getOS() {
+ return Platform.getOS();
+ }
+
+ protected String getApplicationName() {
+ return getApplicationBundle().getSymbolicName();
+ }
+
+ protected String getApplicationVersion() {
+ String fullVersion = getApplicationBundle().getVersion().toString();
+ int productVersionStart = fullVersion.lastIndexOf(VERSION_DELIMITER);
+ if (productVersionStart > 0) {
+ return fullVersion.substring(0, productVersionStart);
+ } else {
+ return fullVersion;
+ }
+ }
+
+ /**
+ * Returns the bundle that launched the application that this class runs in.
+ *
+ * @return the defining bundle
+ */
+ private Bundle getApplicationBundle() {
+ IProduct product = Platform.getProduct();
+ if (product != null) {
+ return product.getDefiningBundle();
+ } else {
+ return Platform.getBundle(ECLIPSE_RUNTIME_BULDEID);
+ }
+ }
+
+ public String getUserId() {
+ if (PreferencesUtils.getStore().contains(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID)) {
+ return PreferencesUtils.getStore().getString(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID);
+ } else {
+ String userId = createIdentifier();
+ PreferencesUtils.getStore().putValue(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId);
+ return userId;
+ }
+// IEclipsePreferences preferences = Preferences.getConfigurationPreferences();
+// String userId = createIdentifier();
+// try {
+// if (!preferences.nodeExists(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID)) {
+// preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId);
+// preferences.flush();
+// } else {
+// userId = preferences.get(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId);
+// }
+// } catch (BackingStoreException e) {
+// StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not retrieve {0} from preferences.",
+// e, IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID);
+// }
+// return userId;
+ }
+
+ /**
+ * Creates an unique identifier.
+ *
+ * @return the identifier
+ */
+ private String createIdentifier() {
+ StringBuilder builder = new StringBuilder();
+ builder.append(Math.abs(random.nextLong()));
+ builder.append(System.currentTimeMillis());
+ return builder.toString();
+ }
+
+ public String getKeyword() {
+ JBossBundleGroups jbossBundleGroups = new JBossBundleGroups();
+ IBundleEntryFilter jbossToolsFilter = new BundleUtils.BundleSymbolicNameFilter(JBOSS_TOOLS_BUNDLES_PREFIX);
+ IBundleEntryFilter compositeFilter = new BundleUtils.CompositeFilter(
+ jbossToolsFilter
+ , 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);
+ }
+ return builder.toString();
+ }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/GoogleAnalyticsUrlStrategy.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,248 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import java.io.UnsupportedEncodingException;
+
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy;
+import org.jboss.tools.usage.util.EncodingUtils;
+
+/**
+ * Class that builds an URL that passes given parameters to google analytics
+ *
+ * @author Andre Dietisheim
+ */
+public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy {
+
+ private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif";
+
+ private static final int VISITS = -1;
+
+ private IGoogleAnalyticsParameters googleParameters;
+
+ public GoogleAnalyticsUrlStrategy(IGoogleAnalyticsParameters googleAnalyticsParameters) {
+ this.googleParameters = googleAnalyticsParameters;
+ }
+
+ public String build(FocusPoint focusPoint) throws UnsupportedEncodingException {
+ /*
+ * Google Analytics for Android:
+ *
+ String str = "";
+ if (paramEvent.action != null)
+ str = paramEvent.action;
+ if (!(str.startsWith("/")))
+ str = "/" + str;
+ str = encode(str);
+ Locale localLocale = Locale.getDefault();
+ StringBuilder localStringBuilder = new StringBuilder();
+ localStringBuilder.append("/__utm.gif");
+ localStringBuilder.append("?utmwv=4.3");
+ localStringBuilder.append("&utmn=").append(paramEvent.randomVal);
+ localStringBuilder.append("&utmcs=UTF-8");
+ localStringBuilder.append(String.format("&utmsr=%dx%d", new Object[] {
+ Integer.valueOf(paramEvent.screenWidth)
+ , Integer.valueOf(paramEvent.screenHeight) }));
+ localStringBuilder.append(String.format("&utmul=%s-%s", new Object[] {
+ localLocale.getLanguage()
+ , localLocale.getCountry() }));
+ localStringBuilder.append("&utmp=").append(str);
+ localStringBuilder.append("&utmac=").append(paramEvent.accountId);
+ localStringBuilder.append("&utmcc=").append(
+ getEscapedCookieString(paramEvent, paramString));
+ return localStringBuilder.toString();
+
+ *
+ * getEscapedCookieString:
+ *
+ StringBuilder localStringBuilder = new StringBuilder();
+ localStringBuilder.append("__utma=");
+ localStringBuilder.append("999").append(".");
+ localStringBuilder.append(paramEvent.userId).append(".");
+ localStringBuilder.append(paramEvent.timestampFirst).append(".");
+ localStringBuilder.append(paramEvent.timestampPrevious).append(".");
+ localStringBuilder.append(paramEvent.timestampCurrent).append(".");
+ localStringBuilder.append(paramEvent.visits);
+ if (paramString != null)
+ {
+ localStringBuilder.append("+__utmz=");
+ localStringBuilder.append("999").append(".");
+ localStringBuilder.append(paramEvent.timestampFirst).append(".");
+ localStringBuilder.append("1.1.");
+ localStringBuilder.append(paramString);
+ }
+ return encode(localStringBuilder.toString());
+
+ */
+
+ /*
+ * our working tracking code
+ *
+ http://www.google-analytics.com/__utm.gif?utmwv=4.7.2
+ &utmn=338321265
+ &utmhn=jboss.org
+ &utmcs=UTF-8
+ &utmsr=1920x1080
+ &utmsc=24-bit
+ &utmul=en-us
+ &utmje=1
+ &utmfl=10.1%20r53
+ &utmdt=-%20JBoss%20Community
+ &utmhid=1087431432
+ &utmr=0
+ &utmp=%2Ftools%2Fusage.html
+ &utmac=UA-17645367-1
+ &utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B
+ &gaq=1
+ *
+ */
+
+ StringBuilder builder = new StringBuilder(TRACKING_URL)
+ .append(IGoogleAnalyticsParameters.URL_PARAM_DELIMITER);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION,
+ IGoogleAnalyticsParameters.VALUE_TRACKING_CODE_VERSION, builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_UNIQUE_TRACKING_NUMBER, getRandomNumber(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_HOST_NAME, googleParameters.getHostname(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING,
+ IGoogleAnalyticsParameters.VALUE_ENCODING_UTF8, builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, googleParameters.getScreenResolution(),
+ builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, googleParameters.getScreenColorDepth(),
+ builder);
+ 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_REFERRAL, googleParameters.getReferral(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
+
+ appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(focusPoint), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder);
+
+ return builder.toString();
+ }
+
+ private String getCookies(FocusPoint focusPoint) {
+ long timeStamp = System.currentTimeMillis();
+ StringBuilder builder = new StringBuilder();
+ builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append("999.")
+ .append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+ .append(VISITS)
+ .append(IGoogleAnalyticsParameters.SEMICOLON)
+ .append(IGoogleAnalyticsParameters.PLUS_SIGN)
+ .append(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append("999.")
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+ .append("1.1.")
+ .append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
+ .append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
+ .append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append("(none)");
+ appendCookieKeyword(builder);
+ builder.append(IGoogleAnalyticsParameters.SEMICOLON);
+
+ return EncodingUtils.checkedEncodeUtf8(builder.toString());
+
+ // builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES)
+ // .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ // .append("__utma%3D")
+ // .append(getRandomNumber())
+ // .append(".")
+ // .append(getRandomNumber())
+ // .append(".")
+ // .append(now)
+ // .append(".")
+ // .append(now)
+ // .append(".")
+ // .append(now)
+ // .append(".2%3B%2B)")
+ //
+ // // .append("__utmb%3D")
+ // // .append(getRandomNumber())
+ // // .append("%3B%2B__utmc%3D")
+ // // .append(getRandomNumber())
+ // // .append("%3B%2B")
+ //
+ // .append("__utmz%3D")
+ // .append(getRandomNumber())
+ // .append(".")
+ // .append(now)
+ // .append(IGoogleAnalyticsParameters.AMPERSAND);
+
+ // .append("utmcsr%3D(direct)%7C")
+ // .append("utmccn%3D(direct)%7C")
+ // .append("utmcmd%3D(none)%3B");
+
+ }
+
+ /**
+ * Appends the keyword to the cookies.
+ *
+ * @param builder the builder to append to
+ */
+ private void appendCookieKeyword(StringBuilder builder) {
+ String keyword = googleParameters.getKeyword();
+ if (keyword != null && keyword.length() > 0) {
+ builder.append(IGoogleAnalyticsParameters.PIPE)
+ .append(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append(keyword);
+ }
+ }
+
+ private String getRandomNumber() {
+ return Integer.toString((int) (Math.random() * 0x7fffffff));
+ }
+
+ private void appendParameter(String name, String value, StringBuilder builder) {
+ appendParameter(name, value, true, builder);
+ }
+
+ private void appendParameter(String name, String value, boolean appendAmpersand, StringBuilder builder) {
+ builder.append(name)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append(value);
+ if (appendAmpersand) {
+ builder.append(IGoogleAnalyticsParameters.AMPERSAND);
+ }
+ }
+
+ // private String getIpAddress() throws SocketException {
+ // Enumeration<NetworkInterface> e1 =
+ // (Enumeration<NetworkInterface>)NetworkInterface.getNetworkInterfaces();
+ // while(e1.hasMoreElements()) {
+ // NetworkInterface ni = e1.nextElement();
+ //
+ // System.out.print(ni.getName());
+ // System.out.print(" : [");
+ // Enumeration<InetAddress> e2 = ni.getInetAddresses();
+ // while(e2.hasMoreElements()) {
+ // InetAddress ia = e2.nextElement();
+ // System.out.print(ia);
+ // if( e2.hasMoreElements()) {
+ // System.out.print(",");
+ // }
+ // }
+ // System.out.println("]");
+ // }
+ // }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/HttpGetMethod.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.MessageFormat;
+
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
+
+/**
+ * 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";
+
+ private static final String GET_METHOD_NAME = "GET";
+
+ private static final String SUCCESS_MESSAGE = "Http Get to url {0} successfull!";
+
+ private static final String ERROR_MESSAGE = "Http Get to {0} failed, response code was {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(ERROR_MESSAGE, urlString, responseCode));
+ } else {
+ loggingAdapter.logError(MessageFormat.format(SUCCESS_MESSAGE, urlString));
+ }
+ } catch (Exception e) {
+ loggingAdapter.logError(e.getMessage());
+ } 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;
+ }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossBundleGroups.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,223 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class JBossBundleGroups implements IBundleEntryFilter {
+
+ public enum BundleGroup {
+ ARCHIVES("org.jboss.ide.eclipse.archives.core",
+ "org.jboss.ide.eclipse.archives.jdt.integration",
+ "org.jboss.ide.eclipse.archives.ui"
+ )
+ , AS("org.jboss.ide.eclipse.archives.webtools",
+ "org.jboss.ide.eclipse.as.classpath.core",
+ "org.jboss.ide.eclipse.as.classpath.ui",
+ "org.jboss.ide.eclipse.as.core",
+ "org.jboss.ide.eclipse.as.doc.user",
+ "org.jboss.ide.eclipse.as.ssh",
+ "org.jboss.ide.eclipse.as.ui",
+ "org.jboss.ide.eclipse.as.ui.mbeans",
+ "org.jboss.ide.eclipse.as.wtp.core",
+ "org.jboss.ide.eclipse.as.wtp.ui")
+ , BIRT("org.jboss.tools.birt.core",
+ "org.jboss.tools.birt.oda",
+ "org.jboss.tools.birt.oda.ui")
+ , BPEL("org.eclipse.bpel.apache.ode.deploy.model",
+ "org.eclipse.bpel.apache.ode.deploy.ui",
+ "org.eclipse.bpel.common.model",
+ "org.eclipse.bpel.common.ui",
+ "org.eclipse.bpel.model",
+ "org.eclipse.bpel.ui",
+ "org.eclipse.bpel.validator",
+ "org.eclipse.bpel.wsil.model",
+ "org.eclipse.bpel.xpath10",
+ "org.jboss.tools.bpel.cheatsheet",
+ "org.jboss.tools.bpel.runtimes")
+ , CDI("org.jboss.tools.cdi.core",
+ "org.jboss.tools.cdi.text.ext",
+ "org.jboss.tools.cdi.ui",
+ "org.jboss.tools.cdi.xml",
+ "org.jboss.tools.cdi.xml.ui")
+ , DELTACLOUD("org.jboss.tools.deltacloud.core",
+ "org.jboss.tools.deltacloud.ui")
+ , DROOLS("org.drools.eclipse",
+ "org.drools.eclipse.task",
+ "org.eclipse.webdav",
+ "org.guvnor.tools",
+ "org.jboss.tools.flow.ruleflow")
+ , ESB("org.jboss.tools.esb.core",
+ "org.jboss.tools.esb.project.core",
+ "org.jboss.tools.esb.project.ui",
+ "org.jboss.tools.esb.ui",
+ "org.jboss.tools.esb.validator")
+ , FLOW("org.jboss.tools.flow.common")
+ , FREEMARKER("org.jboss.ide.eclipse.freemarker")
+ , GWT("org.jboss.tools.gwt.core",
+ "org.jboss.tools.gwt.ui")
+ , HIBERNATETOOLS("org.hibernate.eclipse",
+ "org.hibernate.eclipse.console",
+ "org.hibernate.eclipse.help",
+ "org.hibernate.eclipse.jdt.apt.ui",
+ "org.hibernate.eclipse.jdt.ui",
+ "org.hibernate.eclipse.mapper",
+ "org.jboss.tools.hibernate.jpt.core",
+ "org.jboss.tools.hibernate.jpt.ui",
+ "org.jboss.tools.hibernate.ui",
+ "org.jboss.tools.hibernate.xml",
+ "org.jboss.tools.hibernate.xml.ui")
+ , JBPM("org.jboss.tools.flow.jpdl4",
+ "org.jboss.tools.flow.jpdl4.multipage",
+ "org.jboss.tools.jbpm.common",
+ "org.jboss.tools.jbpm.convert",
+ "org.jbpm.gd.jpdl")
+ , JMX("org.jboss.tools.jmx.core",
+ "org.jboss.tools.jmx.ui")
+ , JSF("org.jboss.tools.jsf",
+ "org.jboss.tools.jsf.doc.user",
+ "org.jboss.tools.jsf.text.ext",
+ "org.jboss.tools.jsf.text.ext.facelets",
+ "org.jboss.tools.jsf.text.ext.richfaces",
+ "org.jboss.tools.jsf.ui",
+ "org.jboss.tools.jsf.verification",
+ "org.jboss.tools.jsf.vpe.ajax4jsf",
+ "org.jboss.tools.jsf.vpe.facelets",
+ "org.jboss.tools.jsf.vpe.jbpm",
+ "org.jboss.tools.jsf.vpe.jsf",
+ "org.jboss.tools.jsf.vpe.jstl",
+ "org.jboss.tools.jsf.vpe.myfaces",
+ "org.jboss.tools.jsf.vpe.richfaces",
+ "org.jboss.tools.jsf.vpe.seam")
+ , JST("org.jboss.tools.jst.css",
+ "org.jboss.tools.jst.firstrun",
+ "org.jboss.tools.jst.jsp",
+ "org.jboss.tools.jst.text.ext",
+ "org.jboss.tools.jst.web",
+ "org.jboss.tools.jst.web.kb",
+ "org.jboss.tools.jst.web.tiles",
+ "org.jboss.tools.jst.web.tiles.ui",
+ "org.jboss.tools.jst.web.ui",
+ "org.jboss.tools.jst.web.verification")
+ , LABS("org.jboss.tools.labs.pde.sourceprovider")
+ , MAVEN("org.jboss.tools.maven.cdi",
+ "org.jboss.tools.maven.core",
+ "org.jboss.tools.maven.hibernate",
+ "org.jboss.tools.maven.jsf",
+ "org.jboss.tools.maven.portlet",
+ "org.jboss.tools.maven.seam",
+ "org.jboss.tools.maven.ui")
+ , MODESHAPE("org.jboss.tools.modeshape.rest")
+ , PORTLET("org.jboss.tools.portlet.core",
+ "org.jboss.tools.portlet.ui")
+ , PROFILER("org.jboss.tools.profiler.ui")
+ , RUNTIME("org.jboss.tools.runtime")
+ , SEAM("org.jboss.tools.seam.core",
+ "org.jboss.tools.seam.doc.user",
+ "org.jboss.tools.seam.pages.xml",
+ "org.jboss.tools.seam.text.ext",
+ "org.jboss.tools.seam.ui",
+ "org.jboss.tools.seam.ui.pages",
+ "org.jboss.tools.seam.xml",
+ "org.jboss.tools.seam.xml.ui")
+ , SMOOKS("org.jboss.tools.smooks.core",
+ "org.jboss.tools.smooks.runtime",
+ "org.jboss.tools.smooks.templating",
+ "org.jboss.tools.smooks.ui")
+ , STRUTS("org.jboss.tools.struts",
+ "org.jboss.tools.struts.text.ext",
+ "org.jboss.tools.struts.ui",
+ "org.jboss.tools.struts.validator.ui",
+ "org.jboss.tools.struts.verification",
+ "org.jboss.tools.struts.vpe.struts")
+ , TPTP("org.jboss.tools.eclipse.as.tptp")
+ , VPE("org.jboss.tools.vpe",
+ "org.jboss.tools.vpe.docbook",
+ "org.jboss.tools.vpe.html",
+ "org.jboss.tools.vpe.jsp",
+ "org.jboss.tools.vpe.resref",
+ "org.jboss.tools.vpe.spring",
+ "org.jboss.tools.vpe.ui.palette",
+ "org.jboss.tools.vpe.xulrunner",
+ "org.jboss.tools.xulrunner",
+ "org.jboss.tools.xulrunner.initializer")
+ , WORKINGSET("org.jboss.tools.workingset.core",
+ "org.jboss.tools.workingset.ui")
+ , WS("rg.jboss.tools.ws.core",
+ "org.jboss.tools.ws.creation.core",
+ "org.jboss.tools.ws.creation.ui",
+ "org.jboss.tools.ws.ui")
+ , XULRUNNER("org.mozilla.xpcom",
+ "org.mozilla.xulrunner.carbon.macosx",
+ "org.mozilla.xulrunner.cocoa.macosx",
+ "org.mozilla.xulrunner.gtk.linux.x86",
+ "org.mozilla.xulrunner.gtk.linux.x86_64",
+ "org.mozilla.xulrunner.win32.win32.x86");
+
+ private String[] bundleNames;
+
+ BundleGroup(String... bundleNames) {
+ this.bundleNames = bundleNames;
+ }
+
+ /**
+ * Returns <tt>true</tt> if the given bundle name is a member of this
+ * bundle group.
+ *
+ * @param bundleName
+ * the bundle name to check whether it's a member of this
+ * group of bundles.
+ * @return <tt>true</tt>, if the given bundle
+ */
+ public boolean isMember(String bundleName) {
+ boolean isMember = false;
+ for (String name : bundleNames) {
+ if (name.equals(bundleName)) {
+ return true;
+ }
+ }
+ return isMember;
+ }
+
+ public void addGroupIdTo(Collection<String> bundleGroupIds) {
+ bundleGroupIds.add(name());
+ }
+ }
+
+ private Set<String> jbossBundleGroups = new HashSet<String>();
+
+ /**
+ * Collects the bundle groups the bundles it gets belong
+ * to. Always returns <tt>true</tt> (does match) while collecting
+ */
+ public boolean matches(Bundle bundle) {
+ String bundleName = bundle.getSymbolicName();
+ for (BundleGroup bundleGroup : BundleGroup.values()) {
+ if (bundleGroup.isMember(bundleName)) {
+ jbossBundleGroups.add(bundleGroup.name());
+ break;
+ }
+ }
+ return true;
+ }
+
+ public Collection<String> getBundleGroupIds() {
+ return jbossBundleGroups;
+ }
+}
\ No newline at end of file
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/JBossToolsUsageActivator.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -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.reporting;
+
+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);
+ }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/Messages.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.tools.usage.reporting.messages"; //$NON-NLS-1$
+ public static String UsageReport_Checkbox_Text;
+ public static String UsageReport_DialogMessage;
+ public static String UsageReport_DialogTitle;
+
+ public static String UsageReport_Error_SavePreferences;
+ public static String UsageReport_GoogleAnalyticsAccount;
+ public static String UsageReport_HostName;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/PluginLogger.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
+
+/**
+ * @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);
+ }
+ }
+}
Added: 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 (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.jboss.tools.usage.ITracker;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
+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.Tracker;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class UsageReport {
+
+ private static final String GANALYTICS_ACCOUNTNAME = Messages.UsageReport_GoogleAnalyticsAccount;
+
+ private static final String HOST_NAME = Messages.UsageReport_HostName;
+
+ private FocusPoint focusPoint = new FocusPoint("jboss.org").setChild(new FocusPoint("tools") //$NON-NLS-1$ //$NON-NLS-2$
+ .setChild(new FocusPoint("usage").setChild(new FocusPoint("action") //$NON-NLS-1$ //$NON-NLS-2$
+ .setChild(new FocusPoint("wsstartup"))))); //$NON-NLS-1$
+
+ public void report() {
+ if (UsageReportPreferences.isEnabled()) {
+ report(getAnalyticsTracker());
+ }
+ }
+
+ private void report(ITracker tracker) {
+ tracker.trackAsynchronously(focusPoint);
+ }
+
+ private ITracker getAnalyticsTracker() {
+ IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironment(
+ GANALYTICS_ACCOUNTNAME
+ , HOST_NAME
+ , IGoogleAnalyticsParameters.VALUE_NO_REFERRAL);
+ ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageActivator.getDefault());
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseSettings);
+ return new Tracker(urlStrategy, eclipseSettings.getUserAgent(), loggingAdapter);
+ }
+}
Added: 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 (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportDispatcher.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IStartup;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.usage.reporting.Messages;
+import org.jboss.tools.usage.util.StatusUtils;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * @author Andre Dieitsheim
+ */
+public class UsageReportDispatcher implements IStartup {
+
+ public void earlyStartup() {
+ Display.getDefault().asyncExec(new Runnable() {
+
+ public void run() {
+ UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(Messages.UsageReport_DialogTitle,
+ Messages.UsageReport_DialogMessage,
+ Messages.UsageReport_Checkbox_Text,
+ true,
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+ if (UsageReportPreferences.isAskUser()) {
+ if (dialog.open() == Window.OK) {
+ UsageReportPreferences.setEnabled(dialog.isReportEnabled());
+ UsageReportPreferences.setAskUser(false);
+ flushPreferences();
+ }
+ }
+
+ if (UsageReportPreferences.isEnabled()) {
+ new UsageReport().report();
+ }
+ }
+
+ private void flushPreferences() {
+ try {
+ UsageReportPreferences.flush();
+ } catch (BackingStoreException e) {
+ IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
+ Messages.UsageReport_Error_SavePreferences, e);
+ JBossToolsUsageActivator.getDefault().getLog().log(status);
+ }
+ }
+ });
+ }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportEnablementDialog.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.window.IShellProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class UsageReportEnablementDialog extends Dialog {
+
+ private Button checkBox;
+ private String title;
+ private String message;
+ private boolean reportEnabled;
+ private String checkBoxLabel;
+
+ public UsageReportEnablementDialog(String title, String message, String checkBoxLabel,
+ boolean reportEnabled, IShellProvider parentShell) {
+ super(parentShell);
+ this.title = title;
+ this.message = message;
+ this.checkBoxLabel = checkBoxLabel;
+ this.reportEnabled = reportEnabled;
+ }
+
+ protected void buttonPressed(int buttonId) {
+ if (buttonId == IDialogConstants.OK_ID) {
+ this.reportEnabled = checkBox.getSelection();
+ }
+ else if (buttonId == IDialogConstants.CANCEL_ID) {
+ this.reportEnabled = false;
+ }
+ super.buttonPressed(buttonId);
+ }
+
+ protected void configureShell(Shell shell) {
+ super.configureShell(shell);
+ if (title != null) {
+ shell.setText(title);
+ }
+ }
+
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+ createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+ checkBox.setFocus();
+ checkBox.setSelection(reportEnabled);
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite composite = (Composite) super.createDialogArea(parent);
+ if (message != null) {
+ Label label = new Label(composite, SWT.WRAP);
+ label.setFont(parent.getFont());
+ label.setText(message);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).grab(true, false)
+ .hint(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH, SWT.DEFAULT)
+ .applyTo(label);
+ }
+ checkBox = new Button(composite, SWT.CHECK);
+ checkBox.setText(checkBoxLabel);
+ GridDataFactory.fillDefaults().grab(true, false).align(SWT.LEFT, SWT.CENTER).applyTo(checkBox);
+ applyDialogFont(composite);
+ return composite;
+ }
+
+ public boolean isReportEnabled() {
+ return reportEnabled;
+ }
+}
Added: 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 (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-08-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * 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.reporting;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
+import org.jboss.tools.usage.util.PreferencesUtils;
+import org.jboss.tools.usage.util.StatusUtils;
+import org.osgi.service.prefs.BackingStoreException;
+
+public class UsageReportPreferences {
+
+ public static void setEnabled(boolean enabled) {
+ PreferencesUtils.getStore().putValue(
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, String.valueOf(enabled));
+ }
+
+ public static boolean isEnabled() {
+ return PreferencesUtils.getPreferences().getBoolean(
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID,
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE);
+ }
+
+ public static void flush() throws BackingStoreException {
+ PreferencesUtils.getPreferences().flush();
+ }
+
+ public static IPreferenceStore createPreferenceStore() {
+ return PreferencesUtils.getStore();
+ }
+
+ public static boolean isAskUser() {
+ IEclipsePreferences preferences = PreferencesUtils.getPreferences();
+ return preferences.getBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, true);
+ }
+
+ public static void setAskUser(boolean askUser) {
+ try {
+ IEclipsePreferences preferences = PreferencesUtils.getPreferences();
+ preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, askUser);
+ preferences.flush();
+ } catch (BackingStoreException e) {
+ JBossToolsUsageActivator.getDefault().getLog().log(
+ StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
+ Messages.UsageReport_Error_SavePreferences, e,
+ IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID));
+ }
+ }
+}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/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-18 16:42:12 UTC (rev 24264)
@@ -0,0 +1,6 @@
+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
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24263 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-18 12:12:07 -0400 (Wed, 18 Aug 2010)
New Revision: 24263
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
Log:
https://jira.jboss.org/browse/JBIDE-6798 Missing JSF 2.0. JARs for JBossAS 6.0.0.M4
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2010-08-18 14:32:06 UTC (rev 24262)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2010-08-18 16:12:07 UTC (rev 24263)
@@ -142,6 +142,7 @@
ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
list.addAll(get50(location, configPath));
addEntries(configPath.append(DEPLOYERS).append(REST_EASY_DEPLOYER), list);
+ addEntries(configPath.append(DEPLOYERS).append(JSF_DEPLOYER).append(MOJARRA_20).append(JSF_LIB), list);
return list;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2010-08-18 14:32:06 UTC (rev 24262)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2010-08-18 16:12:07 UTC (rev 24263)
@@ -49,6 +49,9 @@
public static final String JBOSS_AOP_JDK5_JAR = "jboss-aop-jdk50.jar"; //$NON-NLS-1$
public static final String JBOSS_WEB_DEPLOYER = "jboss-web.deployer"; //$NON-NLS-1$
public static final String REST_EASY_DEPLOYER = "resteasy.deployer"; //$NON-NLS-1$
+ public static final String JSF_DEPLOYER = "jsf.deployer"; //$NON-NLS-1$
+ public static final String MOJARRA_12 = "Mojarra-1.2"; //$NON-NLS-1$
+ public static final String MOJARRA_20 = "Mojarra-2.0"; //$NON-NLS-1$
public static final String JSP_API_JAR = "jsp-api.jar"; //$NON-NLS-1$
public static final String SERVLET_API_JAR = "servlet-api.jar"; //$NON-NLS-1$
public static final String JSF_API_JAR = "jsf-api.jar"; //$NON-NLS-1$
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24262 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-18 10:32:06 -0400 (Wed, 18 Aug 2010)
New Revision: 24262
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/plugin.xml
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.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/util/BundleUtils.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java
Log:
[JBIDE-6376] * texts internationalized * saving preferences fixed * preferences added to JBoss Tools Preferences category
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 14:32:06 UTC (rev 24262)
@@ -7,7 +7,7 @@
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>
<booleanAttribute key="default" value="true"/>
Modified: trunk/usage/plugins/org.jboss.tools.usage/plugin.xml
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-08-18 14:32:06 UTC (rev 24262)
@@ -12,7 +12,8 @@
<page
class="org.jboss.tools.usage.preferences.UsageReportPreferencePage"
id="org.jboss.tools.usage.analytics.preferences.UsageAnalyticsPreferencePage"
- name="JBoss Usage Analytics Preferences">
+ name="JBoss Usage Reporting Preferences"
+ category="org.jboss.tools.common.model.ui.MainPreferencePage">
</page>
</extension>
<extension
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -0,0 +1,20 @@
+package org.jboss.tools.usage.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.tools.usage.internal.messages"; //$NON-NLS-1$
+ public static String UsageReport_Checkbox_Text;
+ public static String UsageReport_DialogMessage;
+ public static String UsageReport_DialogTitle;
+ public static String UsageReport_Error_SavePreferences;
+ public static String UsageReport_GoogleAnalyticsAccount;
+ public static String UsageReport_HostName;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.usage.internal;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Display;
@@ -22,6 +21,7 @@
import org.jboss.tools.usage.googleanalytics.IURLBuildingStrategy;
import org.jboss.tools.usage.googleanalytics.Tracker;
import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
+import org.jboss.tools.usage.util.PreferencesUtil;
import org.jboss.tools.usage.util.StatusUtils;
import org.osgi.service.prefs.BackingStoreException;
@@ -30,23 +30,24 @@
*/
public class UsageReport {
- private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
+ private static final String GANALYTICS_ACCOUNTNAME = Messages.UsageReport_GoogleAnalyticsAccount;
- private static final String HOST_NAME = "jboss.org";
+ private static final String HOST_NAME = Messages.UsageReport_HostName;
- private FocusPoint focusPoint = new FocusPoint("jboss.org")
- .setChild(new FocusPoint("tools").setChild(new FocusPoint("usage").setChild(new FocusPoint("action")
- .setChild(new FocusPoint("wsstartup")))));
+ private FocusPoint focusPoint = new FocusPoint("jboss.org").setChild(new FocusPoint("tools") //$NON-NLS-1$ //$NON-NLS-2$
+ .setChild(new FocusPoint("usage").setChild(new FocusPoint("action") //$NON-NLS-1$ //$NON-NLS-2$
+ .setChild(new FocusPoint("wsstartup"))))); //$NON-NLS-1$
public void report() {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- UsageReportEnablementDialog dialog = new UsageReportEnablementDialog("Report usage",
- "Please allow Red Hat Inc. to report this installation anynomously for statistical matters.",
- "Report usage anonymously to Red Hat Inc.", true, PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow());
+ UsageReportEnablementDialog dialog = new UsageReportEnablementDialog(Messages.UsageReport_DialogTitle,
+ Messages.UsageReport_DialogMessage,
+ Messages.UsageReport_Checkbox_Text,
+ true,
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow());
if (isAskUser()) {
if (dialog.open() == Window.OK) {
setReportEnabled(dialog.isReportEnabled());
@@ -62,8 +63,8 @@
}
private void setReportEnabled(boolean enabled) {
- IEclipsePreferences preferences = new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
- preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED, enabled);
+ PreferencesUtil.getConfigurationPreferences().putBoolean(
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, enabled);
}
private void report(ITracker tracker) {
@@ -81,27 +82,26 @@
}
private boolean isAskUser() {
- IEclipsePreferences preferences = getPreferences();
- return preferences.getBoolean(IUsageReportPreferenceConstants.ASK_USER, true);
+ IEclipsePreferences preferences = PreferencesUtil.getConfigurationPreferences();
+ return preferences.getBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, true);
}
private void setAskUser(boolean askUser) {
try {
- IEclipsePreferences preferences = getPreferences();
- preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER, askUser);
+ IEclipsePreferences preferences = PreferencesUtil.getConfigurationPreferences();
+ preferences.putBoolean(IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID, askUser);
preferences.flush();
} catch (BackingStoreException e) {
JBossToolsUsageActivator.getDefault().getLog().log(
- StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not save preferences {0}", e,
- IUsageReportPreferenceConstants.ASK_USER));
+ StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
+ Messages.UsageReport_Error_SavePreferences, e,
+ IUsageReportPreferenceConstants.ASK_USER_USAGEREPORT_ID));
}
}
private boolean isReportEnabled() {
- return getPreferences().getBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED, true);
+ return PreferencesUtil.getConfigurationPreferences().getBoolean(
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID,
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE);
}
-
- private IEclipsePreferences getPreferences() {
- return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
- }
}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties 2010-08-18 14:32:06 UTC (rev 24262)
@@ -0,0 +1,6 @@
+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
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -15,17 +15,24 @@
*/
public interface IUsageReportPreferenceConstants {
+ /** The value that determines if usage shall be reported if there's no user set setting. */
+ public static final boolean USAGEREPORT_ENABLED_DEFAULTVALUE = false;
+
/**
- * Identifies the preferences that states whether the user allows us to
- * report usage.
+ * The identifier to be used to identify the value that determines if usage
+ * shall be reported.
*/
- public static final String USAGEREPORT_ENABLED = "allowUsageReportPreference";
+ public static final String USAGEREPORT_ENABLED_ID = "allowUsageReportPreference"; //$NON-NLS-1$
/**
- * Identifies the preferences that states whether the user allows us to
- * report usage.
+ * The identifier to be used for the value that determines if the user shall
+ * be asked for reporting.
*/
- public static final String ASK_USER = "askUserPreference";
+ public static final String ASK_USER_USAGEREPORT_ID = "askUserForUsageReportPreference"; //$NON-NLS-1$
- public static final String ECLIPSE_INSTANCE_ID = "eclipseInstanceId";
+ /**
+ * The identifier to be used for the value that determines this eclipse
+ * instance.
+ */
+ public static final String ECLIPSE_INSTANCE_ID = "eclipseInstanceId"; //$NON-NLS-1$
}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.tools.usage.preferences.messages"; //$NON-NLS-1$
+ public static String UsageReportPreferencePage_AllowReporting;
+
+ public static String UsageReportPreferencePage_Error_Saving;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferenceInitializer.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -13,8 +13,6 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
/**
@@ -24,19 +22,7 @@
AbstractPreferenceInitializer {
public void initializeDefaultPreferences() {
- // IPreferenceStore store =
- // JBossToolsUsageActivator.getDefault().getPreferenceStore();
- // store.setDefault(PreferenceConstants.P_ALLOW_USAGEREPORT, true);
-// IPreferenceStore store = getPreferencesStore();
-// store.setDefault(UsageReportPreferenceConstants.P_ALLOW_USAGEREPORT, true);
IEclipsePreferences preferences = new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
- preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED, true);
+ preferences.putBoolean(IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_DEFAULTVALUE);
}
-
- private IPreferenceStore getPreferencesStore() {
- IPreferenceStore preferenceStore = new ScopedPreferenceStore(
- new ConfigurationScope(),
- JBossToolsUsageActivator.PLUGIN_ID);
- return preferenceStore;
- }
}
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-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/UsageReportPreferencePage.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -10,41 +10,30 @@
******************************************************************************/
package org.jboss.tools.usage.preferences;
-import java.io.IOException;
-
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
+import org.jboss.tools.usage.util.PreferencesUtil;
import org.jboss.tools.usage.util.StatusUtils;
+import org.osgi.service.prefs.BackingStoreException;
/**
* @author Andre Dietisheim
*/
public class UsageReportPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
- private IPersistentPreferenceStore preferences;
-
public UsageReportPreferencePage() {
super(GRID);
- setPreferenceStore(this.preferences = createPreferencesStore());
+ setPreferenceStore(PreferencesUtil.createConfigurationPreferencesStore());
}
- private IPersistentPreferenceStore createPreferencesStore() {
- return new ScopedPreferenceStore(
- new ConfigurationScope(),
- JBossToolsUsageActivator.PLUGIN_ID);
- }
-
public void createFieldEditors() {
addField(new BooleanFieldEditor(
- IUsageReportPreferenceConstants.USAGEREPORT_ENABLED
- , "&Allow JBoss Tools to report usage analytics anonymously for statistical matters"
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID
+ , Messages.UsageReportPreferencePage_AllowReporting
, getFieldEditorParent()));
}
@@ -54,10 +43,10 @@
@Override
public boolean performOk() {
try {
- preferences.save();
- } catch (IOException e) {
+ PreferencesUtil.getConfigurationPreferences().flush();
+ } catch (BackingStoreException e) {
IStatus status = StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID,
- "Could not save the preferences.", e);
+ Messages.UsageReportPreferencePage_Error_Saving, e);
JBossToolsUsageActivator.getDefault().getLog().log(status);
}
return super.performOk();
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties 2010-08-18 14:32:06 UTC (rev 24262)
@@ -0,0 +1,2 @@
+UsageReportPreferencePage_AllowReporting=&Allow JBoss Tools to report usage anonymously.\n Data is used for statistical matters only.
+UsageReportPreferencePage_Error_Saving=Could not save the preferences.
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -17,7 +17,6 @@
import org.eclipse.core.runtime.Assert;
import org.osgi.framework.Bundle;
-
/**
* @author Andre Dietisheim
*/
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 13:45:36 UTC (rev 24261)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtil.java 2010-08-18 14:32:06 UTC (rev 24262)
@@ -12,6 +12,8 @@
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.jface.preference.IPersistentPreferenceStore;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
/**
@@ -19,12 +21,11 @@
*/
public class PreferencesUtil {
- /**
- * Returns the preferences used for this plugin.
- *
- * @return the preferences
- */
public static IEclipsePreferences getConfigurationPreferences() {
return new ConfigurationScope().getNode(JBossToolsUsageActivator.PLUGIN_ID);
}
+
+ public static IPersistentPreferenceStore createConfigurationPreferencesStore() {
+ return new ScopedPreferenceStore(new ConfigurationScope(), JBossToolsUsageActivator.PLUGIN_ID);
+ }
}
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24261 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-08-18 09:45:36 -0400 (Wed, 18 Aug 2010)
New Revision: 24261
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
https://jira.jboss.org/browse/JBIDE-6530, fixing test with CA
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-08-18 13:42:33 UTC (rev 24260)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-08-18 13:45:36 UTC (rev 24261)
@@ -11,6 +11,9 @@
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -56,9 +59,9 @@
setException(null);
// Tests CA
- checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","s:validateFormat",11,2,3); //$NON-NLS-1$//$NON-NLS-2$
- checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","rich:validateA", 14,14,3); //$NON-NLS-1$ //$NON-NLS-2$
- checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","c:otherwi",18,6,3); //$NON-NLS-1$//$NON-NLS-2$
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","s:validateFormat",11,2); //$NON-NLS-1$//$NON-NLS-2$
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","rich:validateA", 14,14); //$NON-NLS-1$ //$NON-NLS-2$
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","c:otherwi",18,6); //$NON-NLS-1$//$NON-NLS-2$
// check exception
if (getException() != null) {
@@ -73,7 +76,7 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/6131/6131test.xhtml","Common",1,1,false,3); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/6131/6131test.xhtml","Common",1,1,false); //$NON-NLS-1$ //$NON-NLS-2$
boolean proposalExists=false;
for (ICompletionProposal completionProposal : results) {
String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
@@ -100,7 +103,7 @@
setException(null);
// Tests CA
- ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",11,31,false,3); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",11,31,false); //$NON-NLS-1$ //$NON-NLS-2$
assertNotNull(results);
assertTrue("The length should be more than 0",results.length>0); //$NON-NLS-1$
boolean proposalExists=false;
@@ -113,7 +116,7 @@
}
assertTrue(REQUIRED_PROPOSAL + " should be in proposals", proposalExists); //$NON-NLS-1$
proposalExists=false;
- results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml","",11,41,false,3); //$NON-NLS-1$//$NON-NLS-2$
+ results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml","",11,41,false); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
for(ICompletionProposal completionProposal : results) {
String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
@@ -140,7 +143,7 @@
// set exception
setException(null);
// Tests CA
- ICompletionProposal[] results =checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",21,58,3); //$NON-NLS-1$//$NON-NLS-2$
+ ICompletionProposal[] results =checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",21,58); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
assertTrue(results.length>=2);
for(ICompletionProposal completionProposal : results) {
@@ -171,7 +174,7 @@
// set exception
setException(null);
// Tests CA
- ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforHtml.html", "", 5, 13,false,3); //$NON-NLS-1$//$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforHtml.html", "", 5, 13,false); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
assertTrue("The lenft should be more than 0",results.length>0); //$NON-NLS-1$
@@ -207,7 +210,7 @@
// Tests CA
// cursor will set after "outputText" tag
- ICompletionProposal[] results = checkOfCAByStartString(JSP_CA_NAME, "JBIDE/788/testCAforJSP.jsp", "h:outp",26,14,false,5); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(JSP_CA_NAME, "JBIDE/788/testCAforJSP.jsp", "h:outp",26,14,false); //$NON-NLS-1$ //$NON-NLS-2$
for (ICompletionProposal completionProposal : results) {
@@ -238,11 +241,11 @@
// cursor will set after "<" simbol
checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", "c", //$NON-NLS-1$ //$NON-NLS-2$
- 15,12,3);
+ 15,12);
// cursor will set after "outputText" tag
checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", "s", //$NON-NLS-1$//$NON-NLS-2$
- 19,43,3);
+ 19,43);
// check exception
if (getException() != null) {
@@ -263,9 +266,9 @@
* @throws IOException
*/
private ICompletionProposal[] checkOfCAByStartString(String caName, String testPagePath,
- String partOfString, int lineIndex, int linePosition, int proposalPopupTypesNum)
+ String partOfString, int lineIndex, int linePosition)
throws CoreException, IOException {
- return this.checkOfCAByStartString(caName, testPagePath, partOfString, lineIndex, linePosition, true, proposalPopupTypesNum);
+ return this.checkOfCAByStartString(caName, testPagePath, partOfString, lineIndex, linePosition, true);
}
/**
@@ -282,7 +285,7 @@
*/
private ICompletionProposal[] checkOfCAByStartString(String caName, String testPagePath, String partOfString,
- int lineIndex, int linePosition, boolean isCheck, int proposalPopupTypesNum) throws CoreException, IOException {
+ int lineIndex, int linePosition, boolean isCheck) throws CoreException, IOException {
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(testPagePath,
JsfAllTests.IMPORT_PROJECT_NAME);
@@ -326,11 +329,13 @@
IContentAssistProcessor iContentAssistProcessor = iContentAssistant
.getContentAssistProcessor(caName);
assertNotNull(iContentAssistProcessor);
-
- for (int i = 0; i < proposalPopupTypesNum - 1; i++) {
- iContentAssistProcessor.computeCompletionProposals(viewer, newPosition);
+ List<ICompletionProposal> res= new ArrayList<ICompletionProposal>();
+ //added by Maksim Areshkau, quite interesting calling the same method with the
+ //same params returns different results, so we need to callect them into collection
+ for(int i=0;i<6;i++){
+ res.addAll(Arrays.asList(iContentAssistProcessor.computeCompletionProposals(viewer,newPosition))) ;
}
- results = iContentAssistProcessor.computeCompletionProposals(viewer, newPosition);//obtain default proposals
+ results = res.toArray(new ICompletionProposal[0]);
// remove inserted string
viewer.getTextWidget()
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24260 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-08-18 09:42:33 -0400 (Wed, 18 Aug 2010)
New Revision: 24260
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ToolbarTextFormattingTest.java
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
Log:
Added ToolbarTextFormattingTest.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-08-18 12:24:49 UTC (rev 24259)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-08-18 13:42:33 UTC (rev 24260)
@@ -534,6 +534,9 @@
public static final String SOURCE_TAB_LABEL = "Source";
public static final String VISUAL_SOURCE_TAB_LABEL = "Visual/Source";
public static final String PREVIEW_TAB_LABEL = "Preview";
+ public static final String BOLD_TOOLBAR_BUTTON_LABEL = "Bold";
+ public static final String ITALIC_TOOLBAR_BUTTON_LABEL = "Italic";
+ public static final String UNDERLINE_TOOLBAR_BUTTON_LABEL = "Underline";
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-08-18 12:24:49 UTC (rev 24259)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-08-18 13:42:33 UTC (rev 24260)
@@ -10,6 +10,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.JspFileEditingTest;
import org.jboss.tools.vpe.ui.bot.test.editor.XhtmlFilePerformanceTest;
import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.AddSubstitutedELExpressionFolderScopeTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.ToolbarTextFormattingTest;
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.AlwaysHideSelectionBarWithoutPromptTest;
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.BorderForUnknownTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ChangeEditorTabForTheFirstOpenPageTest;
@@ -63,6 +64,7 @@
suite.addTestSuite(XhtmlFilePerformanceTest.class);
suite.addTestSuite(ManagePaletteGroupsTest.class);
suite.addTestSuite(PaletteEditorTest.class);
+ suite.addTestSuite(ToolbarTextFormattingTest.class);
return new TestSetup(suite);
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-08-18 12:24:49 UTC (rev 24259)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-08-18 13:42:33 UTC (rev 24260)
@@ -17,6 +17,8 @@
import org.jboss.tools.test.TestProperties;
import org.jboss.tools.vpe.ui.bot.test.Activator;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
import org.jboss.tools.ui.bot.test.SWTBotJSPMultiPageEditor;
@@ -414,4 +416,18 @@
tree.expandNode(JBT_TEST_PROJECT_NAME)
.expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
}
+ /**
+ * Creates new empty JSP page within test project
+ * @param pageName
+ */
+ protected void createJspPage (String pageName){
+ packageExplorer.selectTreeItem("pages", new String[] {VPEAutoTestCase.JBT_TEST_PROJECT_NAME,"WebContent"});
+ open.newObject(ActionItem.NewObject.WebJSP.LABEL);
+ bot.shell(IDELabel.Shell.NEW_JSP_FILE).activate();
+ bot.textWithLabel(ActionItem.NewObject.WebJSP.TEXT_FILE_NAME).setText(pageName);
+ bot.button(IDELabel.Button.NEXT).click();
+ bot.table().select(IDELabel.NewJSPFileDialog.JSP_TEMPLATE);
+ bot.button(IDELabel.Button.FINISH).click();
+ bot.sleep(Timing.time2S());
+ }
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ToolbarTextFormattingTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ToolbarTextFormattingTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ToolbarTextFormattingTest.java 2010-08-18 13:42:33 UTC (rev 24260)
@@ -0,0 +1,200 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2010 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign;
+
+import java.awt.event.KeyEvent;
+
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.Result;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
+import org.mozilla.interfaces.nsIDOMRange;
+/**
+ * Tests VPE Toolbar Buttons
+ * @author vlado pakan
+ *
+ */
+public class ToolbarTextFormattingTest extends VPEAutoTestCase {
+ private static final String TEXT_TEST_EXPRESSION = "Test String Expression";
+ private static final String PAGE_TEXT = "<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" +
+ "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" +
+ "<html>\n" +
+ "<head>\n" +
+ "<title></title>\n" +
+ "</head>\n" +
+ "<body>\n" +
+ "<f:view>\n" +
+ ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION + "\n" +
+ "</f:view>\n" +
+ "</body>\n" +
+ "</html>";
+
+ private static final String TEST_PAGE_NAME = "ToolbarTest.jsp";
+
+ private SWTBotExt botExt = null;
+
+ public ToolbarTextFormattingTest() {
+ super();
+ botExt = new SWTBotExt();
+ }
+
+ public void testToolbarTextFormatting(){
+ createJspPage(ToolbarTextFormattingTest.TEST_PAGE_NAME);
+ final SWTBotEclipseEditor jspTextEditor = botExt.editorByTitle(ToolbarTextFormattingTest.TEST_PAGE_NAME)
+ .toTextEditor();
+ jspTextEditor.setText(ToolbarTextFormattingTest.PAGE_TEXT);
+ jspTextEditor.save();
+ jspTextEditor.selectRange(8, 3, 0);
+ SWTBotWebBrowser webBrowser = new SWTBotWebBrowser(ToolbarTextFormattingTest.TEST_PAGE_NAME,botExt);
+ // Selects text using right arrow and shift
+ KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_SHIFT);
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_RIGHT);
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_RIGHT);
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_RIGHT);
+ KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_SHIFT);
+ bot.sleep(Timing.time2S());
+ nsIDOMRange firstRange = webBrowser.getSelection().getRangeAt(0);
+ int webBrowserSelectionSize = firstRange.getEndOffset() - firstRange.getStartOffset();
+ assertTrue("Selection within Visual Editor has to contain 3 characters but it contains " +
+ webBrowserSelectionSize + " characters.",
+ webBrowserSelectionSize == 3);
+ jspTextEditor.selectRange(8, 10, 0);
+ // Selects text using left arrow and shift
+ KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_SHIFT);
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT);
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT);
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT);
+ KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_SHIFT);
+ bot.sleep(Timing.time2S());
+ firstRange = webBrowser.getSelection().getRangeAt(0);
+ assertTrue("Selection within Visual Editor has to contain 3 characters but it contains " +
+ webBrowserSelectionSize + " characters.",
+ webBrowserSelectionSize == 3);
+ jspTextEditor.selectRange(8, 10, 0);
+ SWTBot editorBot = jspTextEditor.bot();
+ SWTBotToolbarToggleButton boldButton = editorBot.toolbarToggleButtonWithTooltip(IDELabel.VisualPageEditor.BOLD_TOOLBAR_BUTTON_LABEL);
+ SWTBotToolbarToggleButton italicButton = editorBot.toolbarToggleButtonWithTooltip(IDELabel.VisualPageEditor.ITALIC_TOOLBAR_BUTTON_LABEL);
+ SWTBotToolbarToggleButton underlinedButton = editorBot.toolbarToggleButtonWithTooltip(IDELabel.VisualPageEditor.UNDERLINE_TOOLBAR_BUTTON_LABEL);
+ // Check if Text Format Buttons buttons are enabled within VPE Editor
+ assertToolbarButtonIsEnabled(boldButton);
+ assertToolbarButtonIsEnabled(italicButton);
+ assertToolbarButtonIsEnabled(underlinedButton);
+ boldButton.click();
+ jspTextEditor.save();
+ assertTagIsInserted("b", jspTextEditor.getTextOnCurrentLine(), ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION);
+ italicButton.click();
+ jspTextEditor.save();
+ assertTagIsInserted("i", jspTextEditor.getTextOnCurrentLine(), ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION, "b");
+ underlinedButton.click();
+ jspTextEditor.save();
+ assertTagIsInserted("u", jspTextEditor.getTextOnCurrentLine(), ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION ,"b","i");
+ bot.sleep(Timing.time2S());
+ // Check if Text Format Buttons buttons are toggled
+ assertToggleToolbarSelection(true, boldButton);
+ assertToggleToolbarSelection(true, italicButton);
+ assertToggleToolbarSelection(true, underlinedButton);
+ underlinedButton.click();
+ jspTextEditor.save();
+ assertTagIsInserted("i", jspTextEditor.getTextOnCurrentLine(), ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION, "b");
+ italicButton.click();
+ jspTextEditor.save();
+ assertTagIsInserted("b", jspTextEditor.getTextOnCurrentLine(), ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION);
+ boldButton.click();
+ jspTextEditor.save();
+ String currentLine = jspTextEditor.getTextOnCurrentLine();
+ assertTrue("Selected line has text: '" + currentLine + "'.\n" +
+ "Expected text is: '" + currentLine.equals(ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION) + "'.",
+ currentLine.equals(ToolbarTextFormattingTest.TEXT_TEST_EXPRESSION));
+ // Check if Text Format Buttons buttons are toggled
+ assertToggleToolbarSelection(false, boldButton);
+ assertToggleToolbarSelection(false, italicButton);
+ assertToggleToolbarSelection(false, underlinedButton);
+ jspTextEditor.close();
+ }
+ @Override
+ protected void closeUnuseDialogs() {
+
+ }
+
+ @Override
+ protected boolean isUnuseDialogOpened() {
+ return false;
+ }
+ /**
+ * Asserts if tag is correctly inserted to lineText
+ * @param tag
+ * @param lineText
+ * @param expressionString - string expression which has to be inserted inside tag
+ * @param previousTags previous tags added to expressionString
+ */
+ private void assertTagIsInserted (String tag , String lineText, String expressionString, String... previousTags){
+ StringBuffer sb = new StringBuffer("");
+ StringBuilder sbSuffix = new StringBuilder("");
+ if (previousTags != null){
+ for (String previousTag : previousTags){
+ sb.append("<");
+ sb.append(previousTag);
+ sb.append(">");
+ sbSuffix.insert(0,">");
+ sbSuffix.insert(0,previousTag);
+ sbSuffix.insert(0,"</");
+ }
+ }
+ sb.append("<");
+ sb.append(tag);
+ sb.append(">");
+ sb.append(expressionString);
+ sb.append("</");
+ sb.append(tag);
+ sb.append(">");
+ sb.append(sbSuffix);
+ final String expectedLineText = sb.toString();
+ assertTrue ("Selected line has text: '" + lineText + "'.\n" +
+ "Expected text is: '" + expectedLineText + "'.",
+ lineText.equals(expectedLineText ));
+ }
+ /**
+ * Asserts if Toolbar Button is enabled
+ * @param toolbarButton
+ */
+ private void assertToolbarButtonIsEnabled (SWTBotToolbarButton toolbarButton){
+ assertTrue (toolbarButton.getToolTipText() + " Toolbar Button has to be enabled but it is not.",
+ toolbarButton.isEnabled());
+ }
+ /**
+ * Asserts Toolbar Button selection
+ * @param expectedSelection
+ * @param toolbarButton
+ */
+ private void assertToggleToolbarSelection (final boolean expectedSelection,final SWTBotToolbarToggleButton toolbarButton){
+ final ToolItem toolItem = toolbarButton.widget;
+ boolean isSelected = UIThreadRunnable.syncExec(new Result<Boolean>() {
+ public Boolean run() {
+ return toolItem.getSelection();
+ }
+ });
+ assertTrue (toolbarButton.getToolTipText() +
+ " Toolbar Button has " + (expectedSelection ? "" : "not ") +
+ "to be toggled but it is" + (isSelected ? "" : " not") + ".",
+ isSelected == expectedSelection);
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ToolbarTextFormattingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-08-18 12:24:49 UTC (rev 24259)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-08-18 13:42:33 UTC (rev 24260)
@@ -569,5 +569,18 @@
return result;
}
-
+ /**
+ * Returns browser selection
+ * @return
+ */
+ public nsISelection getSelection (){
+ nsISelection result = null;
+ display.syncExec(new Runnable() {
+ public void run() {
+ mozillaEditor.setFocus();
+ }
+ });
+ result = getSelectionController().getSelection(nsISelectionController.SELECTION_NORMAL);
+ return result;
+ }
}
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24259 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-18 08:24:49 -0400 (Wed, 18 Aug 2010)
New Revision: 24259
Modified:
trunk/usage/plugins/org.jboss.tools.usage/.classpath
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/HttpGetMethod.java
Log:
[JBIDE-6376] corrected to compliance to JDK1.5 (CookieHandler removed)
Modified: trunk/usage/plugins/org.jboss.tools.usage/.classpath
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/.classpath 2010-08-18 11:47:55 UTC (rev 24258)
+++ trunk/usage/plugins/org.jboss.tools.usage/.classpath 2010-08-18 12:24:49 UTC (rev 24259)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 11:47:55 UTC (rev 24258)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 12:24:49 UTC (rev 24259)
@@ -7,7 +7,7 @@
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>
<booleanAttribute key="default" value="true"/>
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/HttpGetMethod.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/HttpGetMethod.java 2010-08-18 11:47:55 UTC (rev 24258)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/HttpGetMethod.java 2010-08-18 12:24:49 UTC (rev 24259)
@@ -11,9 +11,6 @@
package org.jboss.tools.usage.internal;
import java.io.IOException;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.MessageFormat;
@@ -37,20 +34,21 @@
private ILoggingAdapter loggingAdapter = null;
- private CookieManager cookieHandler;
+// private CookieHandler cookieHandler;
private String userAgent;
public HttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
this.userAgent = userAgent;
this.loggingAdapter = loggingAdapter;
- this.cookieHandler = new CookieManager();
- cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+// this.cookieHandler = new CookieHandler();
+// this.cookieHandler = CookieHandler.getDefault();
+// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
}
public void request(String urlString) {
- CookieHandler currentCookieHandler = setCookieHandler(cookieHandler);
+// CookieHandler currentCookieHandler = setCookieHandler(cookieHandler);
try {
HttpURLConnection urlConnection = createURLConnection(urlString, userAgent);
urlConnection.connect();
@@ -63,7 +61,7 @@
} catch (Exception e) {
loggingAdapter.logError(e.getMessage());
} finally {
- setCookieHandler(currentCookieHandler);
+// setCookieHandler(currentCookieHandler);
}
}
@@ -79,11 +77,11 @@
return urlConnection.getResponseCode();
}
- private CookieHandler setCookieHandler(CookieHandler cookieHandler) {
- CookieHandler currentCookieHandler = CookieHandler.getDefault();
- CookieHandler.setDefault(cookieHandler);
- return currentCookieHandler;
- }
+// private CookieHandler setCookieHandler(CookieHandler cookieHandler) {
+// CookieHandler currentCookieHandler = CookieHandler.getDefault();
+// CookieHandler.setDefault(cookieHandler);
+// return currentCookieHandler;
+// }
/**
* Creates a new url connection.
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24258 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: selbar and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-08-18 07:47:55 -0400 (Wed, 18 Aug 2010)
New Revision: 24258
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
Log:
https://jira.jboss.org/browse/JBIDE-6832 , Selection bar visibility has been fixed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-08-18 11:03:33 UTC (rev 24257)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-08-18 11:47:55 UTC (rev 24258)
@@ -2521,8 +2521,8 @@
}
/*
- * https://jira.jboss.org/jira/browse/JBIDE-4968 Updating VPE toolbar on
- * selection bar changes.
+ * https://jira.jboss.org/jira/browse/JBIDE-4968
+ * Updating VPE toolbar icon on selection bar changes.
*/
public void updateVpeToolbar() {
visualEditor.updateShowSelectionBarItem(selectionBar.isVisible());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-08-18 11:03:33 UTC (rev 24257)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-08-18 11:47:55 UTC (rev 24258)
@@ -312,6 +312,10 @@
public void setVisualMode(int type) {
switch (type) {
case VISUALSOURCE_MODE:
+ /*
+ * https://jira.jboss.org/browse/JBIDE-6832
+ * Restore the state after switching from Preview, for example.
+ */
selectionBar.setVisible(selectionBar.getAlwaysVisibleOption());
setVerticalToolbarVisible(true);
/*
@@ -649,9 +653,9 @@
public void nodeChanged(XModelTreeEvent event) {
/*
- * Commented to fix https://jira.jboss.org/jira/browse/JBIDE-4941 Do
- * not update VPE splitting, weights, tabs for current page, do it
- * for newly opened ones only.
+ * Fixes https://jira.jboss.org/jira/browse/JBIDE-4941
+ * Do not update VPE splitting, weights, tabs for current page,
+ * do it for newly opened ones only.
*/
// fillContainer(false, null);
selectionBar.setVisible(selectionBar.getAlwaysVisibleOption());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2010-08-18 11:03:33 UTC (rev 24257)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2010-08-18 11:47:55 UTC (rev 24258)
@@ -132,7 +132,6 @@
.getShell(),
VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TITLE,
VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_MESSAGE,
-// VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE,
VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR,
askConfirmationOnClosingSelectionBar(), null, null);
if (dialog.getReturnCode() != IDialogConstants.OK_ID) {
@@ -140,8 +139,18 @@
}
setAskConfirmationOnClosingSelectionBar(dialog.getToggleState());
}
-
+ /*
+ * Hide the selection bar
+ */
setVisible(false);
+ /*
+ * https://jira.jboss.org/browse/JBIDE-6832
+ * Store the state to the preferences.
+ * Later this property will be used to restore
+ * selection bar visibility after tabs' switching.
+ */
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, false);
}
};
@@ -201,7 +210,7 @@
this.visible = visible;
/*
* https://jira.jboss.org/jira/browse/JBIDE-4968
- * Updating VPE toolbar on selection bar changes.
+ * Updating VPE toolbar icon on selection bar changes.
*/
if (vpeController != null) {
vpeController.updateVpeToolbar();
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r24257 - in trunk/usage: plugins/org.jboss.tools.usage/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-18 07:03:33 -0400 (Wed, 18 Aug 2010)
New Revision: 24257
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/AbstractGoogleAnalyticsParameters.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs
trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
Log:
[JBIDE-6376] corrected to compliance to JDK1.5
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 11:03:33 UTC (rev 24257)
@@ -7,10 +7,10 @@
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>
-<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseApplication"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -19,13 +19,13 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="pde.generated.config" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.resources@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.mortbay.jetty.server@default:default,org.eclipse.help.base@default:default,org.apache.ant@default:default,com.springsource.javax.el@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf@default:default,com.springsource.javax.servlet.jsp@default:de!
fault,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.core.runtime@default:true,com.springsource.javax.servlet@default:default,org.eclipse.ui.intro.universal@default:default,javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.text@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.dat!
abinding.property@default:default,org.eclipse.equinox.p2.metad!
ata.repo
sitory@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jface@default:default,org.apache.lucene@default:default,org.eclipse.swt@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface.text@default:default,org.apache.jasper@default:default,org.apache.commons.el@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.macosx@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.engine@default:default,com.springsource.org.apache.c!
ommons.logging@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,com.jboss.jbds.product@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.transforms.hook@default:false,org.apache.lucene.analysis@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.compare.core@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.repository@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.preferences@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.mortbay.jetty.util@default:default,org.eclipse.help.ui@default:default,org.apache.ant@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,org.apache.jasper@default:default,!
org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jface@default:default,org.junit4@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding.property@default:default,javax.servlet@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.help.base@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.el@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:fals!
e,org.eclipse.equinox.app@default:default,org.eclipse.equinox.!
p2.engin
e@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.mortbay.jetty.server@default:default,com.jboss.jbds.product@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.cocoa@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.transforms.hook@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.swt@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.hamcrest.core@default:default,org.eclipse.ui.intro@default!
:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf@default:default,org.apache.commons.el@default:default,org.eclipse.compare.core@default:default,javax.transaction@default:false,org.eclipse.core.expressions@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.net@default:default,org.apache.lucene@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf.ssl@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
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-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-18 11:03:33 UTC (rev 24257)
@@ -3,7 +3,7 @@
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.usage;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.usage,
org.jboss.tools.usage.googleanalytics,
org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test",
@@ -12,6 +12,6 @@
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-ActivationPolicy: lazy
Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator
Bundle-Vendor: %BundleVendor
+Bundle-ActivationPolicy: lazy
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/AbstractGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/AbstractGoogleAnalyticsParameters.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/AbstractGoogleAnalyticsParameters.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -27,17 +27,14 @@
this.referral = referral;
}
- @Override
public String getAccountName() {
return accountName;
}
- @Override
public String getHostname() {
return hostName;
}
- @Override
public String getReferral() {
return referral;
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -51,7 +51,6 @@
initScreenSettings();
}
- @Override
public String getBrowserLanguage() {
String nl = getNL();
if (nl == null) {
@@ -77,7 +76,7 @@
protected void initScreenSettings() {
final Display display = getDisplay();
display.syncExec(new Runnable() {
- @Override
+
public void run() {
screenColorDepth = display.getDepth() + SCREENCOLORDEPTH_POSTFIX;
@@ -87,12 +86,10 @@
});
}
- @Override
public String getScreenResolution() {
return screenResolution;
}
- @Override
public String getScreenColorDepth() {
return screenColorDepth;
}
@@ -109,7 +106,6 @@
return display;
}
- @Override
public String getUserAgent() {
String productId = getApplicationName();
@@ -182,7 +178,6 @@
}
}
- @Override
public String getUserId() {
Preferences preferences = PreferencesUtil.getConfigurationPreferences();
String userId = createIdentifier();
@@ -212,7 +207,6 @@
return builder.toString();
}
- @Override
public String getKeyword() {
JBossBundleGroups jbossBundleGroups = new JBossBundleGroups();
IBundleEntryFilter jbossToolsFilter = new BundleUtils.BundleSymbolicNameFilter(JBOSS_TOOLS_BUNDLES_PREFIX);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -206,7 +206,6 @@
* Collects the bundle groups the bundles it gets belong
* to. Always returns <tt>true</tt> (does match) while collecting
*/
- @Override
public boolean matches(Bundle bundle) {
String bundleName = bundle.getSymbolicName();
for (BundleGroup bundleGroup : BundleGroup.values()) {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -41,7 +41,7 @@
public void report() {
Display.getDefault().asyncExec(new Runnable() {
- @Override
+
public void run() {
UsageReportEnablementDialog dialog = new UsageReportEnablementDialog("Report usage",
"Please allow Red Hat Inc. to report this installation anynomously for statistical matters.",
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -16,7 +16,6 @@
*/
public class UsageReportDispatcher implements IStartup {
- @Override
public void earlyStartup() {
new UsageReport().report();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -62,7 +62,6 @@
this.pattern = Pattern.compile(symbolicNameRegex);
}
- @Override
public boolean matches(Bundle bundle) {
Assert.isTrue(bundle != null);
@@ -93,7 +92,6 @@
* Applies the filters this composite filter has. All filters have to
* match so that the filter says the given bundle matches.
*/
- @Override
public boolean matches(Bundle bundle) {
for (IBundleEntryFilter filter : filters) {
if (!filter.matches(bundle)) {
Modified: trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs 2010-08-18 11:03:33 UTC (rev 24257)
@@ -1,11 +1,5 @@
-#Fri Aug 06 17:57:19 CEST 2010
+#Wed Aug 18 12:56:58 CEST 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Modified: trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-08-18 11:03:33 UTC (rev 24257)
@@ -3,7 +3,7 @@
Bundle-Name: Tests for JBoss Tools Usage Reporting
Bundle-SymbolicName: org.jboss.tools.usage.test
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0",
org.eclipse.osgi;bundle-version="3.5.2",
org.eclipse.core.runtime;bundle-version="3.5.0",
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-18 09:52:08 UTC (rev 24256)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-18 11:03:33 UTC (rev 24257)
@@ -129,141 +129,115 @@
}
@SuppressWarnings("unchecked")
- @Override
public Enumeration findEntries(String path, String filePattern, boolean recurse) {
throw new UnsupportedOperationException();
}
- @Override
public BundleContext getBundleContext() {
throw new UnsupportedOperationException();
}
- @Override
public long getBundleId() {
throw new UnsupportedOperationException();
}
- @Override
public URL getEntry(String path) {
throw new UnsupportedOperationException();
}
@SuppressWarnings("unchecked")
- @Override
public Enumeration getEntryPaths(String path) {
throw new UnsupportedOperationException();
}
@SuppressWarnings("unchecked")
- @Override
public Dictionary getHeaders() {
throw new UnsupportedOperationException();
}
@SuppressWarnings("unchecked")
- @Override
public Dictionary getHeaders(String locale) {
throw new UnsupportedOperationException();
}
- @Override
public long getLastModified() {
throw new UnsupportedOperationException();
}
- @Override
public String getLocation() {
throw new UnsupportedOperationException();
}
- @Override
public ServiceReference[] getRegisteredServices() {
throw new UnsupportedOperationException();
}
- @Override
public URL getResource(String name) {
throw new UnsupportedOperationException();
}
@SuppressWarnings("unchecked")
- @Override
public Enumeration getResources(String name) throws IOException {
throw new UnsupportedOperationException();
}
- @Override
public ServiceReference[] getServicesInUse() {
throw new UnsupportedOperationException();
}
@SuppressWarnings("unchecked")
- @Override
public Map getSignerCertificates(int signersType) {
throw new UnsupportedOperationException();
}
- @Override
public int getState() {
throw new UnsupportedOperationException();
}
- @Override
public String getSymbolicName() {
return this.symbolicName;
}
- @Override
public Version getVersion() {
throw new UnsupportedOperationException();
}
- @Override
public boolean hasPermission(Object permission) {
throw new UnsupportedOperationException();
}
@SuppressWarnings("unchecked")
- @Override
public Class loadClass(String name) throws ClassNotFoundException {
throw new UnsupportedOperationException();
}
- @Override
public void start() throws BundleException {
throw new UnsupportedOperationException();
}
- @Override
public void start(int options) throws BundleException {
throw new UnsupportedOperationException();
}
- @Override
public void stop() throws BundleException {
throw new UnsupportedOperationException();
}
- @Override
public void stop(int options) throws BundleException {
throw new UnsupportedOperationException();
}
- @Override
public void uninstall() throws BundleException {
throw new UnsupportedOperationException();
}
- @Override
public void update() throws BundleException {
throw new UnsupportedOperationException();
}
- @Override
public void update(InputStream input) throws BundleException {
throw new UnsupportedOperationException();
}
15 years, 4 months
- 1
- 0