[jbosstools-commits] JBoss Tools SVN: r24203 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/googleanalytics and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Aug 17 03:41:45 EDT 2010
Author: adietish
Date: 2010-08-17 03:41:44 -0400 (Tue, 17 Aug 2010)
New Revision: 24203
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/build.properties
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/util/BundleUtils.java
Log:
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-17 07:33:18 UTC (rev 24202)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-17 07:41:44 UTC (rev 24203)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="true"/>
@@ -17,14 +17,15 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/>
+<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.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.osgi at -1:true,org.eclipse.core.runtime.compatibility.auth at default:default,org.eclipse.ui.workbench at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.core.databinding at default:default,org.junit4 at default:default,org.hamcrest.core at default:default,org.eclipse.core.runtime.compatibility.registry at default:false,org.eclipse.jface.databinding at default:default,org.eclipse.equinox.app at default:default,org.eclipse.equinox.preferences at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.equinox.registry at default:default,org.eclipse.jface at default:default,org.eclipse.equinox.common at 2:true,com.ibm.icu at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.help at default:default,org.eclipse.core.expressions at default:default,org.eclipse.swt at default:default,org.junit*4.8.1.v4_8_1_v20100427-1100 at default:default,org.eclipse.core.contenttype at default:default,org.eclipse!
.swt.cocoa.macosx.x86_64 at default:false,org.eclipse.core.commands at default:default,javax.servlet at default:default,org.eclipse.osgi.services at default:default,org.eclipse.core.runtime at default:true,org.eclipse.core.jobs at default:default,org.eclipse.ui at default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage at default:default,org.jboss.tools.usage.test at default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.security at default:default,org.jboss.tools.xulrunner.initializer at default:false,org.eclipse.jface at default:default,org.eclipse.swt.cocoa.macosx at default:false,org.eclipse.osgi,org.eclipse.ui.workbench at default:default,org.eclipse.core.databinding at default:default,org.eclipse.equinox.common at default:default,org.eclipse.core.databinding.observable at default:default,org.eclipse.equinox.p2.core at default:default,org.eclipse.core.runtime at default:true,org.eclipse.ui at default:default,org.eclipse.jface.text at default:default,org.eclipse.equinox.registry at default:default,org.eclipse.core.runtime.compatibility.auth at default:default,javax.transaction at default:false,org.eclipse.core.contenttype at default:default,javax.servlet at default:default,org.eclipse.equinox.p2.artifact.repository at default:default,com.ibm.icu at default:default,org.eclipse.core.filesystem at default:default,org.eclipse.core.resources at default:default,org.eclipse.equinox.!
p2.metadata.repository at default:default,org.eclipse.ecf.ssl at default:false,org.eclipse.core.commands at default:default,org.eclipse.ant.core at default:default,org.junit4 at default:default,org.eclipse.core.net at default:default,org.eclipse.ecf.provider.filetransfer.ssl at default:false,org.eclipse.core.resources.compatibility at default:false,org.eclipse.equinox.concurrent at default:default,org.eclipse.ecf at default:default,org.eclipse.text at default:default,org.hamcrest.core at default:default,org.eclipse.core.variables at default:default,org.eclipse.ecf.identity at default:default,org.eclipse.swt at default:default,org.eclipse.osgi.services at default:default,org.eclipse.equinox.app at default:default,org.eclipse.ui.ide at default:default,org.eclipse.equinox.p2.metadata at default:default,org.eclipse.help at default:default,org.eclipse.core.expressions at default:default,org.eclipse.core.databinding.property at default:default,org.eclipse.ecf.provider.filetransfer at default:default,org.eclipse.ui.cocoa at default:false,org.eclipse.j!
face.databinding at default:default,org.eclipse.equinox.transform!
s.hook at d
efault:false,org.eclipse.core.filesystem.macosx at default:false,org.eclipse.ecf.filetransfer at default:default,org.eclipse.equinox.security.macosx at default:false,org.eclipse.equinox.p2.repository at default:default,org.eclipse.core.jobs at default:default,org.eclipse.ui.forms at default:default,org.eclipse.equinox.preferences at default:default,org.eclipse.ui.views at default:default,org.eclipse.equinox.p2.jarprocessor at default:default,org.eclipse.equinox.p2.engine at default:default,org.eclipse.core.runtime.compatibility.registry at default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test at default:default,org.jboss.tools.usage at 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/build.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-08-17 07:33:18 UTC (rev 24202)
+++ trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-08-17 07:41:44 UTC (rev 24203)
@@ -2,4 +2,15 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ about.html,\
+ bin/
+src.includes = .classpath,\
+ .project,\
+ .settings/,\
+ JBoss Usage Reporter.launch,\
+ META-INF/,\
+ about.html,\
+ build.properties,\
+ plugin.xml,\
+ src/
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-17 07:33:18 UTC (rev 24202)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 07:41:44 UTC (rev 24203)
@@ -18,10 +18,10 @@
import org.jboss.tools.usage.internal.HttpGetMethod;
/**
- * Reports (tracks) data to google analytics
+ * Reports (tracks) usage
*
* @author Andre Dietisheim
- * @see <a
+ * @see based on <a
* href="http://jgoogleAnalytics.googlecode.com">http://jgoogleAnalytics.googlecode.com</a>
*/
public class Tracker implements ITracker {
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-17 07:33:18 UTC (rev 24202)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-17 07:41:44 UTC (rev 24203)
@@ -20,17 +20,41 @@
public class BundleUtils {
- public static List<Bundle> getBundles(String symbolicNameRegex, BundleContext bundleContext) {
+ /**
+ * Returns the bundles among the available ones that match the given filter.
+ *
+ * @param filter
+ * the filter to match the available bundles against
+ * @param bundleContext
+ * the bundle context
+ * @return the bundles that match the given filter
+ */
+ public static List<Bundle> getBundles(IBundleEntryFilter filter, BundleContext bundleContext) {
List<Bundle> bundleList = new ArrayList<Bundle>();
- BundleSymbolicNameFilter symbolicNameFilter = new BundleSymbolicNameFilter(symbolicNameRegex);
for (Bundle bundle : bundleContext.getBundles()) {
- if (symbolicNameFilter.matches(bundle)) {
+ if (filter.matches(bundle)) {
bundleList.add(bundle);
}
}
return bundleList;
}
+ /**
+ * Returns the bundles that have a symbolic name that match the given regex.
+ *
+ * @param bundleSymbolicNameRegex
+ * the symbolic name regex to match.
+ * @param bundleContext
+ * the bundle context
+ * @return the bundles
+ */
+ public static List<Bundle> getBundles(String bundleSymbolicNameRegex, BundleContext bundleContext) {
+ return getBundles(new BundleSymbolicNameFilter(bundleSymbolicNameRegex), bundleContext);
+ }
+
+ /**
+ * A filter that matches bundles against a given symbolic name regex.
+ */
public static class BundleSymbolicNameFilter implements IBundleEntryFilter {
private Pattern pattern;
@@ -48,7 +72,51 @@
}
+ /**
+ * A filter that applies several given filters
+ */
+ public static class CompositeFilter implements IBundleEntryFilter {
+
+ private IBundleEntryFilter filters[];
+
+ /**
+ * Instantiates a new composite filter that applies several given
+ * filters.
+ *
+ * @param filters
+ * the filters
+ */
+ public CompositeFilter(IBundleEntryFilter[] filters) {
+ this.filters = filters;
+ }
+
+ /**
+ * 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)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
+ /**
+ * The Interface IBundleEntryFilter.
+ */
public static interface IBundleEntryFilter {
+
+ /**
+ * Matches.
+ *
+ * @param bundle
+ * the bundle
+ * @return true, if successful
+ */
public boolean matches(Bundle bundle);
}
}
More information about the jbosstools-commits
mailing list