JBoss Tools SVN: r20691 - in trunk/jst: tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-03-05 10:17:04 -0500 (Fri, 05 Mar 2010)
New Revision: 20691
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4876
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 2010-03-05 15:14:42 UTC (rev 20690)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2010-03-05 15:17:04 UTC (rev 20691)
@@ -22,7 +22,6 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
import org.eclipse.ui.IMarkerResolutionGenerator2;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.texteditor.DocumentProviderRegistry;
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java 2010-03-05 15:14:42 UTC (rev 20690)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java 2010-03-05 15:17:04 UTC (rev 20691)
@@ -11,7 +11,6 @@
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
-import org.jboss.tools.tests.IMarkerFilter;
public class JSPProblemMarkerResolutionTest extends AbstractResourceMarkerTest{
IProject project = null;
14 years, 10 months
JBoss Tools SVN: r20689 - in trunk/jst/tests/org.jboss.tools.jst.web.ui.test: META-INF and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-03-05 10:13:59 -0500 (Fri, 05 Mar 2010)
New Revision: 20689
Added:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/JavaSource/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-logging.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jsf-tlds.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jstl.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/standard.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4876
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-03-05 15:13:37 UTC (rev 20688)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-03-05 15:13:59 UTC (rev 20689)
@@ -12,7 +12,8 @@
org.jboss.tools.common.model.ui,
org.jboss.tools.common.model.ui.test,
org.jboss.tools.common.model.test,
- org.jboss.tools.tests;bundle-version="2.0.0"
+ org.jboss.tools.tests;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0"
Export-Package: org.jboss.tools.jst.web.ui.test
Bundle-ClassPath: jst-web-ui.jar
Bundle-Localization: plugin
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.5.0_10">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>test_jsf_project</name>
+ <comment></comment>
+ <projects>
+ </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>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <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>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,11 @@
+<?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>
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,7 @@
+#Thu Mar 04 15:11:11 MSK 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="test_jsf_project">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+<property name="context-root" value="test_jsf_project"/>
+<property name="java-output-path"/>
+</wb-module>
+</project-modules>
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.java"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.5"/>
+</faceted-project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <application>
+ <locale-config/>
+ </application>
+ <factory/>
+ <lifecycle/>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/common-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/standard.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>test_jsf_project</display-name>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,11 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:commandButton value="" action=""/>
+ </f:view>
+ </body>
+</html>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <head>
+ <title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+ </head>
+
+<body bgcolor="#ffffff">
+<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400">
+<tbody>
+
+ <tr>
+ <td class="header" height="42" align="center" valign="middle" width="100%" bgcolor="#E4EBEB">
+ <ui:insert name="pageHeader">Page Header</ui:insert>
+ </td>
+ </tr>
+ <tr>
+ <td height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height:150px" align="left" cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%" valign="middle">
+
+ <ui:insert name="body">Page Body</ui:insert>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+</tbody>
+</table>
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,3 @@
+#
+#Thu Mar 04 15:11:09 MSK 2010
+classpath.external=
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,87 @@
+<project name="test_jsf_project" basedir="../" default="deploy">
+
+ <!-- Project settings -->
+ <property name="project.distname" value="test_jsf_project"/>
+
+ <!-- Local system paths -->
+ <property file="${basedir}/ant/build.properties"/>
+ <property name="webroot.dir" value="${basedir}/WebContent"/>
+ <property name="webinf.dir" value="${webroot.dir}/WEB-INF"/>
+ <property name="build.dir" value="build"/>
+
+ <!-- classpath for JSF 1.1.01 -->
+ <path id="compile.classpath">
+ <pathelement path ="${webinf.dir}/lib/commons-beanutils.jar"/>
+ <pathelement path ="${webinf.dir}/lib/commons-collections.jar"/>
+ <pathelement path ="${webinf.dir}/lib/commons-digester.jar"/>
+ <pathelement path ="${webinf.dir}/lib/commons-logging.jar"/>
+ <pathelement path ="${webinf.dir}/lib/jsf-api.jar"/>
+ <pathelement path ="${webinf.dir}/lib/jsf-impl.jar"/>
+ <pathelement path ="${webinf.dir}/lib/jstl.jar"/>
+ <pathelement path ="${webinf.dir}/lib/standard.jar"/>
+ <pathelement path ="${webinf.dir}/classes"/>
+ <pathelement path ="${classpath.external}"/>
+ <pathelement path ="${classpath}"/>
+ </path>
+
+ <!-- define your folder for deployment -->
+ <property name="deploy.dir" value="deploy"/>
+
+
+ <!-- Check timestamp on files -->
+ <target name="prepare">
+ <tstamp/>
+ </target>
+
+ <!-- Copy any resource or configuration files -->
+ <target name="resources">
+ <copy todir="${webinf.dir}/classes" includeEmptyDirs="no">
+ <fileset dir="JavaSource">
+ <patternset>
+ <include name="**/*.conf"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
+ </patternset>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Normal build of application -->
+ <target name="compile" depends="prepare,resources">
+ <javac srcdir="JavaSource" destdir="${webinf.dir}/classes">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Remove classes directory for clean build -->
+ <target name="clean"
+ description="Prepare for clean build">
+ <delete dir="${webinf.dir}/classes"/>
+ <mkdir dir="${webinf.dir}/classes"/>
+ </target>
+
+ <!-- Build entire project -->
+ <target name="build" depends="prepare,compile"/>
+ <target name="rebuild" depends="clean,prepare,compile"/>
+
+ <!-- Create binary distribution -->
+ <target name="war" depends="build">
+ <mkdir dir="${build.dir}"/>
+ <war
+ basedir="${webroot.dir}"
+ warfile="${build.dir}/${project.distname}.war"
+ webxml="${webinf.dir}/web.xml">
+ <exclude name="WEB-INF/${build.dir}/**"/>
+ <exclude name="WEB-INF/src/**"/>
+ <exclude name="WEB-INF/web.xml"/>
+ </war>
+
+ </target>
+
+ <target name="deploy" depends="war">
+ <delete file="${deploy.dir}/${project.distname}.war"/>
+ <delete dir="${deploy.dir}/${project.distname}"/>
+ <copy file="${build.dir}/${project.distname}.war" todir="${deploy.dir}"/>
+ </target>
+
+</project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java 2010-03-05 15:13:59 UTC (rev 20689)
@@ -0,0 +1,99 @@
+package org.jboss.tools.jst.web.ui.test;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IMarkerResolution;
+import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+import org.jboss.tools.tests.IMarkerFilter;
+
+public class JSPProblemMarkerResolutionTest extends AbstractResourceMarkerTest{
+ IProject project = null;
+
+ public JSPProblemMarkerResolutionTest() {
+ super("JSP Problem Marker Resolution Tests");
+ }
+
+ public JSPProblemMarkerResolutionTest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ JobUtils.waitForIdle();
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("test_jsf_project");
+ if(project == null) {
+ ProjectImportTestSetup setup = new ProjectImportTestSetup(
+ this,
+ "org.jboss.tools.jst.web.ui.test",
+ "projects/test_jsf_project",
+ "test_jsf_project");
+ project = setup.importProject();
+ }
+ this.project = project.getProject();
+ JobUtils.waitForIdle();
+ }
+
+ public void testProblemMarkerResolutionInJSP() throws CoreException {
+ IFile jspFile = project.getFile("WebContent/pages/test_page1.jsp");
+
+ assertMarkerIsCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*");
+
+ IMarker[] markers = findMarkers(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*");
+
+ assertEquals(1, markers.length);
+
+ JSPProblemMarkerResolutionGenerator generator = new JSPProblemMarkerResolutionGenerator();
+
+ for(IMarker marker : markers){
+ generator.hasResolutions(marker);
+ IMarkerResolution[] resolutions = generator.getResolutions(marker);
+ for(IMarkerResolution resolution : resolutions){
+ resolution.run(marker);
+ }
+ }
+
+ refreshProject(project);
+
+ assertMarkerIsNotCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*");
+ }
+
+ public void testProblemMarkerResolutionInXHTML() throws CoreException {
+ IFile jspFile = project.getFile("WebContent/pages/test_page2.xhtml");
+
+ assertMarkerIsCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*");
+
+ IMarker[] markers = findMarkers(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*");
+
+ assertEquals(3, markers.length);
+
+ JSPProblemMarkerResolutionGenerator generator = new JSPProblemMarkerResolutionGenerator();
+
+ for(IMarker marker : markers){
+ generator.hasResolutions(marker);
+ IMarkerResolution[] resolutions = generator.getResolutions(marker);
+ for(IMarkerResolution resolution : resolutions){
+ resolution.run(marker);
+ }
+ }
+
+ refreshProject(project);
+
+ assertMarkerIsNotCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*");
+ }
+
+ private void refreshProject(IProject project){
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ JobUtils.waitForIdle();
+ JobUtils.delay(2000);
+ } catch (CoreException e) {
+ // ignore
+ }
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-03-05 15:13:37 UTC (rev 20688)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-03-05 15:13:59 UTC (rev 20689)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jst.web.ui.test;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -25,6 +27,11 @@
suite.addTestSuite(WebViewsTest.class);
suite.addTestSuite(WebWizardsTest.class);
suite.addTestSuite(JstWebUiPreferencesPagesTest.class);
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(JSPProblemMarkerResolutionTest.class),
+ "org.jboss.tools.jst.web.ui.test",
+ new String[]{"projects/test_jsf_project"},
+ new String[]{"test_jsf_project"}));
+
return suite;
}
}
14 years, 10 months
JBoss Tools SVN: r20688 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-03-05 10:13:37 -0500 (Fri, 05 Mar 2010)
New Revision: 20688
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
Log:
JBIDE-5999: BPEL Editor XPath validator does not recognize return types of XPath functions
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2010-03-05 14:53:55 UTC (rev 20687)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2010-03-05 15:13:37 UTC (rev 20688)
@@ -407,28 +407,37 @@
mVisitor.visit((EqualityExpr) expr);
} else if (expr instanceof RelationalExpr) {
mVisitor.visit((RelationalExpr) expr);
- } else if (expr instanceof FunctionCallExpr) {
- FunctionCallExpr fce = (FunctionCallExpr) expr;
-
- if (isBooleanFunction(fce) == false) {
-
- problem = createWarning();
- problem.fill("XPATH_EXPRESSION_TYPE", toString(mNode.nodeName()),
- exprStringTrimmed, fExprByNode);
- repointOffsets(problem, fce);
+ } else {
+ FunctionCallExpr fce = null;
+ // JBIDE-5999
+ // apparently XPath functions are Unary expressions first
+ if (expr instanceof UnaryExpr && ((UnaryExpr)expr).getExpr() instanceof FunctionCallExpr) {
+ fce = (FunctionCallExpr) ((UnaryExpr)expr).getExpr();
+ } else if (expr instanceof FunctionCallExpr) {
+ fce = (FunctionCallExpr) expr;
}
-
- mVisitor.visit(fce);
-
- } else {
- problem = createError();
- problem.fill("XPATH_EXPRESSION_TYPE", toString(mNode.nodeName()), exprStringTrimmed,
- fExprByNode
-
- );
- repointOffsets(problem, expr);
+
+ if (fce!=null ) {
+ if (isBooleanFunction(fce) == false) {
+
+ problem = createWarning();
+ problem.fill("XPATH_EXPRESSION_TYPE", toString(mNode.nodeName()),
+ exprStringTrimmed, fExprByNode);
+ repointOffsets(problem, fce);
+ }
+
+ mVisitor.visit(fce);
+
+ } else {
+ problem = createError();
+ problem.fill("XPATH_EXPRESSION_TYPE", toString(mNode.nodeName()), exprStringTrimmed,
+ fExprByNode
+
+ );
+ repointOffsets(problem, expr);
+ }
}
-
+
// Once validated this type of expression we are done.
disableRules();
14 years, 10 months
JBoss Tools SVN: r20687 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-05 09:53:55 -0500 (Fri, 05 Mar 2010)
New Revision: 20687
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-03-05 14:53:25 UTC (rev 20686)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-03-05 14:53:55 UTC (rev 20687)
@@ -13,6 +13,7 @@
org.jboss.tools.common,
org.eclipse.ui,
org.eclipse.jdt.core,
- org.jboss.tools.common.el.core
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.common.model.ui
Export-Package: org.jboss.tools.cdi.core.test,
org.jboss.tools.cdi.core.test.tck
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-05 14:53:25 UTC (rev 20686)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-05 14:53:55 UTC (rev 20687)
@@ -13,7 +13,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.cdi.core.test.tck.DefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ValidationTest;
/**
@@ -23,7 +23,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("CDI Core Tests");
- suite.addTestSuite(DefinitionTest.class);
+ suite.addTestSuite(BeanDefinitionTest.class);
suite.addTestSuite(ValidationTest.class);
return suite;
}
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java (from rev 20627, trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java 2010-03-05 14:53:55 UTC (rev 20687)
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IScope;
+import org.jboss.tools.cdi.core.ITypeDeclaration;
+import org.jboss.tools.common.text.ITextSourceReference;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class BeanDefinitionTest extends TCKTest {
+
+ /**
+ * Section 2 - Concepts
+ * a) A bean comprises of a (nonempty) set of bean types.
+ */
+ public void testBeanTypesNonEmpty() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ assertEquals("There should be the only bean in org.jboss.jsr299.tck.tests.definition.bean.RedSnapper", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertTrue("No legal types were found for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", bean.getLegalTypes().size() > 0);
+ Set<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
+ assertEquals("There should be two type declarations in org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", declarations.size(), 2);
+ assertLocationEquals(declarations, 936, 10);
+ assertLocationEquals(declarations, 958, 6);
+ }
+
+ /**
+ * Section 2 - Concepts
+ * b) A bean comprises of a (nonempty) set of qualifiers.
+ * Section 11.1 - The Bean interface
+ * ba) getTypes(), getQualifiers(), getScope(), getName() and getStereotypes() must return the bean types, qualifiers, scope type, EL name and stereotypes of the bean, as defined in Chapter 2, Concepts.
+ */
+ public void testQualifiersNonEmpty() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+
+ Set<IQualifier> qs = beans.iterator().next().getQualifiers();
+ assertTrue("No qualifiers were found for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", qs.size() > 0);
+
+// Use for next, more sophisticated test
+// IQualifier any = cdiProject.getQualifier(CDIConstants.ANY_QUALIFIER_TYPE_NAME);
+// assertTrue("No @Any found for RedSnapper ", qs.contains(any));
+// IQualifier def = cdiProject.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
+// assertTrue("No @Default found for RedSnapper bean", qs.contains(def));
+//
+// file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java");
+// beans = cdiProject.getBeans(file.getFullPath());
+// IBean b = null;
+// for (IBean b1: beans) {
+// if (b1 instanceof IProducer) {
+// b = b1;
+// break;
+// }
+// }
+// qs = b.getQualifiers();
+// assertTrue("No qualifiers were found for org.jboss.jsr299.tck.tests.definition.bean.SpiderProducer bean.", qs.size() > 0);
+// assertTrue("No @Any found for SpiderProducer bean", qs.contains(any));
+ }
+
+ /**
+ * Section 2 - Concepts
+ * c) A bean comprises of a scope.
+ * Section 2.4 - Scopes
+ * a) All beans have a scope.
+ * Section 3.1.3 - Declaring a managed bean
+ * ba) Test a bean with a scope.
+ * Section 11.1 - The Bean interface
+ * ba) getTypes(), getQualifiers(), getScope(), getName() and getStereotypes() must return the bean types, qualifiers, scope type, EL name and stereotypes of the bean, as defined in Chapter 2, Concepts.
+ *
+ */
+ public void testHasScopeType() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ IBean bean = beans.iterator().next();
+ IScope scope = bean.getScope();
+ assertNotNull("org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean desn't have a scope.", scope);
+ assertNotNull("Scope of org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean doesn't have a link to IType.", scope.getSourceType());
+ assertEquals("Wrong scope type for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", "javax.enterprise.context.RequestScoped", scope.getSourceType().getFullyQualifiedName());
+ }
+
+ /**
+ * Section 2.2.1 - Legal bean types
+ * j) A bean type may be a primitive type. Primitive types are considered to be identical to their corresponding wrapper types in java.lang.
+ *
+ * @throws JavaModelException
+ */
+ public void testPrivitiveTypes() throws JavaModelException {
+ IType type = getType("java.lang.Integer");
+ Set<IBean> beans = cdiProject.getBeans(true, type, new IType[0]);
+ assertNotNull("There should be the only bean with int type", beans);
+ assertEquals("There should be the only bean with int type", 1, beans.size());
+ type = getType("org.jboss.jsr299.tck.tests.definition.bean.Animal");
+ beans = cdiProject.getBeans(true, type, new IType[0]);
+ assertNotNull("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.Animal type", beans);
+ assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.Animal type", 1, beans.size());
+ }
+
+ /**
+ * e) A bean comprises of an optional bean EL name.
+ */
+ public void testNonDefaultNamed() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/Moose.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the only bean.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
+ assertLocationEquals(bean.getNameLocation(), 918, 16);
+ }
+
+ /**
+ * e) A bean comprises of an optional bean EL name (continue).
+ */
+ public void testNotNamedInJava() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ assertEquals("org.jboss.jsr299.tck.tests.definition.name.SeaBass should have the only bean.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertNull("org.jboss.jsr299.tck.tests.definition.name.Moose bean should not have any EL name.", bean.getName());
+ }
+
+ private void assertLocationEquals(Set<? extends ITextSourceReference> references, int startPosition, int length) {
+ for (ITextSourceReference reference : references) {
+ if(reference.getStartPosition()==startPosition) {
+ assertLocationEquals(reference, startPosition, length);
+ return;
+ }
+ }
+ StringBuffer message = new StringBuffer("Location [start positopn=").append(startPosition).append(", lengt=").append(length).append("] has not been found among ");
+ for (ITextSourceReference reference : references) {
+ message.append("[").append(reference.getStartPosition()).append(", ").append(reference.getLength()).append("] ");
+ }
+ fail(message.toString());
+ }
+
+ private void assertLocationEquals(ITextSourceReference reference, int startPosition, int length) {
+ assertEquals("Wrong start position", startPosition, reference.getStartPosition());
+ assertEquals("Wrong length", length, reference.getLength());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-05 14:53:25 UTC (rev 20686)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-05 14:53:55 UTC (rev 20687)
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.cdi.core.test.tck;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IQualifier;
-import org.jboss.tools.cdi.core.IScope;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
-import org.jboss.tools.common.text.ITextSourceReference;
-
-/**
- * Section 2 - Concepts
- *
- * @author Alexey Kazakov
- */
-public class DefinitionTest extends TCKTest {
-
- /**
- * a) A bean comprises of a (nonempty) set of bean types.
- */
- public void testBeanTypesNonEmpty() {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
- assertEquals("There should be the only bean in org.jboss.jsr299.tck.tests.definition.bean.RedSnapper", 1, beans.size());
- IBean bean = beans.iterator().next();
- assertTrue("No legal types were found for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", bean.getLegalTypes().size() > 0);
- Set<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
- assertEquals("There should be two type declarations in org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", declarations.size(), 2);
- assertLocationEquals(declarations, 936, 10);
- assertLocationEquals(declarations, 958, 6);
- }
-
- /**
- * b) A bean comprises of a (nonempty) set of qualifiers.
- */
- public void testQualifiersNonEmpty() {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
-
- Set<IQualifier> qs = beans.iterator().next().getQualifiers();
- assertTrue("No qualifiers were found for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", qs.size() > 0);
-
-// Use for next, more sophisticated test
-// IQualifier any = cdiProject.getQualifier(CDIConstants.ANY_QUALIFIER_TYPE_NAME);
-// assertTrue("No @Any found for RedSnapper ", qs.contains(any));
-// IQualifier def = cdiProject.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
-// assertTrue("No @Default found for RedSnapper bean", qs.contains(def));
-//
-// file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/SpiderProducer.java");
-// beans = cdiProject.getBeans(file.getFullPath());
-// IBean b = null;
-// for (IBean b1: beans) {
-// if (b1 instanceof IProducer) {
-// b = b1;
-// break;
-// }
-// }
-// qs = b.getQualifiers();
-// assertTrue("No qualifiers were found for org.jboss.jsr299.tck.tests.definition.bean.SpiderProducer bean.", qs.size() > 0);
-// assertTrue("No @Any found for SpiderProducer bean", qs.contains(any));
- }
-
- /**
- * c) A bean comprises of a scope.
- */
- public void testHasScopeType() {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
- IBean bean = beans.iterator().next();
- IScope scope = bean.getScope();
- assertNotNull("org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean desn't have a scope.", scope);
- assertNotNull("Scope of org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean doesn't have a link to IType.", scope.getSourceType());
- assertEquals("Wrong scope type for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", "javax.enterprise.context.RequestScoped", scope.getSourceType().getFullyQualifiedName());
- }
-
- /**
- * e) A bean comprises of an optional bean EL name.
- */
- public void testNonDefaultNamed() {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/Moose.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
- assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the only bean.", 1, beans.size());
- IBean bean = beans.iterator().next();
- assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
- assertLocationEquals(bean.getNameLocation(), 918, 16);
- }
-
- /**
- * e) A bean comprises of an optional bean EL name (continue).
- */
- public void testNotNamedInJava() {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
- assertEquals("org.jboss.jsr299.tck.tests.definition.name.SeaBass should have the only bean.", 1, beans.size());
- IBean bean = beans.iterator().next();
- assertNull("org.jboss.jsr299.tck.tests.definition.name.Moose bean should not have any EL name.", bean.getName());
- }
-
- private void assertLocationEquals(Set<? extends ITextSourceReference> references, int startPosition, int length) {
- for (ITextSourceReference reference : references) {
- if(reference.getStartPosition()==startPosition) {
- assertLocationEquals(reference, startPosition, length);
- return;
- }
- }
- StringBuffer message = new StringBuffer("Location [start positopn=").append(startPosition).append(", lengt=").append(length).append("] has not been found among ");
- for (ITextSourceReference reference : references) {
- message.append("[").append(reference.getStartPosition()).append(", ").append(reference.getLength()).append("] ");
- }
- fail(message.toString());
- }
-
- private void assertLocationEquals(ITextSourceReference reference, int startPosition, int length) {
- assertEquals("Wrong start position", startPosition, reference.getStartPosition());
- assertEquals("Wrong length", length, reference.getLength());
- }
-}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-05 14:53:25 UTC (rev 20686)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-05 14:53:55 UTC (rev 20687)
@@ -11,8 +11,12 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -57,6 +61,10 @@
return tckProject;
}
+ protected IType getType(String name) throws JavaModelException {
+ return EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), name);
+ }
+
public static IProject findTestProject() {
return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
}
14 years, 10 months
JBoss Tools SVN: r20686 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: outline/cssdialog/cssselector and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-03-05 09:53:25 -0500 (Fri, 05 Mar 2010)
New Revision: 20686
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3288 tooltips for buttons are changed to correct.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2010-03-05 14:41:13 UTC (rev 20685)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2010-03-05 14:53:25 UTC (rev 20686)
@@ -116,4 +116,6 @@
public static String JSPDialogContentProposalProvider_NewELExpression;
public static String PROPERTY_NAME_COLUMN;
public static String PROPERTY_VALUE_COLUMN;
+ public static String CSS_ADD_CSS_CLASS_TIP;
+ public static String CSS_REMOVE_CSS_CLASS_TIP;
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2010-03-05 14:41:13 UTC (rev 20685)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2010-03-05 14:53:25 UTC (rev 20686)
@@ -6,6 +6,8 @@
CSS_EMPTY_FILE_PATH_MESSAGE=Choose any CSS file
CSS_EMPTY_STYLE_CLASS_MESSAGE=Style class field is empty
CSS_INVALID_STYLE_PROPERTY=Invalid Style class property has been entered.
+CSS_ADD_CSS_CLASS_TIP=Add CSS class
+CSS_REMOVE_CSS_CLASS_TIP=Remove CSS class
#CSS_SAVE_DIALOG_TITLE=Save CSS file
CSS_CLASS_DIALOG_FILE_LABEL=CSS file:
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java 2010-03-05 14:41:13 UTC (rev 20685)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/CSSSelectorPartComposite.java 2010-03-05 14:53:25 UTC (rev 20686)
@@ -233,7 +233,7 @@
leftButton = new Button(buttonsContainer, SWT.PUSH);
selectedClassesTableViewer = new CSSSelectorTableViewer(this, SWT.MULTI
| SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- rightButton.setToolTipText(JstUIMessages.ADD_FONT_FAMILY_TIP);
+ rightButton.setToolTipText(JstUIMessages.CSS_ADD_CSS_CLASS_TIP);
ImageDescriptor rightDesc = JspEditorPlugin
.getImageDescriptor(Constants.IMAGE_RIGHT_FILE_LOCATION);
Image rightImage = rightDesc.createImage();
@@ -246,7 +246,7 @@
}
});
- leftButton.setToolTipText(JstUIMessages.REMOVE_FONT_FAMILY_TIP);
+ leftButton.setToolTipText(JstUIMessages.CSS_REMOVE_CSS_CLASS_TIP);
ImageDescriptor leftDesc = JspEditorPlugin
.getImageDescriptor(Constants.IMAGE_LEFT_FILE_LOCATION);
14 years, 10 months
JBoss Tools SVN: r20684 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-03-05 08:52:12 -0500 (Fri, 05 Mar 2010)
New Revision: 20684
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5874 -- drop down command launching was changed to asuncExec().
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2010-03-05 12:01:46 UTC (rev 20683)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2010-03-05 13:52:12 UTC (rev 20684)
@@ -741,9 +741,9 @@
* Fixes https://jira.jboss.org/jira/browse/JBIDE-5874
* Display.getDefault() should always be replaced by
* PlatformUI.getWorkbench().getDisplay().
- * syncExec() will reduce the number if simultaneously launched threads.
+ * syncExec() can hang the JBDS thus asyncExec is used.
*/
- PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
+ PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
public void run() {
if (o != null
&& !XModelTransferBuffer.getInstance().isEnabled()) {
14 years, 10 months
JBoss Tools SVN: r20683 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-03-05 07:01:46 -0500 (Fri, 05 Mar 2010)
New Revision: 20683
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5998
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2010-03-05 11:40:27 UTC (rev 20682)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2010-03-05 12:01:46 UTC (rev 20683)
@@ -149,6 +149,7 @@
import org.jboss.tools.jst.web.kb.taglib.IAttribute;
import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.INameSpace;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.jst.web.kb.taglib.TagLibraryManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
@@ -797,6 +798,7 @@
if(n == null && pageContext instanceof JspContextImpl) {
IRegion r = new Region(query.getOffset(), 0);
((JspContextImpl)pageContext).addNameSpace(r, new NameSpace(query.getUri(), query.getPrefix(),
+ pageContext.getResource() == null ? new ITagLibrary[0] :
TagLibraryManager.getLibraries(
pageContext.getResource().getProject(), query.getUri())));
// ((JspContextImpl)pageContext).setLibraries(processor.getTagLibraries(pageContext));
14 years, 10 months
JBoss Tools SVN: r20682 - trunk/documentation/guides/GettingStartedGuide/en/images/getting_started.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-05 06:40:27 -0500 (Fri, 05 Mar 2010)
New Revision: 20682
Added:
trunk/documentation/guides/GettingStartedGuide/en/images/getting_started/getting_started_10.png
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-905 -updated GSG according to the forum post http://community.jboss.org/thread/147702?tstart=0.Added the description of the problem that can appear while recalculating dependences in 'Install New Software' dialog to "JBoss Tools Installation and Update" section.</p>
</body></html>
Added: trunk/documentation/guides/GettingStartedGuide/en/images/getting_started/getting_started_10.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en/images/getting_started/getting_started_10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 10 months
JBoss Tools SVN: r20681 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-05 06:37:50 -0500 (Fri, 05 Mar 2010)
New Revision: 20681
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1107 -Added Beginners Guide to doc bundle</p>
</body></html>
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml 2010-03-05 08:00:46 UTC (rev 20680)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml 2010-03-05 11:37:50 UTC (rev 20681)
@@ -637,7 +637,29 @@
</mediaobject>
</figure>
</listitem>
- <listitem> <para>If Jboss Tools are already installed on your Eclipse and you are doing updating but not
+ <listitem>
+ <para>And the system checks whether all necessary requirements and
+ dependencies are installed on your Eclipse.</para>
+ <figure>
+ <title>Requirements and
+ dependencies check</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/getting_started_10.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>If some of them are missing an error message will appear and
+ the installation process will be terminated.
+ </para>
+ <note>
+ <title>Note:</title>
+ <para>Sometimes when a user changes the list of plugins for download and clicks
+ <emphasis>Next</emphasis>, after required dependences check,
+ the list of missing dependencies of the previous attempt is showed.
+ In this case the completely close of the <emphasis>Install New Software</emphasis> dialog can help.</para>
+ </note>
+ <para>If Jboss Tools are already installed on your Eclipse and you are doing updating but not
installation the following messages will appear in your <emphasis>Details</emphasis> section.
Ignore them and press <emphasis>Next.</emphasis></para>
<figure>
14 years, 10 months