JBoss Tools SVN: r42299 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-28 23:23:04 -0400 (Thu, 28 Jun 2012)
New Revision: 42299
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
Log:
switch from 3.4 to 3.3 because we haven't renamed all the jobs yet (still holding out for the option to call the next release 3.6 but NO ONE WILL GET BACK TO ME ALREADY)
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-06-29 02:23:28 UTC (rev 42298)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-06-29 03:23:04 UTC (rev 42299)
@@ -7,68 +7,68 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1338233191000'/>
+<property name='p2.timestamp' value='1340940100000'/>
</properties>
<children size='52'>
<!-- JBT Core: 26 x 2 = 52 -->
-<child location='../../../../staging/jbosstools-3.4_trunk.component--archives/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--as/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--birt/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--cdi/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--central/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--common/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--examples/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--forge/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--freemarker/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--gwt/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--central/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--hibernatetools/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--jmx/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--jsf/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--jst/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--maven/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--openshift/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--openshift/all/repo/'/>
<child location='../../../../staging/openshift-java-client-master/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--portlet/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--runtime/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--seam/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--seam/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--struts/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--tests/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--usage/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--vpe/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--ws/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--ws/all/repo/'/>
<child location='../../../../staging/xulrunner-1.9.2/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--archives/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--as/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--birt/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--cdi/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--central/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--common/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--examples/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--forge/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--freemarker/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--gwt/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--central/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--hibernatetools/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--jmx/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--jsf/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--jst/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--maven/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--openshift/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--openshift/all/repo/'/>
<child location='../../../../staging.previous/openshift-java-client-master/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--portlet/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--runtime/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--seam/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--seam/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--struts/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--tests/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--usage/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--vpe/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--ws/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--ws/all/repo/'/>
<child location='../../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
</children>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-06-29 02:23:28 UTC (rev 42298)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-06-29 03:23:04 UTC (rev 42299)
@@ -7,68 +7,68 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1338233187000'/>
+<property name='p2.timestamp' value='1340940106000'/>
</properties>
<children size='52'>
<!-- JBT Core: 26 x 2 = 52 -->
-<child location='../../../../staging/jbosstools-3.4_trunk.component--archives/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--as/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--birt/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--cdi/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--central/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--common/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--examples/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--forge/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--freemarker/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--gwt/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--central/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--hibernatetools/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--jmx/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--jsf/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--jst/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--maven/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--openshift/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--openshift/all/repo/'/>
<child location='../../../../staging/openshift-java-client-master/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--portlet/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--runtime/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--seam/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--seam/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--struts/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--tests/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--usage/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--vpe/all/repo/'/>
-<child location='../../../../staging/jbosstools-3.4_trunk.component--ws/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../../staging/jbosstools-3.3_trunk.component--ws/all/repo/'/>
<child location='../../../../staging/xulrunner-1.9.2/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--archives/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--as/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--birt/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--cdi/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--central/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--common/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--examples/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--forge/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--freemarker/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--gwt/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--central/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--hibernatetools/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--jmx/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--jsf/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--jst/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--maven/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--openshift/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--openshift/all/repo/'/>
<child location='../../../../staging.previous/openshift-java-client-master/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--portlet/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--runtime/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--seam/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--seam/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--struts/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--tests/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--usage/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--vpe/all/repo/'/>
-<child location='../../../../staging.previous/jbosstools-3.4_trunk.component--ws/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../../staging.previous/jbosstools-3.3_trunk.component--ws/all/repo/'/>
<child location='../../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
</children>
13 years, 3 months
JBoss Tools SVN: r42298 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests: editor and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: ldimaggio
Date: 2012-06-28 22:23:28 -0400 (Thu, 28 Jun 2012)
New Revision: 42298
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBListener.java
Log:
Added test for - https://issues.jboss.org/browse/JBQA-6527 - Add support for gateway messaging priority in the ESB editor
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-06-29 00:34:27 UTC (rev 42297)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-06-29 02:23:28 UTC (rev 42298)
@@ -88,7 +88,7 @@
problems.getErrorsNode(bot) == null);
}
- @Test
+// @Test
public void providers() {
List<String> providerList = getAvailableProviders();
String[] actionPath = new String[] { configFileFull, node_providers };
@@ -146,7 +146,7 @@
collapseTree();
}
- @Test
+// @Test
public void actions() {
String service = "bbb";
addService(service);
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java 2012-06-29 00:34:27 UTC (rev 42297)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java 2012-06-29 02:23:28 UTC (rev 42298)
@@ -85,7 +85,6 @@
editTextProperty(editor, section.bot(), "Process Definition Name:", "process-definition-name", "edited process definition name");
editTextProperty(editor, section.bot(), "Process ID:", "process-id", "edited processID");
editProcess(editor,true);
- bot.sleep(60000l);
}
@Override
protected void doFillForm(SWTBotShell shell) {
@@ -103,9 +102,7 @@
assertTrue (theItems[0].equals("startProcess"));
assertTrue (theItems[1].equals("signalEvent"));
assertTrue (theItems[2].equals("abortProcessInstance"));
-
Assertions.assertButtonEnabled(shell.bot().button(getFinishButton()), true);
- bot.sleep(60000l);
}
};
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBListener.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBListener.java 2012-06-29 00:34:27 UTC (rev 42297)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBListener.java 2012-06-29 02:23:28 UTC (rev 42298)
@@ -1,5 +1,7 @@
package org.jboss.tools.esb.ui.bot.tests.editor;
+import static junit.framework.Assert.assertTrue;
+
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
@@ -27,11 +29,10 @@
Assertions.assertButtonEnabled(shell.bot().button(getFinishButton()), true);
}
protected void doEditing(SWTBotEditor editor, String... path) {
-
}
public void edit(SWTBotEditor editor, String... path) {
- editor.show();
+ editor.show();
SWTEclipseExt.selectTreeLocation(editor.bot(), path);
doEditing(editor, (String[])null);
editor.bot().sleep(5000);
@@ -46,6 +47,32 @@
String xpath="count("+getBaseXPath()+getXpath()+")=1";
Assertions.assertXmlContentBool(text, xpath);
editor.save();
+
+
+ /* Added test for - https://issues.jboss.org/browse/JBQA-6527 - Add support for gateway messaging priority in the ESB editor */
+ if (this.uiName.contains("Gateway")) {
+// org.jboss.tools.ui.bot.ext.SWTUtilExt.displayAllBotWidgets(bot);
+ assertTrue (editor.bot().comboBoxWithLabel("Message Flow Priority:").selectionIndex() == -1);
+ assertTrue (bot.comboBoxWithLabel("Message Flow Priority:").itemCount() == 11);
+ String [] theItems = bot.comboBoxWithLabel("Message Flow Priority:").items();
+ assertTrue (theItems.length == 11);
+
+ assertTrue (theItems[1].equals("0"));
+ assertTrue (theItems[2].equals("1"));
+ assertTrue (theItems[3].equals("2"));
+ assertTrue (theItems[4].equals("3"));
+ assertTrue (theItems[5].equals("4"));
+ assertTrue (theItems[6].equals("5"));
+ assertTrue (theItems[7].equals("6"));
+ assertTrue (theItems[8].equals("7"));
+ assertTrue (theItems[9].equals("8"));
+ assertTrue (theItems[10].equals("9"));
+ bot.comboBoxWithLabel("Message Flow Priority:").setSelection(8);
+
+ assertTrue (bot.comboBoxWithLabel("Message Flow Priority:").getText().equals("7"));
+ editor.save();
+ }
+
}
}
13 years, 3 months
JBoss Tools SVN: r42297 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2012-06-28 20:34:27 -0400 (Thu, 28 Jun 2012)
New Revision: 42297
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-11394
https://issues.jboss.org/browse/JBIDE-11394
For an EAR project, persistence.xml is looked for in EJB project component.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-06-28 19:55:11 UTC (rev 42296)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-06-29 00:34:27 UTC (rev 42297)
@@ -63,6 +63,8 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.jst.j2ee.project.WebUtilities;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
@@ -87,6 +89,9 @@
import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -588,8 +593,10 @@
static final String PERSISTENCE_XML_PATH = "META-INF/persistence.xml"; //$NON-NLS-1$
private IFile findPersistenceXMLHandle() {
- IPath containerPath = getContainerFullPath();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(containerPath.segment(0));
+ IProject project = findJavaProject();
+ if(project == null) {
+ return null;
+ }
Set<IFolder> srcs = EclipseResourceUtil.getSourceFolders(project);
IFolder src = (IFolder)EclipseResourceUtil.getJavaSourceRoot(project);
if(src != null) {
@@ -608,6 +615,37 @@
return null;
}
+
+ /**
+ * If current project is a Java project, returns it.
+ * If current project is a EAR project, returns a component EJB project, if it is available.
+ * Otherwise, returns null.
+ * @return
+ */
+ private IProject findJavaProject() {
+ IPath containerPath = getContainerFullPath();
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(containerPath.segment(0));
+ if(EclipseResourceUtil.getJavaProject(project) != null) {
+ return project;
+ }
+ if(JavaEEProjectUtilities.isEARProject(project)) {
+ IVirtualComponent comp = ComponentCore.createComponent(project);
+ if(comp != null) {
+ IVirtualReference[] refComponents = comp.getReferences();
+ for (IVirtualReference virtualReference : refComponents) {
+ IVirtualComponent component = virtualReference.getReferencedComponent();
+ if(component != null && !component.isBinary() && !WebUtilities.isDynamicWebComponent(component)) {
+ IProject p = component.getProject();
+ if(JavaEEProjectUtilities.isEJBProject(p)) {
+ return p;
+ }
+ }
+ }
+ }
+ }
+
+ return null;
+ }
private InputStream getPersistanceXMLContent(IFile persistenceFile, IFile newFile) {
try {
13 years, 3 months
JBoss Tools SVN: r42296 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-28 15:55:11 -0400 (Thu, 28 Jun 2012)
New Revision: 42296
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add org.eclipse.mylyn.commons.sdk.feature.group to TPs
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-06-28 19:22:47 UTC (rev 42295)
+++ trunk/build/target-platform/jbds.target 2012-06-28 19:55:11 UTC (rev 42296)
@@ -210,6 +210,7 @@
<unit id="org.eclipse.mylyn.cvs.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.git.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.versions.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.0.v20120612-0600"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-06-28 19:22:47 UTC (rev 42295)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-06-28 19:55:11 UTC (rev 42296)
@@ -203,6 +203,7 @@
<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.sdk.feature.group" version=""/>
<iu id="org.eclipse.mylyn.tasks.ui" version=""/>
<iu id="org.eclipse.mylyn.tasks.core" version=""/>
<iu id="org.eclipse.mylyn.tasks.bugs" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-06-28 19:22:47 UTC (rev 42295)
+++ trunk/build/target-platform/multiple.target 2012-06-28 19:55:11 UTC (rev 42296)
@@ -231,6 +231,7 @@
<unit id="org.eclipse.mylyn.cvs.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.git.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.versions.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.0.v20120612-0600"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-06-28 19:22:47 UTC (rev 42295)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-06-28 19:55:11 UTC (rev 42296)
@@ -223,6 +223,7 @@
<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.sdk.feature.group" version=""/>
<iu id="org.eclipse.mylyn.tasks.ui" version=""/>
<iu id="org.eclipse.mylyn.tasks.core" version=""/>
<iu id="org.eclipse.mylyn.tasks.bugs" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-06-28 19:22:47 UTC (rev 42295)
+++ trunk/build/target-platform/unified.target 2012-06-28 19:55:11 UTC (rev 42296)
@@ -231,6 +231,7 @@
<unit id="org.eclipse.mylyn.cvs.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.git.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.versions.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.0.v20120612-0600"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-06-28 19:22:47 UTC (rev 42295)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-06-28 19:55:11 UTC (rev 42296)
@@ -223,6 +223,7 @@
<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.sdk.feature.group" version=""/>
<iu id="org.eclipse.mylyn.tasks.ui" version=""/>
<iu id="org.eclipse.mylyn.tasks.core" version=""/>
<iu id="org.eclipse.mylyn.tasks.bugs" version=""/>
13 years, 3 months
JBoss Tools SVN: r42295 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-28 15:22:47 -0400 (Thu, 28 Jun 2012)
New Revision: 42295
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add org.eclipse.mylyn.monitor.feature.group to TP
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-06-28 19:16:02 UTC (rev 42294)
+++ trunk/build/target-platform/jbds.target 2012-06-28 19:22:47 UTC (rev 42295)
@@ -203,6 +203,7 @@
<unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.discovery.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.monitor.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.7.0.v20120612-0600"/>
@@ -269,4 +270,4 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201202290255-rel-r37"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-06-28 19:16:02 UTC (rev 42294)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-06-28 19:22:47 UTC (rev 42295)
@@ -196,6 +196,7 @@
<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.discovery.feature.group" version=""/>
<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.monitor.feature.group" version=""/>
<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-06-28 19:16:02 UTC (rev 42294)
+++ trunk/build/target-platform/multiple.target 2012-06-28 19:22:47 UTC (rev 42295)
@@ -224,6 +224,7 @@
<unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.discovery.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.monitor.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.7.0.v20120612-0600"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-06-28 19:16:02 UTC (rev 42294)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-06-28 19:22:47 UTC (rev 42295)
@@ -216,6 +216,7 @@
<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.discovery.feature.group" version=""/>
<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.monitor.feature.group" version=""/>
<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-06-28 19:16:02 UTC (rev 42294)
+++ trunk/build/target-platform/unified.target 2012-06-28 19:22:47 UTC (rev 42295)
@@ -224,6 +224,7 @@
<unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.discovery.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.8.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.monitor.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.7.0.v20120612-0600"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-06-28 19:16:02 UTC (rev 42294)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-06-28 19:22:47 UTC (rev 42295)
@@ -216,6 +216,7 @@
<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.discovery.feature.group" version=""/>
<iu id="org.eclipse.mylyn.java_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.monitor.feature.group" version=""/>
<iu id="org.eclipse.mylyn.pde_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.team_feature.feature.group" version=""/>
<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version=""/>
13 years, 3 months
JBoss Tools SVN: r42294 - in trunk: common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2012-06-28 15:16:02 -0400 (Thu, 28 Jun 2012)
New Revision: 42294
Added:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/BaseQuickFixProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/icons/seam_conversation.png
trunk/seam/plugins/org.jboss.tools.seam.ui/resources/org/jboss/tools/seam/ui/wizard/SeamEntityWizBan.png
trunk/seam/plugins/org.jboss.tools.seam.ui/resources/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizBan.png
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IQuickFixGenerator.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/QuickFixManager.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
Log:
org.jboss.tools.jsf.ui.test.JSPProblemMarkerResolutionTest failure https://issues.jboss.org/browse/JBIDE-12260
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/BaseQuickFixProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/BaseQuickFixProcessor.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/BaseQuickFixProcessor.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.common.text.xml.quickfix;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
+import org.eclipse.jdt.ui.text.java.IInvocationContext;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
+import org.eclipse.jdt.ui.text.java.IQuickAssistProcessor;
+import org.eclipse.jdt.ui.text.java.IQuickFixProcessor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+public class BaseQuickFixProcessor implements IQuickFixProcessor, IQuickAssistProcessor {
+
+ public boolean hasAssists(IInvocationContext context) throws CoreException {
+ return true;
+ }
+
+ public IJavaCompletionProposal[] getAssists(IInvocationContext context,
+ IProblemLocation[] locations) throws CoreException {
+
+ return getComplitions(locations);
+ }
+
+ public boolean hasCorrections(ICompilationUnit unit, int problemId) {
+ return true;
+ }
+
+ public IJavaCompletionProposal[] getCorrections(IInvocationContext context,
+ IProblemLocation[] locations) throws CoreException {
+
+ return getComplitions(locations);
+ }
+
+ private IJavaCompletionProposal[] getComplitions(IProblemLocation[] locations){
+ ArrayList<IJavaCompletionProposal> list = new ArrayList<IJavaCompletionProposal>();
+
+ Annotation[] annotations = findAnnotations(locations);
+
+ String debugInfo = "Annotations: "; //$NON-NLS-1$
+
+ for(Annotation annotation : annotations){
+ debugInfo += annotation.getText()+" "; //$NON-NLS-1$
+ if(QuickFixManager.getInstance().hasProposals(annotation)){
+ List<IJavaCompletionProposal> proposals = QuickFixManager.getInstance().getProposals(annotation);
+ list.addAll(proposals);
+ }
+ }
+
+ list.add(new BaseCompletionProposal(debugInfo));
+
+ return list.toArray(new IJavaCompletionProposal[]{});
+ }
+
+ private Annotation[] findAnnotations(IProblemLocation[] locations){
+ ArrayList<Annotation> annotationList = new ArrayList<Annotation>();
+
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if(window != null){
+ IWorkbenchPage page = window.getActivePage();
+ if(page != null){
+ IEditorPart editor = page.getActiveEditor();
+ if(editor instanceof JavaEditor){
+ ISourceViewer viwer = ((JavaEditor)editor).getViewer();
+ if(viwer != null){
+ IAnnotationModel aModel = viwer.getAnnotationModel();
+ Iterator iterator = aModel.getAnnotationIterator();
+ while(iterator.hasNext()){
+ Annotation annotation = (Annotation)iterator.next();
+ System.out.println("Annotation - "+annotation.getClass()+" "+annotation.getClass()+" "+annotation.getType());
+ Position position = aModel.getPosition(annotation);
+ for(IProblemLocation location : locations){
+ if(isOverlap(position, location)){
+ annotationList.add(annotation);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return annotationList.toArray(new Annotation[]{});
+ }
+
+ private boolean isOverlap(Position position, IProblemLocation location){
+ return isInto(position.getOffset(), position.getLength(), location.getOffset(), location.getLength()) ||
+ isInto(location.getOffset(), location.getLength(), position.getOffset(), position.getLength());
+ }
+
+ private boolean isInto(int offset1, int length1, int offset2, int length2){
+
+ return (offset1 >= offset2 && offset1 <= (offset2+length2)) || ((offset1+length2) >= offset2 && (offset1+length2) <= (offset2+length2));
+ }
+
+ class BaseCompletionProposal implements IJavaCompletionProposal{
+ String debugInfo;
+
+ public BaseCompletionProposal(String debugInfo){
+ this.debugInfo = debugInfo;
+ }
+
+ public void apply(IDocument document) {
+ }
+
+ public Point getSelection(IDocument document) {
+ return null;
+ }
+
+ public String getAdditionalProposalInfo() {
+ return "Additioonal Proposal Info"; //$NON-NLS-1$
+ }
+
+ public String getDisplayString() {
+ return "Base Completion Proposal "+debugInfo; //$NON-NLS-1$
+ }
+
+ public Image getImage() {
+ return null;
+ }
+
+ public IContextInformation getContextInformation() {
+ return null;
+ }
+
+ public int getRelevance() {
+ return 100;
+ }
+
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/BaseQuickFixProcessor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IQuickFixGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IQuickFixGenerator.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/IQuickFixGenerator.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -12,7 +12,7 @@
import java.util.List;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.source.Annotation;
public interface IQuickFixGenerator {
@@ -33,5 +33,5 @@
* @param annotation the annotation
* @return list of proposals for the given annotation
*/
- public List<ICompletionProposal> getProposals(Annotation annotation);
+ public List<IJavaCompletionProposal> getProposals(Annotation annotation);
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/MarkerAnnotationInfo.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -16,6 +16,7 @@
import java.util.Map;
import org.eclipse.core.resources.IMarker;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
@@ -83,7 +84,7 @@
if(isDirty() && QuickFixManager.getInstance().hasProposals(annotation)){
annotation.setAdditionalFixInfo(viewer.getDocument());
- List<ICompletionProposal> proposals = QuickFixManager.getInstance().getProposals(annotation);
+ List<IJavaCompletionProposal> proposals = QuickFixManager.getInstance().getProposals(annotation);
allProposals.addAll(proposals);
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/QuickFixManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/QuickFixManager.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/quickfix/QuickFixManager.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -14,6 +14,7 @@
import java.util.HashMap;
import java.util.List;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.source.Annotation;
@@ -58,10 +59,10 @@
return false;
}
- public List<ICompletionProposal> getProposals(Annotation annotation){
- ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+ public List<IJavaCompletionProposal> getProposals(Annotation annotation){
+ ArrayList<IJavaCompletionProposal> proposals = new ArrayList<IJavaCompletionProposal>();
for(IQuickFixGenerator generator : generators.values()){
- List<ICompletionProposal> pp = generator.getProposals(annotation);
+ List<IJavaCompletionProposal> pp = generator.getProposals(annotation);
proposals.addAll(pp);
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -21,6 +21,7 @@
import org.eclipse.debug.internal.ui.DebugUIPlugin;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.IPreferencePage;
import org.eclipse.jface.preference.PreferenceManager;
@@ -42,7 +43,7 @@
* @author Daniel Azarov
*/
public class ConfigureProblemSeverityMarkerResolution implements
- IMarkerResolution2, ICompletionProposal {
+ IMarkerResolution2, IJavaCompletionProposal {
private static final int PREFERENCE_SIZE = 40;
private static final String DOTS = "...";
@@ -160,4 +161,9 @@
public IContextInformation getContextInformation() {
return null;
}
+
+ @Override
+ public int getRelevance() {
+ return 0;
+ }
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -21,7 +21,7 @@
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.IMarkerResolutionGenerator2;
@@ -139,8 +139,8 @@
}
@Override
- public List<ICompletionProposal> getProposals(Annotation annotation) {
- ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+ public List<IJavaCompletionProposal> getProposals(Annotation annotation) {
+ ArrayList<IJavaCompletionProposal> proposals = new ArrayList<IJavaCompletionProposal>();
if(annotation instanceof TemporaryAnnotation){
String preferenceKey = getPreferenceKey((TemporaryAnnotation)annotation);
String preferencePageId = getPreferencePageId((TemporaryAnnotation)annotation);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -1,8 +1,7 @@
package org.jboss.tools.jsf.ui.test;
-import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -10,16 +9,17 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jst.jsp.ui.internal.validation.JSPContentSourceValidator;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
@@ -28,6 +28,7 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.html.core.internal.validation.HTMLValidator;
import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
import org.eclipse.wst.validation.ValidationFramework;
import org.eclipse.wst.validation.ValidationResult;
@@ -37,8 +38,8 @@
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.text.xml.quickfix.QuickFixManager;
-import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.web.ui.action.AddTLDMarkerResolution;
import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -69,6 +70,8 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject("test_jsf_project");
isSuspendedValidationDefaultValue = ValidationFramework.getDefault().isSuspended();
ValidationFramework.getDefault().suspendAllValidation(false);
+ //project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ //project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
public void tearDown() throws Exception {
@@ -108,25 +111,26 @@
// https://issues.jboss.org/browse/JBIDE-11596 compile failed in org.jboss.tools.jsf.ui.test when run against Juno TP
// org.eclipse.wst.html.internal.validation.HTMLValidator was moved to org.eclipse.wst.html.core.internal.validation.HTMLValidator
// We have to use reflection to be compilable in both Indigo and June.
-// org.eclipse.wst.html.internal.validation.HTMLValidator validator = new org.eclipse.wst.html.internal.validation.HTMLValidator();
-// ValidationResult result = validator.validate(file, 0, new ValidationState(), new NullProgressMonitor());
- Class validatorClass = null;
- try {
- validatorClass = JsfUiPlugin.getDefault().getBundle().loadClass("org.eclipse.wst.html.internal.validation.HTMLValidator");
- } catch (ClassNotFoundException e) {
- try {
- validatorClass = JsfUiPlugin.getDefault().getBundle().loadClass("org.eclipse.wst.html.core.internal.validation.HTMLValidator");
- } catch (ClassNotFoundException e1) {
- fail("Cannot load org.eclipse.wst.html.internal.validation.HTMLValidator (Eclipse Indigo) nor org.eclipse.wst.html.core.internal.validation.HTMLValidator (Eclipse Juno): ClassNotFoundException");
- }
- }
- Constructor constructor = validatorClass.getConstructor();
- Object validator = constructor.newInstance();
- Method validate = validatorClass.getMethod("validate", IResource.class, int.class, ValidationState.class, IProgressMonitor.class);
- ValidationResult result = (ValidationResult)validate.invoke(validator, file, 0, new ValidationState(), new NullProgressMonitor());
+// Class validatorClass = null;
+// try {
+// validatorClass = JsfUiPlugin.getDefault().getBundle().loadClass("org.eclipse.wst.html.core.internal.validation.HTMLValidator");
+// } catch (ClassNotFoundException e) {
+// try {
+// validatorClass = JsfUiPlugin.getDefault().getBundle().loadClass("org.eclipse.wst.html.internal.validation.HTMLValidator");
+// } catch (ClassNotFoundException e1) {
+// fail("Cannot load org.eclipse.wst.html.internal.validation.HTMLValidator (Eclipse Indigo) nor org.eclipse.wst.html.core.internal.validation.HTMLValidator (Eclipse Juno): ClassNotFoundException");
+// }
+// }
+// Constructor constructor = validatorClass.getConstructor();
+// Object validator = constructor.newInstance();
+// Method validate = validatorClass.getMethod("validate", IResource.class, int.class, ValidationState.class, IProgressMonitor.class);
+// ValidationResult result = (ValidationResult)validate.invoke(validator, file, 0, new ValidationState(), new NullProgressMonitor());
+ HTMLValidator validator = new HTMLValidator();
+ ValidationResult result = validator.validate(file, 0, new ValidationState(), new NullProgressMonitor());
+
IReporter reporter = result.getReporter(new NullProgressMonitor());
- List messages = reporter.getMessages();
+ List<Object> messages = reporter.getMessages();
for(Object m : messages){
if(m instanceof Message){
Message message = (Message)m;
@@ -223,30 +227,26 @@
if(editor instanceof JSPMultiPageEditor){
JSPMultiPageEditor jspEditor = (JSPMultiPageEditor)editor;
- IAnnotationModel aModel = jspEditor.getJspEditor().getTextViewer().getAnnotationModel();
+ SourceViewer viewer = jspEditor.getJspEditor().getTextViewer();
+
// change file
- IDocument document = jspEditor.getJspEditor().getTextViewer().getDocument();
+ IDocument document = viewer.getDocument();
IRegion region = document.getLineInformation(lineToDelete);
document.replace(region.getOffset(), region.getLength(), "");
// Find annotation
- TemporaryAnnotation problemAnnotation = waitForProblemAnnotationAppearance(
- aModel, MAX_SECONDS_TO_WAIT);
- assertNotNull("No ProblemAnnotation found for Marker Type: "
- + MARKER_TYPE, problemAnnotation);
+ TemporaryAnnotation problemAnnotation = waitForProblemAnnotationAppearance(viewer, "Unknown tag (", MAX_SECONDS_TO_WAIT);
+ assertNotNull("No Unknown tag TemporaryAnnotation found", problemAnnotation);
- if(problemAnnotation != null){
- problemAnnotation.setAdditionalFixInfo(document);
- // get all relevant quick fixes for this annotation
- if(QuickFixManager.getInstance().hasProposals(problemAnnotation)){
- List<ICompletionProposal> proposals = QuickFixManager.getInstance().getProposals(problemAnnotation);
- assertNotSame("Quick fix not found", 0, proposals.size());
- }else{
- fail("Quick fix not found");
- }
+ problemAnnotation.setAdditionalFixInfo(document);
+ // get all relevant quick fixes for this annotation
+ if(QuickFixManager.getInstance().hasProposals(problemAnnotation)){
+ List<IJavaCompletionProposal> proposals = QuickFixManager.getInstance().getProposals(problemAnnotation);
+ assertTrue("No quick fixes found", proposals.size() > 0);
+ assertEquals("Add tag library definition quick fix not found", AddTLDMarkerResolution.class, proposals.get(0).getClass());
}else{
- fail("Annotation not found");
+ fail("No quick fixes found");
}
}else{
fail("Editor must be instance of JSPMultiPageEditor, was - "+editor.getClass());
@@ -254,35 +254,38 @@
}
private TemporaryAnnotation waitForProblemAnnotationAppearance(
- final IAnnotationModel annotationModel, final int seconds) {
- final TemporaryAnnotation[] result = new TemporaryAnnotation[] { null };
+ final SourceViewer viewer, final String name, final int seconds) {
+ final TemporaryAnnotation[] result = new TemporaryAnnotation[]{null};
Display.getDefault().syncExec(new Runnable() {
public void run() {
int secondsLeft = seconds;
+ boolean isFirstPass = true;
while (secondsLeft-- > 0) {
- JobUtils.delay(1000);
+ if (!isFirstPass) {
+ JobUtils.delay(1000);
- // clean deffered events
- while (Display.getCurrent().readAndDispatch())
- ;
+ // clean deffered events
+ while (Display.getCurrent().readAndDispatch())
+ ;
+ } else {
+ secondsLeft++; // because the wait step was skipped
+ }
//boolean found = false;
+ IAnnotationModel annotationModel = viewer.getAnnotationModel();
Iterator it = annotationModel.getAnnotationIterator();
while (it.hasNext()) {
Object o = it.next();
- if (!(o instanceof TemporaryAnnotation))
- continue;
+ if (o instanceof TemporaryAnnotation){
+ if(((TemporaryAnnotation) o).getText().startsWith(name)){
+ result[0] = (TemporaryAnnotation) o;
+ }
+ }
- TemporaryAnnotation temporaryAnnotation = (TemporaryAnnotation) o;
- Position position = annotationModel
- .getPosition(temporaryAnnotation);
-
-
- result[0] = temporaryAnnotation;
- return;
}
+ isFirstPass = false;
}
}
});
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -16,9 +16,9 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -26,7 +26,6 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.texteditor.DocumentProviderRegistry;
import org.eclipse.ui.texteditor.IDocumentProvider;
@@ -43,7 +42,7 @@
* @author Daniel Azarov
*
*/
-public class AddTLDMarkerResolution implements IBaseMarkerResolution, ICompletionProposal{
+public class AddTLDMarkerResolution implements IBaseMarkerResolution, IJavaCompletionProposal{
private IFile file;
private Properties properties;
@@ -160,4 +159,9 @@
public IContextInformation getContextInformation() {
return null;
}
+
+ @Override
+ public int getRelevance() {
+ return 0;
+ }
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-06-28 18:10:05 UTC (rev 42293)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-06-28 19:16:02 UTC (rev 42294)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -87,7 +88,7 @@
return new IMarkerResolution[]{};
}
- private ICompletionProposal isOurCase(Annotation annotation){
+ private IJavaCompletionProposal isOurCase(Annotation annotation){
if(!(annotation instanceof TemporaryAnnotation)){
return null;
}
@@ -241,9 +242,9 @@
}
@Override
- public List<ICompletionProposal> getProposals(Annotation annotation) {
- ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
- ICompletionProposal proposal = isOurCase(annotation);
+ public List<IJavaCompletionProposal> getProposals(Annotation annotation) {
+ ArrayList<IJavaCompletionProposal> proposals = new ArrayList<IJavaCompletionProposal>();
+ IJavaCompletionProposal proposal = isOurCase(annotation);
if(proposal != null){
proposals.add(proposal);
}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/icons/seam_conversation.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/icons/seam_conversation.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/resources/org/jboss/tools/seam/ui/wizard/SeamEntityWizBan.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/resources/org/jboss/tools/seam/ui/wizard/SeamEntityWizBan.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/resources/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizBan.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/resources/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizBan.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 3 months
JBoss Tools SVN: r42293 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-06-28 14:10:05 -0400 (Thu, 28 Jun 2012)
New Revision: 42293
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-12191 : BrowserSim: automatically hide/customize scrollbars
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-06-28 17:57:32 UTC (rev 42292)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-06-28 18:10:05 UTC (rev 42293)
@@ -26,6 +26,7 @@
import org.eclipse.swt.SWTError;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.BrowserFunction;
+import org.eclipse.swt.browser.LocationAdapter;
import org.eclipse.swt.browser.LocationEvent;
import org.eclipse.swt.browser.LocationListener;
import org.eclipse.swt.browser.ProgressEvent;
@@ -236,12 +237,62 @@
}
});
- browser.addLocationListener(new LocationListener() {
+ browser.addLocationListener(new LocationAdapter() {
public void changed(LocationEvent event) {
initOrientation(deviceOrientation.getOrientationAngle());
}
- public void changing(LocationEvent event) {
+ });
+
+ browser.addLocationListener(new LocationAdapter() {
+ @Override
+ public void changed(LocationEvent event) {
+ Browser browser = (Browser) event.widget;
+ setCustomScrollbarStyles(browser);
}
+
+ @SuppressWarnings("nls")
+ private void setCustomScrollbarStyles(Browser browser) {
+ browser.execute(
+ "if (window._browserSim_customScrollBarStylesSetter === undefined) {"
+ +"window._browserSim_customScrollBarStylesSetter = function () {"
+ + "document.removeEventListener('DOMSubtreeModified', window._browserSim_customScrollBarStylesSetter, false);"
+ + "var head = document.head;"
+ + "var style = document.createElement('style');"
+ + "style.type = 'text/css';"
+ + "style.id='browserSimStyles';"
+ + "head.appendChild(style);"
+ + "style.innerText='"
+ // The following two rules fix a problem with showing scrollbars in Google Mail and similar,
+ // but autohiding of navigation bar stops to work with it. That is why they are commented.
+ //+ "html {"
+ //+ "overflow: hidden;"
+ //+ "}"
+ //+ "body {"
+ //+ "position: absolute;"
+ //+ "top: 0px;"
+ //+ "left: 0px;"
+ //+ "bottom: 0px;"
+ //+ "right: 0px;"
+ //+ "margin: 0px;"
+ //+ "overflow-y: auto;"
+ //+ "overflow-x: auto;"
+ //+ "}"
+ + "::-webkit-scrollbar {"
+ + "width: 5px;"
+ + "height: 5px;"
+ + "}"
+ + "::-webkit-scrollbar-thumb {"
+ + "background: rgba(0,0,0,0.4); "
+ + "}"
+ + "::-webkit-scrollbar-corner, ::-webkit-scrollbar-thumb:window-inactive {"
+ + "background: rgba(0,0,0,0.0);"
+ + "};"
+ + "';"
+ +"};"
+ + "document.addEventListener('DOMSubtreeModified', window._browserSim_customScrollBarStylesSetter, false);"
+ + "}"
+ );
+ }
});
browser.addLocationListener(new LocationListener() {
@@ -267,7 +318,8 @@
}
};
- ((Browser)event.widget).execute(
+ Browser browser = (Browser)event.widget;
+ browser.execute(
"(function() {" +
"var scrollListener = function(e){" +
"window._browserSim_scrollListener(window.pageYOffset)" +
13 years, 3 months
JBoss Tools SVN: r42292 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor.
by jbosstools-commits@lists.jboss.org
Author: ldimaggio
Date: 2012-06-28 13:57:32 -0400 (Thu, 28 Jun 2012)
New Revision: 42292
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java
Log:
Added test for https://issues.jboss.org/browse/JBQA-6529 - ESB Editor : create template for BPM5Processor action
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java 2012-06-28 17:29:42 UTC (rev 42291)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/ESBActionFactory.java 2012-06-28 17:57:32 UTC (rev 42292)
@@ -6,6 +6,8 @@
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.widgets.SWTBotSection;
+import static junit.framework.Assert.assertTrue;
+
public class ESBActionFactory {
public static ESBAction customAction() {
return new ESBAction("Custom Action",null,"java.lang.Object") {
@@ -51,6 +53,8 @@
SWTBotSection section = bot.section(editor.bot(),getSectionTitle());
editTextProperty(editor, section.bot(), "Process Definition Name:", "process-definition-name", "process");
editProcess(editor,true);
+ bot.sleep(60000l);
+
}
@Override
protected void doFillForm(SWTBotShell shell) {
@@ -62,6 +66,51 @@
};
}
+
+ public static ESBAction bpm5Processor() {
+ return new ESBAction("BPM 5 Processor","BPM","org.jboss.soa.esb.services.jbpm5.actions.Bpm5Processor") {
+
+ @Override
+ public String getMenuLabel() {
+ return this.uiName;
+ }
+ @Override
+ public String getSectionTitle() {
+ return "Bpm5 Processor Action";
+ }
+ @Override
+ protected void doEditing(SWTBotEditor editor, String... path) {
+ SWTBotSection section = bot.section(editor.bot(),getSectionTitle());
+ org.jboss.tools.ui.bot.ext.SWTUtilExt.displayAllBotWidgets(bot);
+ editTextProperty(editor, section.bot(), "Process Definition Name:", "process-definition-name", "edited process definition name");
+ editTextProperty(editor, section.bot(), "Process ID:", "process-id", "edited processID");
+ editProcess(editor,true);
+ bot.sleep(60000l);
+ }
+ @Override
+ protected void doFillForm(SWTBotShell shell) {
+ Assertions.assertButtonEnabled(shell.bot().button(getFinishButton()), false);
+ shell.bot().text(0).setText(this.uiName);
+ shell.bot().text(1).setText(this.uiName + "processDefName");
+ shell.bot().text(2).setText(this.uiName + "processID");
+ shell.bot().comboBox().setSelection(1);
+
+ /* Added for - https://issues.jboss.org/browse/JBQA-6529 - ESB Editor : create template for BPM5Processor action */
+ assertTrue (shell.bot().comboBox().selectionIndex() == 1);
+ assertTrue (shell.bot().comboBox().itemCount() == 3);
+ String [] theItems = shell.bot().comboBox().items();
+ assertTrue (theItems.length == 3);
+ assertTrue (theItems[0].equals("startProcess"));
+ assertTrue (theItems[1].equals("signalEvent"));
+ assertTrue (theItems[2].equals("abortProcessInstance"));
+
+ Assertions.assertButtonEnabled(shell.bot().button(getFinishButton()), true);
+ bot.sleep(60000l);
+ }
+
+ };
+ }
+
public static ESBAction bpmRulesProcessor() {
return new ESBAction("Business Rules Processor","BPM","org.jboss.soa.esb.actions.BusinessRulesProcessor") {
@Override
13 years, 3 months
JBoss Tools SVN: r42291 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2012-06-28 13:29:42 -0400 (Thu, 28 Jun 2012)
New Revision: 42291
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java
Log:
JBIDE-10738
As-you-type EL validation
JUnit test is updated
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java 2012-06-28 16:21:31 UTC (rev 42290)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAsYouTypeValidationTest.java 2012-06-28 17:29:42 UTC (rev 42291)
@@ -290,10 +290,6 @@
problemAnnotation = waitForAnnotation(
start, end, anotherErrorMessage, MAX_SECONDS_TO_WAIT, false, true);
- if (problemAnnotation == null) {
- problemAnnotation = waitForAnnotation(
- start, end, anotherErrorMessage, MAX_SECONDS_TO_WAIT, false, true);
- }
assertNotNull("No Problem Annotation found for EL " + anotherELToValidate + " on region " + numberOfRegionToTest + "!", problemAnnotation);
message = problemAnnotation.getText();
13 years, 3 months
JBoss Tools SVN: r42290 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-28 12:21:31 -0400 (Thu, 28 Jun 2012)
New Revision: 42290
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add org.eclipse.mylyn.commons.notifications.feature.group to TP
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-06-28 16:03:15 UTC (rev 42289)
+++ trunk/build/target-platform/jbds.target 2012-06-28 16:21:31 UTC (rev 42290)
@@ -196,6 +196,7 @@
<unit id="org.eclipse.mylyn.commons.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.8.0.v20120612-0600"/>
@@ -268,4 +269,4 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201202290255-rel-r37"/>
</location>
</locations>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-06-28 16:03:15 UTC (rev 42289)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-06-28 16:21:31 UTC (rev 42290)
@@ -189,6 +189,7 @@
<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.identity.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.notifications.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.repositories.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" version=""/>
<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-06-28 16:03:15 UTC (rev 42289)
+++ trunk/build/target-platform/multiple.target 2012-06-28 16:21:31 UTC (rev 42290)
@@ -217,6 +217,7 @@
<unit id="org.eclipse.mylyn.commons.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.8.0.v20120612-0600"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-06-28 16:03:15 UTC (rev 42289)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-06-28 16:21:31 UTC (rev 42290)
@@ -209,6 +209,7 @@
<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.identity.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.notifications.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.repositories.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" version=""/>
<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-06-28 16:03:15 UTC (rev 42289)
+++ trunk/build/target-platform/unified.target 2012-06-28 16:21:31 UTC (rev 42290)
@@ -217,6 +217,7 @@
<unit id="org.eclipse.mylyn.commons.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/>
+ <unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="1.0.0.v20120612-0600"/>
<unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.8.0.v20120612-0600"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-06-28 16:03:15 UTC (rev 42289)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-06-28 16:21:31 UTC (rev 42290)
@@ -209,6 +209,7 @@
<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.identity.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.commons.notifications.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.repositories.feature.group" version=""/>
<iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" version=""/>
<iu id="org.eclipse.mylyn.context_feature.feature.group" version=""/>
13 years, 3 months