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(); }