JBoss Tools SVN: r27982 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-01-07 10:59:12 -0500 (Fri, 07 Jan 2011)
New Revision: 27982
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
Log:
https://issues.jboss.org/browse/JBIDE-8042
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2011-01-07 15:28:47 UTC (rev 27981)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2011-01-07 15:59:12 UTC (rev 27982)
@@ -176,20 +176,13 @@
private static List<String> getVariablesNamesInUse(EObject parent) {
List<String> variablesNames = new ArrayList<String>();
- Variables variables;
- for (;parent != null; parent = parent.eContainer()) {
- if (parent instanceof Process) {
- variables = ((Process)parent).getVariables();
- } else if (parent instanceof Scope) {
- variables = ((Scope)parent).getVariables();
- } else {
- continue;
- }
- EList<Variable> variableList = variables.getChildren();
- for (Variable var : variableList) {
- variablesNames.add(var.getName());
- }
- }
+ // https://issues.jboss.org/browse/JBIDE-8042
+ // grab all visible variables, not just Process and Scope variables
+ // NOTE: this includes implicit variables defined in ForEach
+ Variable[] variables = BPELUtil.getVisibleVariables((EObject)parent);
+ for (Variable var : variables) {
+ variablesNames.add(var.getName());
+ }
return variablesNames;
}
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27981 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: gen and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-01-07 10:28:47 -0500 (Fri, 07 Jan 2011)
New Revision: 27981
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
Log:
swtbot ext: added runJavaApp (able to pass arguments to main method), minors
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2011-01-07 14:55:03 UTC (rev 27980)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2011-01-07 15:28:47 UTC (rev 27981)
@@ -11,7 +11,11 @@
package org.jboss.tools.ui.bot.ext;
+import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
+import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic;
+import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
@@ -23,6 +27,7 @@
import org.apache.log4j.Logger;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory;
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
@@ -32,9 +37,11 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.WidgetResult;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCTabItem;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Matcher;
@@ -50,6 +57,7 @@
import org.jboss.tools.ui.bot.ext.types.IDELabel.PreferencesDialog;
import org.jboss.tools.ui.bot.ext.types.PerspectiveType;
import org.jboss.tools.ui.bot.ext.types.ViewType;
+import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
/**
* Provides Eclipse common operation based on SWTBot element operations
@@ -1042,6 +1050,33 @@
}
/**
+ * runs java application (run configuration)
+ * NOTE that Run->Run Configurations.. must be available to work (use appropriate perspective)
+ * @param project which should run
+ * @param className with main class to run
+ * @param arguments that will be passed to main class (can be null)
+ */
+ @SuppressWarnings("unchecked")
+ public void runJavaApplication(String project, String className, String arguments) {
+ bot.menu(IDELabel.Menu.RUN).menu("Run Configurations...").click();
+ SWTBotShell shell = bot.shell("Run Configurations");
+ shell.activate();
+ open.selectTreeNode(shell.bot(),ActionItem.create("Java Application"));
+ shell.bot().toolbarButton(0).click();
+ SWTBotCTabItem tab = shell.bot().cTabItem("Main").activate();
+ List<Text> list = (List<Text>) shell.bot().widgets(allOf(widgetOfType(Text.class)), tab.widget);
+ assertTrue(list.size()>=2);
+ new SWTBotText(list.get(0)).setText(project);
+ new SWTBotText(list.get(1)).setText(className);
+ if (arguments!=null) {
+ tab = shell.bot().cTabItem("Arguments").activate();
+ list = (List<Text>) shell.bot().widgets(allOf(widgetOfType(Text.class)), tab.widget);
+ assertTrue(list.size()>=2);
+ new SWTBotText(list.get(0)).setText(arguments);
+ }
+ bot.button(IDELabel.Button.RUN).click();
+ }
+ /**
* Search for Menu Item with Run on Server substring within label
*
* @param subMenu
@@ -1168,7 +1203,25 @@
return treeItems;
}
-
+ public static String getFormattedTreeNode(SWTBotTreeItem item) {
+ if (item==null) {
+ return "<item is null>";
+ }
+ if (item.row()==null) {
+ return item.getText();
+ }
+ StringBuilder sb = new StringBuilder("");
+ for (int i=0;i<item.row().columnCount();i++) {
+ String text = item.row().get(i);
+ if (text==null) {
+ sb.append("\"<null>\"");
+ }
+ else {
+ sb.append(String.format("\"{0}\"", text));
+ }
+ }
+ return sb.toString();
+ }
public static String getFormattedTreeNodeText (SWTBotTree tree, SWTBotTreeItem item){
StringBuilder stringBuilder = new StringBuilder("");
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2011-01-07 14:55:03 UTC (rev 27980)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2011-01-07 15:28:47 UTC (rev 27981)
@@ -76,13 +76,20 @@
+ "'");
}
}
-
/**
* selects given actionItem in bot's tree();
*
* @param item
*/
public void selectTreeNode(IActionItem item) {
+ selectTreeNode(this.bot,item);
+ }
+ /**
+ * selects given actionItem in bot's tree();
+ *
+ * @param item
+ */
+ public void selectTreeNode(SWTBot bot, IActionItem item) {
SWTBotTreeItem ti = null;
try {
Iterator<String> iter = item.getGroupPath().iterator();
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-01-07 14:55:03 UTC (rev 27980)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-01-07 15:28:47 UTC (rev 27981)
@@ -20,6 +20,34 @@
sb.append(item.getName());
return sb.toString();
}
+ /**
+ * creates new action item instance from given path
+ * @param path
+ * @return
+ */
+ public static IActionItem create(final String...path) {
+ if (path.length<1) {
+ throw new IllegalArgumentException("path must contain at least 1 item");
+ }
+ return new IActionItem() {
+
+ @Override
+ public String getName() {
+ // TODO Auto-generated method stub
+ return path[path.length-1];
+ }
+
+ @Override
+ public List<String> getGroupPath() {
+ List<String> l = new Vector<String>();
+ for (int i=0; i<path.length-1;i++) {
+ l.add(path[i]);
+ }
+ return l;
+ }
+
+ };
+ }
public static class View {
public static class JavaBrowsingTypes {
/**
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27980 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 09:55:03 -0500 (Fri, 07 Jan 2011)
New Revision: 27980
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java
Log:
[JBIDE-7916] added ability to refresh several clouds
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-07 14:38:02 UTC (rev 27979)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-07 14:55:03 UTC (rev 27980)
@@ -1,3 +1,9 @@
+2011-01-07 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * plugin.xml:
+ * src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java (execute):
+ [JBIDE-7916] added ability to refresh several clouds
+
2011-01-06 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java (.doRun):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-07 14:38:02 UTC (rev 27979)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-07 14:55:03 UTC (rev 27980)
@@ -149,7 +149,7 @@
<with
variable="selection">
<and>
- <count value="1" />
+ <count value="+" />
<iterate operator="and">
<adapt
type="org.jboss.tools.deltacloud.core.DeltaCloud" />
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java 2011-01-07 14:38:02 UTC (rev 27979)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java 2011-01-07 14:55:03 UTC (rev 27980)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.ui.commands;
+import java.util.Collection;
+import java.util.Collections;
+
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -17,6 +20,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
@@ -32,26 +37,35 @@
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
- DeltaCloud cloud = getDeltaCloud(event);
- if (cloud != null) {
+ // first try selected item
+ Collection<DeltaCloud> clouds = getSelectedClouds(HandlerUtil.getCurrentSelection(event));
+ if (!clouds.isEmpty()) {
+ refresh(clouds);
+ } else {
+ // no item selected: try active part
+ refresh(UIUtils.adapt(HandlerUtil.getActivePart(event), DeltaCloud.class));
+ }
+ return Status.OK_STATUS;
+ }
+
+ private Collection<DeltaCloud> getSelectedClouds(ISelection selection) {
+ if (!(selection instanceof IStructuredSelection)) {
+ return Collections.emptyList();
+ }
+
+ return UIUtils.adapt(((IStructuredSelection) selection).toList(), DeltaCloud.class);
+ }
+
+ private void refresh(Collection<DeltaCloud> clouds) {
+ for (DeltaCloud cloud : clouds) {
refresh(cloud);
}
-
- return Status.OK_STATUS;
}
- private DeltaCloud getDeltaCloud(ExecutionEvent event) {
- DeltaCloud cloud = null;
- // first try selected item
- cloud = UIUtils.getFirstAdaptedElement(HandlerUtil.getCurrentSelection(event), DeltaCloud.class);
+ private void refresh(final DeltaCloud cloud) {
if (cloud == null) {
- // no item selected: try active part
- cloud = UIUtils.adapt(HandlerUtil.getActivePart(event), DeltaCloud.class);
+ return;
}
- return cloud;
- }
-
- protected void refresh(final DeltaCloud cloud) {
// TODO: internationalize strings
new AbstractCloudJob("Refreshing images and instances on " + cloud.getName(), cloud) {
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27979 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 09:38:02 -0500 (Fri, 07 Jan 2011)
New Revision: 27979
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
Log:
[JBIDE-7536] renamed "Disconnect cloud" to "Delete cloud"
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-07 14:24:52 UTC (rev 27978)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-07 14:38:02 UTC (rev 27979)
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.osgi.util@default:default,org.junit4@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.pde.core@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.help.base@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.compare.core@default!
:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.apache.xml.serializer@default:default,org.eclipse.jst.servlet.ui@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.wst.common.emf@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jem@default:default,org.eclipse.jst.common.projec!
t.facet.core@default:default,org.eclipse.debug.ui@default:defa!
ult,org.
eclipse.ecf.filetransfer@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jst.jee@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.wst.common.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.pde.build@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jface@default:default,org.eclipse.rse.files.ui@default:default,org.e!
clipse.ui.intro@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.sat4j.core@default:default,org.eclipse.search@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.core.filesystem@default:default,javax.servlet.jsp@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jdt.junit@d!
efault:default,org.eclipse.jem.util@default:default,org.eclips!
e.jdt.de
bug@default:default,org.apache.lucene@default:default,org.eclipse.ui.browser@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.server.core@default:default,org.apache.xerces@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.core.databinding.property@default!
:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.rse.core@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.sat4j.pb@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.rse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.ide.application@default:def!
ault,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.ss!
e.core@d
efault:default,org.apache.commons.el@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.jsdt.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.console@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.wst.co!
mmon.emfworkbench.integration@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.services.ssh@default:default,javax.xml@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jst.j2ee@default:default,com.jcraft.jsch@default:default,org.apache.lucene.analysis@default:defa!
ult,org.eclipse.jdt.core.manipulation@default:default,org.apac!
he.ant@d
efault:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.ui@default:default,javax.servlet@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.compare@default:default,org.apache.commons.net@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.help@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.team.ui@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.web@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.co!
re.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.forms@default:default,org.apache.jasper@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.wst.jsdt.manipulation@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.integration@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.compare@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.web@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.sse.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.apache.lucene@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.jdt.junit.core@default!
:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui.views@default:default,org.eclipse.jst.jee.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.compare.core@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.sat4j.core@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.w!
st.common.core@default:default,org.apache.commons.logging*1.0.!
4.v20100
5080501@default:default,org.eclipse.pde.build@default:default,org.eclipse.emf.edit@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.common@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.sdk@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equino!
x.p2.core@default:default,org.apache.ant@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.services.ssh@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.wst.common.frameworks@default:default,com.ibm.icu@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:def!
ault,org.eclipse.wst.server.ui@default:default,org.eclipse.jst!
.server.
ui@default:default,org.junit4@default:default,org.eclipse.core.runtime@default:true,javax.xml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.rse.core@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.jem@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.jface@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.text@default:default,javax.servlet@default:default,org.eclip!
se.ui.views.properties.tabbed@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.navigator@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.jst.j2ee.web@defa!
ult:default,org.eclipse.search@default:default,org.eclipse.ui@!
default:
default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.apache.commons.net@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.jst.j2ee.navigator.ui@default:default,org.sat4j.pb@default:default,org.eclipse.ecf.identity@default:default,org.apache.commons.el@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.swt@default:default,org.eclipse.jst.jee@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.equinox.p2.garbagecollector!
@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jdt@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.validation@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.apache.xerces@default:default,org.hamcrest.core@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.p2.operations@default:def!
ault,org.eclipse.pde.core@default:default,org.eclipse.jst.comm!
on.frame
works@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jst.server.core@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ant.core@default:default,org.eclipse.swt.!
gtk.linux.x86_64@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.app@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.rse.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.tools.deltacloud.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2011-01-07 14:24:52 UTC (rev 27978)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2011-01-07 14:38:02 UTC (rev 27979)
@@ -1,166 +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.deltacloud.ui.commands;
-
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudException;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
-import org.jboss.tools.deltacloud.ui.ErrorUtils;
-import org.jboss.tools.deltacloud.ui.views.CVMessages;
-import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
-
-/**
- * @author Andre Dietisheim
- */
-public class DisconnectCloudHandler extends AbstractHandler implements IHandler {
-
- public static class DisconnectCloudsDialog extends ListSelectionDialog {
-
- private static final String CONFIRM_CLOUD_DELETE_TITLE = "ConfirmCloudDelete.title"; //$NON-NLS-1$
- private static final String CONFIRM_CLOUD_DELETE_MSG = "ConfirmCloudDelete.msg"; //$NON-NLS-1$
-
- private static class DeltaCloudItemProvider implements IStructuredContentProvider {
-
- @SuppressWarnings("unchecked")
- @Override
- public Object[] getElements(Object cloudViewElements) {
- Assert.isTrue(cloudViewElements instanceof Collection);
- Collection<DeltaCloud> deltaClouds = (Collection<DeltaCloud>) cloudViewElements;
- return deltaClouds.toArray(new DeltaCloud[deltaClouds.size()]);
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- private static class CloudElementNameProvider extends LabelProvider {
- public String getText(Object element) {
- return ((DeltaCloud) element).getName();
- }
- };
-
- public DisconnectCloudsDialog(Shell parentShell, Collection<?> cloudViewElements) {
- super(parentShell
- , cloudViewElements
- , new DeltaCloudItemProvider()
- , new CloudElementNameProvider(), CVMessages.getString(CONFIRM_CLOUD_DELETE_MSG));
- setTitle(CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE));
- }
- }
-
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- ISelection selection = HandlerUtil.getCurrentSelection(event);
- if (selection instanceof IStructuredSelection) {
- List<?> selectedElements = ((IStructuredSelection) selection).toList();
- DeltaCloud deltaCloud = getFirstSelectedCloud(selectedElements);
- try {
- if (selectedElements != null
- && selectedElements.size() == 1
- && deltaCloud != null) {
- // TODO internationalize strings
- if (MessageDialog.openConfirm(
- HandlerUtil.getActiveShell(event),
- "Confirm disconnect",
- MessageFormat.format("Are you sure that you want to disconnect cloud \"{0}\"?",
- deltaCloud.getName()))) {
- removeDeltaCloud(deltaCloud);
- }
- } else {
- removeWithDialog(shell, selectedElements);
- }
- } catch (DeltaCloudException e) {
- // TODO internationalize strings
- String message = "";
- if (deltaCloud != null) {
- message = MessageFormat.format("Could not disconnect cloud {0}", deltaCloud.getName());
- } else {
- // TODO: internationalize strings
- message = "Could not disconnect cloud";
- }
- ErrorUtils.handleError("Error",
- message, e, shell);
- }
- }
-
- return Status.OK_STATUS;
- }
-
- private void removeWithDialog(Shell shell, List<?> selectedElements) throws DeltaCloudException {
- Collection<?> clouds = getSelectedClouds(selectedElements);
- DisconnectCloudsDialog dialog = new DisconnectCloudsDialog(
- shell
- , clouds);
- dialog.setInitialSelections(clouds.toArray());
- if (Dialog.OK == dialog.open()) {
- removeDeltaClouds(dialog.getResult());
- }
- }
-
- private DeltaCloud getFirstSelectedCloud(List<?> selectedElements) {
- DeltaCloud deltaCloud = null;
- if (selectedElements.size() > 0) {
- Object object = selectedElements.get(0);
- deltaCloud = UIUtils.adapt(object, DeltaCloud.class);
- }
- return deltaCloud;
- }
-
- private Collection<DeltaCloud> getSelectedClouds(List<?> selectedElements) {
- Set<DeltaCloud> selectedClouds = new HashSet<DeltaCloud>();
- for (Object element : selectedElements) {
- DeltaCloud deltaCloud = UIUtils.adapt(element, DeltaCloud.class);
- if (deltaCloud != null) {
- selectedClouds.add(deltaCloud);
- }
- }
- return selectedClouds;
- }
-
- private void removeDeltaClouds(Object[] deltaClouds) throws DeltaCloudException {
- for (Object deltaCloud : deltaClouds) {
- removeDeltaCloud((DeltaCloud) deltaCloud);
- }
- }
-
- private void removeDeltaCloud(DeltaCloud deltaCloud) throws DeltaCloudException {
- DeltaCloudManager.getDefault().removeCloud((DeltaCloud) deltaCloud);
- }
-}
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27978 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 09:24:52 -0500 (Fri, 07 Jan 2011)
New Revision: 27978
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch
Log:
[JBIDE-7801] now running reporting job only is usage reporting is not set OR is enabled (not if it is disabled)
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java 2011-01-07 13:05:13 UTC (rev 27977)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java 2011-01-07 14:24:52 UTC (rev 27978)
@@ -15,7 +15,7 @@
*/
public interface IUsageReportPreferenceConstants {
- /** The value that determines if usage shall be reported if there's no user set setting. */
+ /** The value that determines if usage shall be reported if there's no user setting. */
public static final boolean USAGEREPORT_ENABLED_DEFAULTVALUE = false;
/**
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2011-01-07 13:05:13 UTC (rev 27977)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2011-01-07 14:24:52 UTC (rev 27978)
@@ -40,6 +40,19 @@
}
/**
+ * Returns <code>true</code> if the usage reporting enablement is set in the
+ * preferences. Returns <code>false</code> otherwise.
+ *
+ * @return
+ */
+ public static boolean isEnablementSet() {
+ String defaultValue = new String("undefinedValue");
+ String value = UsageReportPreferencesUtils.getPreferences().get(
+ IUsageReportPreferenceConstants.USAGEREPORT_ENABLED_ID, defaultValue);
+ return value != defaultValue;
+ }
+
+ /**
* Returns <code>true</code> if usage reporting is enabled
*
* @return true, if is enabled
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2011-01-07 13:05:13 UTC (rev 27977)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReport.java 2011-01-07 14:24:52 UTC (rev 27978)
@@ -87,7 +87,10 @@
* Reports the usage of this eclipse/jboss tools instance.
*/
public void report() {
- new ReportingJob().schedule();
+ if (!UsageReportPreferences.isEnablementSet()
+ || UsageReportPreferences.isEnabled()) {
+ new ReportingJob().schedule();
+ }
}
protected boolean isReportingGloballyEnabled() {
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2011-01-07 13:05:13 UTC (rev 27977)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage Reporter.launch 2011-01-07 14:24:52 UTC (rev 27978)
@@ -10,8 +10,8 @@
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Developer Studio Usage Reporter"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/>
+<booleanAttribute key="default" value="true"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.jboss.tools.deltacloud.integration,org.eclipse.epp.usagedata.gathering,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage.test,org.jboss.tools.deltacloud.test,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.servlet.jsp@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ui.forms@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui@default:default,org.apache.jasper@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.mortbay.jetty.server@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.equi!
nox.p2.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.swt@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.app@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.security@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.intro@default:default,org.eclipse.core.commands@default:default,javax.servlet@default:default,org.eclipse.ui.intro.universal@default:default,javax.activation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.filesystem@default:default,org.apache.lucene@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.http.jetty@defa!
ult:default,org.eclipse.jface.text@default:default,org.eclipse!
.help.ui
@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,javax.mail@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.help.base@default:default,org.apache.ant@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.text@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.databinding.property@default:default,org.mortbay.jetty.util@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jruby.jruby@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.eclipse.epp.usagedata.recording@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.usage@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.deltacloud.test@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime@default:true,com.springsource.javax.el@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.filesystem@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.osgi.services@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.variables@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.ide@default:defa!
ult,com.jboss.jbds.product@default:default,org.eclipse.ecf.ssl@default:false,com.ibm.icu@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.commands@default:default,org.mortbay.jetty.server@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.concurrent@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net!
.linux.x86_64@default:false,org.eclipse.core.contenttype@defau!
lt:defau
lt,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.repository@default:default,org.apache.lucene@default:default,org.apache.jasper@default:default,org.apache.ant@default:default,org.eclipse.help@default:default,org.eclipse.equinox.common@2:true,javax.servlet.jsp@default:default,org.eclipse.swt@default:default,org.eclipse.text@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.transforms.hook@default:false,com.springsource.javax.servlet@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.!
views@default:default,org.eclipse.ecf.identity@default:default,org.apache.commons.el@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,com.jboss.jbds.usage.branding@default:true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2011-01-07 13:05:13 UTC (rev 27977)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Tools Usage Reporter.launch 2011-01-07 14:24:52 UTC (rev 27978)
@@ -6,25 +6,25 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearConfig" value="false"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Tools Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.tests,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.deltacloud.core,org.jboss.tools.deltacloud.integration,org.jboss.tools.usage.test,org.jboss.tools.tests,org.jboss.tools.deltacloud.docs,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.ui,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.deltacloud.test,org.jboss.tools.gwt.core"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-usage"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -debug -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@defaul!
t:default,org.eclipse.compare.core@default:default,org.eclipse.help.base@default:default,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.net@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.compare@default:default,org.projectusus.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.ecore.xmi@default:default,org.apache.ant@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@!
default:default,org.eclipse.equinox.p2.metadata.repository@def!
ault:def
ault,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.http.servlet@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.!
tabbed@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.sdk@default:default,org.eclipse.team.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.team.ui@default:default,org.eclipse.search@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core@d!
efault:default,org.eclipse.debug.ui@default:default,org.eclips!
e.wst.co
mmon.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide.application@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ws!
t.common.emfworkbench.integration@default:default,org.eclipse.text@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.test@default:default,org.eclipse.epp.usagedata.recording@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.compare@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.web@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.sse.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.apache.lucene@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.wst!
.web.ui@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.core.filesystem@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui.views@default:default,org.eclipse.compare.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ecf@default:default,org.sat4j.core@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.wst.common.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.pde.build@default:default,org.eclipse.emf.edit@default:default,org.ecl!
ipse.wst.standard.schemas@default:default,org.eclipse.equinox.!
http.ser
vlet@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.common@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.sdk@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.common@2:true,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.ant@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.mortbay.jetty.server@default:default,!
org.eclipse.jst.j2ee.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.osgi.util@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.wst.common.frameworks@default:default,com.ibm.icu@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.wst.server.ui@default:default,org.junit4@default:default,org.eclipse.core.runtime@default:true,javax.xml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.rse.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.jem@default:default,org.eclipse.jface@default:default,org.eclipse.ui.navigator.resources@default:default,org!
.eclipse.help.base@default:default,org.eclipse.equinox.p2.publ!
isher@de
fault:default,org.apache.lucene.analysis@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.text@default:default,javax.servlet@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.expressions@default:default,org.eclip!
se.help@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.pde.launching@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.apt.core@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jst.standard.schemas@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.search@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.common.modulecore@!
default:default,org.eclipse.equinox.simpleconfigurator@1:true,!
org.sat4
j.pb@default:default,org.eclipse.ecf.identity@default:default,org.apache.commons.el@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.swt@default:default,org.eclipse.jst.jee@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.validation@default:default,org.eclipse.team.core@default:default,org.eclipse.equin!
ox.http.jetty@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.apache.xerces@default:default,org.hamcrest.core@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.pde.core@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.ant.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.contenttype@d!
efault:default,org.apache.xml.serializer@default:default,org.e!
clipse.j
st.jsp.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ant.core@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.pde.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.app@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.common.meta.ui@default:default,org.jboss.ide.eclipse.as.test@default:default,org.jboss.ide.eclipse.archives.jdt.integration@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common.resref.core@default:default,org.jboss.tools.common.verification.ui.test@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.doc.user@default:default,org.jboss.tools.common.el.core.test@default:default,org.jboss.tools.ui.bot.ext@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.tools.common.resref.ui@default:default,org.jboss.tools.tests.performance@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.tools.jmx.ui.test@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.common.model.ui@default:default,org.jboss.ide.eclipse.archives.test@default:default,org.ecli!
pse.jsch.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.archives.ui.test@default:default,org.jboss.ide.eclipse.as.classpath.core@default:default,org.jboss.tools.common.text.xml@default:default,org.jboss.tools.common.verification@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.common.test@default:default,org.jboss.ide.eclipse.as.ui.test@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.tools.jmx.core.test@default:default,org.jboss.tools.common.model.test@default:default,org.jboss.tools.common.model.ui.test@default:default,org.jboss.tools.common.el.ui@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.common.verification.ui@default:default,org.jboss.tools.common.ui@default:default,org.jboss.ide.eclipse.as.ssh@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.common.gef@default:default,org.jboss.tools.common.projecttemplates@!
default:default,org.jboss.tools.ui.bot.ext.test@default:defaul!
t,org.jb
oss.ide.eclipse.as.archives.integration.test@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.tools.common.verification.test@default:default,org.jboss.ide.eclipse.as.classpath.ui@default:default,org.jboss.tools.common.text.ext@default:default,org.jboss.tools.common.model@default:default,org.jboss.tools.common.el.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.as.ui.mbeans@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="true"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch 2011-01-07 13:05:13 UTC (rev 27977)
+++ trunk/usage/tests/org.jboss.tools.usage.test/LinuxSystemTest.launch 2011-01-07 14:24:52 UTC (rev 27978)
@@ -11,7 +11,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common,org.jboss.tools.tests"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -36,8 +36,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.junit4@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.databinding.observable@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help@default:default,javax.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.ibm.icu@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.jface@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compati!
bility.registry@default:false,org.eclipse.core.jobs@default:default,org.hamcrest.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.deltacloud.ui@default:default,org.eclipse.epp.usagedata.gathering@default:default,com.jboss.jbds.usage.branding@default:default,org.eclipse.epp.usagedata.recording@default:default,org.jboss.tools.usage.test@default:default,org.jruby.jruby@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit4@default:default,org.eclipse.equinox.common@2:true,org.jboss.tools.xulrunner.initializer@default:false,javax.servlet@default:default,org.eclipse.osgi@-1:true,org.eclipse.jface@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,com.ibm.icu@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.registry@default:default,o!
rg.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.epp.usagedata.ui@default:default,org.jboss.tools.common.model.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common.model@default:default,org.eclipse.epp.usagedata.recording@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.gwt.ui@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.deltacloud.test@default:default,org.eclipse.epp.usagedata.gathering@default:default,org.jboss.tools.common.model.ui.capabilities@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27977 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 08:05:13 -0500 (Fri, 07 Jan 2011)
New Revision: 27977
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java
Log:
corrected copyright headers and author
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java 2011-01-07 13:04:21 UTC (rev 27976)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java 2011-01-07 13:05:13 UTC (rev 27977)
@@ -16,7 +16,7 @@
public interface ICollectionFilter<E> {
/**
- * Matches.
+ * Returns <code>true</code> if the given entry matches the criteria in this filter.
*
* @param bundle
* the bundle
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27976 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 08:04:21 -0500 (Fri, 07 Jan 2011)
New Revision: 27976
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StringUtils.java
Log:
corrected copyright headers and author
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StringUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StringUtils.java 2011-01-07 13:03:53 UTC (rev 27975)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StringUtils.java 2011-01-07 13:04:21 UTC (rev 27976)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.usage.util;
-
+/**
+ * @author André Dietisheim
+ */
public class StringUtils {
private static final String LINE_SEPARATOR_KEY = "line.separator";
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27975 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 08:03:53 -0500 (Fri, 07 Jan 2011)
New Revision: 27975
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java
Log:
corrected copyright headers and author
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java 2011-01-07 13:03:06 UTC (rev 27974)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/branding/JBossToolsUsageBranding.java 2011-01-07 13:03:53 UTC (rev 27975)
@@ -12,6 +12,9 @@
import org.jboss.tools.usage.branding.IUsageBranding;
+/**
+ * @author André Dietisheim
+ */
public class JBossToolsUsageBranding implements IUsageBranding {
public String getPreferencesDescription() {
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27974 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 08:03:06 -0500 (Fri, 07 Jan 2011)
New Revision: 27974
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java
Log:
corrected copyright headers and author
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java 2011-01-07 13:02:41 UTC (rev 27973)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/LinuxSystem.java 2011-01-07 13:03:06 UTC (rev 27974)
@@ -16,6 +16,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+/**
+ * @author André Dietisheim
+ */
public class LinuxSystem {
public static final LinuxSystem INSTANCE = new LinuxSystem();
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r27973 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-07 08:02:41 -0500 (Fri, 07 Jan 2011)
New Revision: 27973
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProvider.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProviderFactory.java
Log:
corrected copyright headers and author
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProvider.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProvider.java 2011-01-07 12:53:49 UTC (rev 27972)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProvider.java 2011-01-07 13:02:41 UTC (rev 27973)
@@ -13,6 +13,9 @@
import java.io.IOException;
import java.util.Map;
+/**
+ * @author André Dietisheim
+ */
public interface IPropertiesProvider {
public Map<String, String> getMap() throws IOException;
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProviderFactory.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProviderFactory.java 2011-01-07 12:53:49 UTC (rev 27972)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IPropertiesProviderFactory.java 2011-01-07 13:02:41 UTC (rev 27973)
@@ -1,5 +1,18 @@
+/*******************************************************************************
+ * 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.http;
+/**
+ * @author André Dietisheim
+ */
public interface IPropertiesProviderFactory {
public IPropertiesProvider create();
13 years, 5 months
- 1
- 0