JBoss Tools SVN: r33314 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-28 14:23:25 -0400 (Thu, 28 Jul 2011)
New Revision: 33314
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump from CR4 to Final
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-07-28 18:07:51 UTC (rev 33313)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-07-28 18:23:25 UTC (rev 33314)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>CR4</BUILD_ALIAS>
+ <BUILD_ALIAS>Final</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
12 years, 9 months
JBoss Tools SVN: r33313 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-07-28 14:07:51 -0400 (Thu, 28 Jul 2011)
New Revision: 33313
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
Log:
JBIDE-9422
org.jboss.tools.seam.ui.test JUnit Test failure
JUnit Test is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-28 17:52:16 UTC (rev 33312)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-28 18:07:51 UTC (rev 33313)
@@ -54,25 +54,25 @@
public void testELExprPartitioner() throws Exception{
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
- regionList.add(new TestRegion(673, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")}));
+ regionList.add(new TestRegion(673, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(681, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")}));
- regionList.add(new TestRegion(756, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")}));
+ regionList.add(new TestRegion(756, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(764, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")}));
- regionList.add(new TestRegion(863, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")}));
+ regionList.add(new TestRegion(863, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(871, 9, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_start' of bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(909, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")}));
regionList.add(new TestRegion(921, 15, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getRemainingGuesses() - org.jboss.seam.example.numberguess'", "NumberGuess.java")}));
- regionList.add(new TestRegion(964, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")}));
+ regionList.add(new TestRegion(964, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(972, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_finish' of bundle 'demo.bundle.Messages'", "Messages.properties")}));
- regionList.add(new TestRegion(1022, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")}));
+ regionList.add(new TestRegion(1022, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(1030, 9, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_yes' of bundle 'demo.bundle.Messages'", "Messages.properties")}));
- regionList.add(new TestRegion(1091, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")}));
+ regionList.add(new TestRegion(1091, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(1099, 8, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_no' of bundle 'demo.bundle.Messages'", "Messages.properties")}));
regionList.add(new TestRegion(1157, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")}));
12 years, 9 months
JBoss Tools SVN: r33310 - in trunk/xulrunner: features and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-28 13:21:31 -0400 (Thu, 28 Jul 2011)
New Revision: 33310
Modified:
trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
trunk/xulrunner/features/pom.xml
trunk/xulrunner/plugins/pom.xml
trunk/xulrunner/pom.xml
trunk/xulrunner/site/pom.xml
Log:
JBIDE-9268
reverted changes due to build failures in xulrunner
Modified: trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2011-07-28 16:24:29 UTC (rev 33309)
+++ trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2011-07-28 17:21:31 UTC (rev 33310)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>features</artifactId>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xpcom.feature</artifactId>
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-07-28 16:24:29 UTC (rev 33309)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-07-28 17:21:31 UTC (rev 33310)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>features</artifactId>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xulrunner.feature</artifactId>
Modified: trunk/xulrunner/features/pom.xml
===================================================================
--- trunk/xulrunner/features/pom.xml 2011-07-28 16:24:29 UTC (rev 33309)
+++ trunk/xulrunner/features/pom.xml 2011-07-28 17:21:31 UTC (rev 33310)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>features</artifactId>
<name>xulrunner.features</name>
-
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.mozilla.xpcom.feature</module>
Modified: trunk/xulrunner/plugins/pom.xml
===================================================================
--- trunk/xulrunner/plugins/pom.xml 2011-07-28 16:24:29 UTC (rev 33309)
+++ trunk/xulrunner/plugins/pom.xml 2011-07-28 17:21:31 UTC (rev 33310)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
<name>xulrunner.plugins</name>
-
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.mozilla.xpcom</module>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2011-07-28 16:24:29 UTC (rev 33309)
+++ trunk/xulrunner/pom.xml 2011-07-28 17:21:31 UTC (rev 33310)
@@ -10,7 +10,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
<name>xulrunner.all</name>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>features</module>
Modified: trunk/xulrunner/site/pom.xml
===================================================================
--- trunk/xulrunner/site/pom.xml 2011-07-28 16:24:29 UTC (rev 33309)
+++ trunk/xulrunner/site/pom.xml 2011-07-28 17:21:31 UTC (rev 33310)
@@ -9,6 +9,6 @@
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>xulrunner.site</artifactId>
<name>xulrunner.site</name>
- <version>1.9.2.16-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
12 years, 9 months
JBoss Tools SVN: r33309 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-28 12:24:29 -0400 (Thu, 28 Jul 2011)
New Revision: 33309
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
Log:
replaced ResourceException to generic CoreException to fix access restiction violation
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2011-07-28 16:23:37 UTC (rev 33308)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2011-07-28 16:24:29 UTC (rev 33309)
@@ -13,7 +13,6 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
-import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -65,7 +64,7 @@
assertNotNull("Can't load " + projectName, project); //$NON-NLS-1$
try {
project.build(IncrementalProjectBuilder.FULL_BUILD, null);
- } catch (ResourceException e) {
+ } catch (CoreException e) {
JUnitUtils.fail(e.getMessage(), e);
}
JobUtils.waitForIdle();
12 years, 9 months
JBoss Tools SVN: r33308 - trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-28 12:23:37 -0400 (Thu, 28 Jul 2011)
New Revision: 33308
Modified:
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java
Log:
removed not required JobUtils.waitForIdle(2000) and JobUtils.waitForIdle()
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java 2011-07-28 16:23:37 UTC (rev 33308)
@@ -38,7 +38,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
@@ -55,7 +54,6 @@
final String valueToFind = "style.css";
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
@@ -79,7 +77,6 @@
assertNotNull(link.toString());
link.open();
- JobUtils.waitForIdle(2000);
IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editorName.equals(resultEditor.getTitle())){
@@ -96,7 +93,6 @@
final String valueToFind = "red";
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
@@ -120,7 +116,6 @@
assertNotNull(link.toString());
link.open();
- JobUtils.waitForIdle(2000);
IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editorName.equals(resultEditor.getTitle())){
12 years, 9 months
JBoss Tools SVN: r33307 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test: projects/JSF2CompositeOpenOn/.settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-28 12:00:22 -0400 (Thu, 28 Jul 2011)
New Revision: 33307
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.name
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.project
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CSSStylesheetOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2XMLOpenOnTest.java
Log:
test project cleaned up from unneeded builders and natures
JobUtils.waitForIdle() removed everywhere because it is not needed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.project 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.project 2011-07-28 16:00:22 UTC (rev 33307)
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
@@ -25,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -37,7 +27,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.jboss.tools.jsf.jsfnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
</natures>
</projectDescription>
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/.jsdtscope 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/.jsdtscope 2011-07-28 16:00:22 UTC (rev 33307)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
- <attributes>
- <attribute name="hide" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="output" path=""/>
-</classpath>
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-07-28 16:00:22 UTC (rev 33307)
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-07-28 16:00:22 UTC (rev 33307)
@@ -1 +0,0 @@
-Window
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
@@ -39,7 +39,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CSSStylesheetOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CSSStylesheetOpenOnTest.java 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CSSStylesheetOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
@@ -43,7 +43,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
@@ -60,7 +59,6 @@
final String valueToFind = "style.css";
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
@@ -84,7 +82,6 @@
assertNotNull(link.toString());
link.open();
- JobUtils.waitForIdle(2000);
IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editorName.equals(resultEditor.getTitle())){
@@ -101,7 +98,6 @@
final String valueToFind = "info";
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
@@ -125,7 +121,6 @@
assertNotNull(link.toString());
link.open();
- JobUtils.waitForIdle(2000);
IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editorName.equals(resultEditor.getTitle())){
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
@@ -46,7 +46,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
@@ -81,7 +80,6 @@
private void testOpenon(String page, String text, String subtext, String editorName, String targetSelection) throws PartInitException, BadLocationException {
IEditorPart editor = WorkbenchUtils.openEditor(page);
assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
@@ -105,7 +103,6 @@
assertNotNull(link.toString());
link.open();
- JobUtils.waitForIdle(2000);
IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editorName.equals(resultEditor.getTitle())){
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeOpenOnTest.java 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
@@ -38,7 +38,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
@@ -52,7 +51,6 @@
private void testTag(String tagName, String editorName) throws PartInitException, BadLocationException {
IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
@@ -74,7 +72,6 @@
assertNotNull(link.toString());
link.open();
- JobUtils.waitForIdle(2000);
IEditorPart resultEdotor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editorName.equals(resultEdotor.getTitle())){
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2MessagesOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
@@ -38,7 +38,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2XMLOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2XMLOpenOnTest.java 2011-07-28 15:16:00 UTC (rev 33306)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2XMLOpenOnTest.java 2011-07-28 16:00:22 UTC (rev 33307)
@@ -33,7 +33,6 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJECT_NAME);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
}
protected void tearDown() {
12 years, 9 months
JBoss Tools SVN: r33306 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-07-28 11:16:00 -0400 (Thu, 28 Jul 2011)
New Revision: 33306
Modified:
trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
Log:
added jbpm bot test to the bottest update site
Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
===================================================================
--- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-28 15:02:21 UTC (rev 33305)
+++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-28 15:16:00 UTC (rev 33306)
@@ -42,7 +42,7 @@
<plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
-<!-- <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
+ <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.jst.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.maven.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
12 years, 9 months
JBoss Tools SVN: r33305 - in trunk: jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-07-28 11:02:21 -0400 (Thu, 28 Jul 2011)
New Revision: 33305
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
Log:
JBIDE-9087
Support of Bundles bean in CDI projects with Seam International module.
Fixed few resolution issues that break the resolution on long-named variables
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2011-07-28 15:02:19 UTC (rev 33304)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2011-07-28 15:02:21 UTC (rev 33305)
@@ -195,7 +195,9 @@
resolvedVariables = resolvedVars;
resolution.setLastResolvedToken(left);
- ELSegmentImpl segment = new ELSegmentImpl(combineLexicalTokensForExpression(left));
+ JSF2CCAttrELSegmentImpl segment = new JSF2CCAttrELSegmentImpl(combineLexicalTokensForExpression(left));
+ segment.setVarName(left.toString());
+ segment.setResource(this.currentFile);
segment.setResolved(true);
resolution.addSegment(segment);
@@ -420,7 +422,7 @@
ELResolutionImpl resolution,
boolean returnEqualedVariablesOnly) {
Set<TextProposal> kbProposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER);
-
+
JSF2CCAttrELSegmentImpl segment = new JSF2CCAttrELSegmentImpl(expr.getFirstToken());
segment.setResource(this.currentFile);
segment.setVarName(expr.toString());
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-28 15:02:19 UTC (rev 33304)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-28 15:02:21 UTC (rev 33305)
@@ -13,16 +13,20 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.resolver.ELSegment;
import org.jboss.tools.common.el.core.resolver.IOpenableReference;
import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
+import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
import org.jboss.tools.jst.text.ext.JSTExtensionsPlugin;
public class ELHyperlink extends AbstractHyperlink{
@@ -60,6 +64,20 @@
return;
}
+ // Open by ITextSourceReference
+ ITextSourceReference ref = segment.getSourceReference();
+ if (ref != null) {
+ IResource r = ref.getResource();
+ IFile file = r instanceof IFile ? (IFile)r : null;
+ if (file == null || !file.exists() || !file.isAccessible()) {
+ openFileFailed();
+ return;
+ }
+ if (openFileInEditor(file) != null && ref.getStartPosition() >=0 && ref.getLength() > 0) {
+ StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(new Region(ref.getStartPosition(), ref.getLength()));
+ return;
+ }
+ }
}
private String trimQuotes(String value) {
12 years, 9 months