JBoss Tools SVN: r7048 - in trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets: FaceletsKickStartWithoutLibs/WebContent/pages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-20 13:48:43 -0400 (Thu, 20 Mar 2008)
New Revision: 7048
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1937
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml 2008-03-20 16:02:05 UTC (rev 7047)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml 2008-03-20 17:48:43 UTC (rev 7048)
@@ -11,7 +11,7 @@
<ui:define name="pageTitle">Input User Name</ui:define>
- <ui:define name="pageHeader"Facelets Hello Application</ui:define>
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
<ui:define name="body">
<h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" />
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml 2008-03-20 16:02:05 UTC (rev 7047)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml 2008-03-20 17:48:43 UTC (rev 7048)
@@ -11,7 +11,7 @@
<ui:define name="pageTitle">Input User Name</ui:define>
- <ui:define name="pageHeader"Facelets Hello Application</ui:define>
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
<ui:define name="body">
<h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" />
18 years
JBoss Tools SVN: r7047 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-20 12:02:05 -0400 (Thu, 20 Mar 2008)
New Revision: 7047
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1779
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-03-20 15:41:46 UTC (rev 7046)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-03-20 16:02:05 UTC (rev 7047)
@@ -33,6 +33,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -554,7 +555,7 @@
final String deploymentType = value.toString();
if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
- Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME);
+ Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
if(runtimeName!=null) {
IRuntime rt = RuntimeManager.getRuntime(runtimeName.toString());
if(!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
18 years
JBoss Tools SVN: r7045 - in trunk/seam/docs/reference/en/images: testng and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-20 11:40:50 -0400 (Thu, 20 Mar 2008)
New Revision: 7045
Modified:
trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_5.png
trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_6.png
trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_7.png
trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_8.png
trunk/seam/docs/reference/en/images/testng/testng_12.png
trunk/seam/docs/reference/en/images/testng/testng_13.png
trunk/seam/docs/reference/en/images/testng/testng_14.png
Log:
http://jira.jboss.com/jira/browse/JBDS-262 Seam guide.Screens have been updated according to the Red Har emblem
Modified: trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_5.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_6.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_7.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_application_walkthrough/crud_application_walkthrough_8.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/testng/testng_12.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/testng/testng_13.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/testng/testng_14.png
===================================================================
(Binary files differ)
18 years
JBoss Tools SVN: r7044 - in trunk/documentation/guides/GettingStartedGuide/en/images: jsp_application and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-20 11:38:22 -0400 (Thu, 20 Mar 2008)
New Revision: 7044
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam_18.png
trunk/documentation/guides/GettingStartedGuide/en/images/jsp_application/jsp_application_17.png
trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_20.png
trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_21.png
trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_22.png
trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_23.png
Log:
http://jira.jboss.com/jira/browse/JBDS-262 GSG.Screens have been updated according to the Red Har emblem
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam_18.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/jsp_application/jsp_application_17.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_20.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_21.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_22.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_23.png
===================================================================
(Binary files differ)
18 years
JBoss Tools SVN: r7043 - in trunk/documentation/guides: GettingStartedGuide and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-20 11:30:55 -0400 (Thu, 20 Mar 2008)
New Revision: 7043
Modified:
trunk/documentation/guides/Exadel-migration/pom.xml
trunk/documentation/guides/GettingStartedGuide/pom.xml
trunk/documentation/guides/Legacy-jsf-struts/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
enterprise styles are added
Modified: trunk/documentation/guides/Exadel-migration/pom.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/pom.xml 2008-03-20 14:23:10 UTC (rev 7042)
+++ trunk/documentation/guides/Exadel-migration/pom.xml 2008-03-20 15:30:55 UTC (rev 7043)
@@ -19,14 +19,14 @@
<extensions>true</extensions>
<dependencies>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-docbook-xslt</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/documentation/guides/GettingStartedGuide/pom.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/pom.xml 2008-03-20 14:23:10 UTC (rev 7042)
+++ trunk/documentation/guides/GettingStartedGuide/pom.xml 2008-03-20 15:30:55 UTC (rev 7043)
@@ -19,14 +19,14 @@
<extensions>true</extensions>
<dependencies>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-docbook-xslt</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/documentation/guides/Legacy-jsf-struts/pom.xml
===================================================================
--- trunk/documentation/guides/Legacy-jsf-struts/pom.xml 2008-03-20 14:23:10 UTC (rev 7042)
+++ trunk/documentation/guides/Legacy-jsf-struts/pom.xml 2008-03-20 15:30:55 UTC (rev 7043)
@@ -7,6 +7,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>legacy-jsf-struts-guide-${translation}</artifactId>
<version>1.0-SNAPSHOT</version>
+
<packaging>jdocbook</packaging>
<name>Legacy_JSF_Struts_Guide_(${translation})</name>
@@ -19,14 +20,14 @@
<extensions>true</extensions>
<dependencies>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-docbook-xslt</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
18 years
JBoss Tools SVN: r7042 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test/refactoring and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-20 10:23:10 -0400 (Thu, 20 Mar 2008)
New Revision: 7042
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1919 Added JUnit tests for source folder renaming.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-03-20 13:51:37 UTC (rev 7041)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-03-20 14:23:10 UTC (rev 7042)
@@ -6,7 +6,8 @@
Bundle-ClassPath: seam-core-tests.jar
Bundle-Vendor: Red Hat, Inc.
Export-Package: org.jboss.tools.seam.core.test,
- org.jboss.tools.seam.core.test.project.facet
+ org.jboss.tools.seam.core.test.project.facet,
+ org.jboss.tools.seam.core.test.refactoring
Require-Bundle:
org.junit,
org.eclipse.core.runtime,
@@ -30,5 +31,6 @@
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
org.eclipse.ui.ide,
- org.eclipse.jface
+ org.eclipse.jface,
+ org.eclipse.jdt.core.manipulation
Provide-Package: org.jboss.tools.seam.core.test
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-03-20 13:51:37 UTC (rev 7041)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-03-20 14:23:10 UTC (rev 7042)
@@ -14,16 +14,21 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.ui.refactoring.RenameSupport;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
@@ -38,10 +43,14 @@
static String warProjectName = "RefactoringTestProject-war";
static String ejbProjectName = "RefactoringTestProject-ejb";
static String testProjectName = "RefactoringTestProject-test";
- static String actionSourceFolderName = "/" + ejbProjectName + "/src";
- static String modelSourceFolderName = "/" + warProjectName + "/src";
- static String testSourceFolderName = "/" + testProjectName + "/src";
- static String viewFolderName = "/" + warProjectName + "/WebContent";
+ static String actionSourceFolderName = "src";
+ static String modelSourceFolderName = "src";
+ static String testSourceFolderName = "src";
+ static String actionSourceFolderPath = "/" + ejbProjectName + "/" + actionSourceFolderName;
+ static String modelSourceFolderPath = "/" + warProjectName + "/" + modelSourceFolderName;
+ static String testSourceFolderPath = "/" + testProjectName + "/" + testSourceFolderName;
+ static String viewFolderName = "WebContent";
+ static String viewFolderPath = "/" + warProjectName + "/" + viewFolderName;
static IProject warProject;
static IProject ejbProject;
static IProject testProject;
@@ -92,55 +101,142 @@
public void testWarProjectRename() throws CoreException {
warProjectName = "NewWarProjectName";
- modelSourceFolderName = "/" + warProjectName + "/src";
- viewFolderName = "/" + warProjectName + "/WebContent";
+ updateFields();
warProject = renameProject(warProject, warProjectName);
seamWarProject = SeamCorePlugin.getSeamProject(warProject, true);
String newParentName = seamEjbProject.getParentProjectName();
- assertEquals(warProjectName, newParentName);
+ assertEquals("WAR project was renamed but parent seam project property for EJB project was not.", warProjectName, newParentName);
newParentName = seamTestProject.getParentProjectName();
- assertEquals(warProjectName, newParentName);
+ assertEquals("WAR project was renamed but parent seam project property for test project was not.", warProjectName, newParentName);
IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
String modelSources = pref.get(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, "");
- assertEquals(modelSourceFolderName, modelSources);
+ assertEquals("WAR project was renamed but model source folder property was not.", modelSourceFolderPath, modelSources);
String viewFolder = pref.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, "");
- assertEquals(viewFolderName, viewFolder);
+ assertEquals("WAR project was renamed but view folder property was not.", viewFolderPath, viewFolder);
}
public void testEjbProjectRename() throws CoreException {
ejbProjectName = "NewEjbProjectName";
- actionSourceFolderName = "/" + ejbProjectName + "/src";
+ updateFields();
ejbProject = renameProject(ejbProject, ejbProjectName);
seamEjbProject = SeamCorePlugin.getSeamProject(ejbProject, true);
IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
String newEjbName = pref.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, "");
- assertEquals(ejbProjectName, newEjbName);
+ assertEquals("EJB project was renamed but property was not.", ejbProjectName, newEjbName);
String actionSources = pref.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, "");
- assertEquals(actionSourceFolderName, actionSources);
+ assertEquals("EJB project was renamed but action source folder property was not.", actionSourceFolderPath, actionSources);
}
public void testTestProjectRename() throws CoreException {
testProjectName = "NewTestProjectName";
- testSourceFolderName = "/" + testProjectName + "/src";
+ updateFields();
testProject = renameProject(testProject, testProjectName);
seamTestProject = SeamCorePlugin.getSeamProject(testProject, true);
String newTestName = SeamCorePlugin.getSeamPreferences(warProject).get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, "");
- assertEquals(testProjectName, newTestName);
+ assertEquals("Test project was renamed but property was not.", testProjectName, newTestName);
IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
String testSources = pref.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, "");
- assertEquals(testSourceFolderName, testSources);
+ assertEquals("Test project was renamed but test source folder property was not.", testSourceFolderPath, testSources);
}
+ public void testActionSourceFolderRename() throws CoreException {
+ actionSourceFolderName = "newActionSrc";
+ renameSourceFolder(actionSourceFolderPath, actionSourceFolderName);
+ updateFields();
+
+ IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
+ String actionSources = pref.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, "");
+ assertEquals("Action source folder was renamed but property was not.", actionSourceFolderPath, actionSources);
+ }
+
+ public void testModelSourceFolderRename() throws CoreException {
+ modelSourceFolderName = "newModelSrc";
+ renameSourceFolder(modelSourceFolderPath, modelSourceFolderName);
+ updateFields();
+
+ IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
+ String modelSources = pref.get(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, "");
+ assertEquals("Model source folder was renamed but property was not.", modelSourceFolderPath, modelSources);
+ }
+
+ public void testTestSourceFolderRename() throws CoreException {
+ testSourceFolderName = "newTestSrc";
+ renameSourceFolder(testSourceFolderPath, testSourceFolderName);
+ updateFields();
+
+ IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
+ String testSources = pref.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, "");
+ assertEquals("Test source folder was renamed but property was not.", testSourceFolderPath, testSources);
+ }
+
+ public void testViewFolderRename() throws CoreException {
+ viewFolderName = "newViewFolder";
+ renameFolder(viewFolderPath, viewFolderName);
+ updateFields();
+
+ IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(warProject);
+ String viewFolder = pref.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, "");
+ assertEquals("View folder was renamed but property was not.", viewFolderPath, viewFolder);
+ }
+
+ private void updateFields() {
+ actionSourceFolderPath = "/" + ejbProjectName + "/" + actionSourceFolderName;
+ modelSourceFolderPath = "/" + warProjectName + "/" + modelSourceFolderName;
+ testSourceFolderPath = "/" + testProjectName + "/" + testSourceFolderName;
+ viewFolderPath = "/" + warProjectName + "/" + viewFolderName;
+ }
+
+ private IPackageFragmentRoot renameSourceFolder(String folderPath, String newFolderName) throws CoreException {
+ IPackageFragmentRoot packageFragmentRoot = getSourceFolder(folderPath);
+ IProject project = packageFragmentRoot.getResource().getProject();
+ performRename(RenameSupport.create(packageFragmentRoot, newFolderName));
+ String newPath = project.getFullPath().toString() + "/" + newFolderName;
+ IPackageFragmentRoot newPackageFragmentRoot = getSourceFolder(newPath);
+ assertNotNull("Cannot find renamed source folder: " + newPath, newPackageFragmentRoot);
+ return newPackageFragmentRoot;
+ }
+
+ private IPackageFragmentRoot getSourceFolder(String folderPath) {
+ IResource initSourceFolder = ResourcesPlugin.getWorkspace().getRoot().findMember(folderPath);
+ assertNotNull("Can't find source folder: " + folderPath, initSourceFolder);
+ IProject project = initSourceFolder.getProject();
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(project);
+ IPackageFragmentRoot packageFragmentRoot = null;
+ try {
+ IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
+ for (int i = 0; i < roots.length; i++) {
+ if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE && roots[i].getResource().equals(initSourceFolder)) {
+ packageFragmentRoot = roots[i];
+ break;
+ }
+ }
+ } catch (JavaModelException e) {
+ JUnitUtils.fail("Exception during searching source folder: " + folderPath, e);
+ }
+ assertNotNull("Can't find source folder: " + folderPath, packageFragmentRoot);
+ return packageFragmentRoot;
+ }
+
+ private IFolder renameFolder(String folderPath, String newFolderName) throws CoreException {
+ return null;
+ }
+
private IProject renameProject(IProject project, String newProjectName) throws CoreException {
- RenameSupport support = RenameSupport.create(JavaCore.create(project), newProjectName, RenameSupport.UPDATE_REFERENCES);
+ performRename(RenameSupport.create(JavaCore.create(project), newProjectName, RenameSupport.UPDATE_REFERENCES));
+ IProject renamedProject = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(newProjectName);
+ assertNotNull("Can't load renamed project " + newProjectName, renamedProject);
+ return renamedProject;
+ }
+
+ private void performRename(RenameSupport support) throws CoreException {
Shell parent = WorkbenchUtils.getActiveShell();
IWorkbenchWindow context = WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow();
try {
@@ -150,11 +246,6 @@
} catch (InvocationTargetException e) {
JUnitUtils.fail("Rename failed", e);
}
-
EditorTestHelper.joinBackgroundActivities();
-
- IProject renamedProject = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(newProjectName);
- assertNotNull("Can't load renamed project " + newProjectName, renamedProject);
- return renamedProject;
}
}
\ No newline at end of file
18 years
JBoss Tools SVN: r7041 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-03-20 09:51:37 -0400 (Thu, 20 Mar 2008)
New Revision: 7041
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1697, facet "label" added
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-03-20 12:55:49 UTC (rev 7040)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-03-20 13:51:37 UTC (rev 7041)
@@ -118,7 +118,8 @@
boolean active = (i == activeId);
if(child.getNodeName().endsWith(TAB)) {
- RichFacesTabTemplate.encodeHeader((Element) child,
+ RichFacesTabTemplate.encodeHeader(creationData,
+ (Element) child,
visualDocument, inerTr, active,
ComponentUtil.getAttribute(sourceElement,
ACTIVE_TAB_CLASS),
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-03-20 12:55:49 UTC (rev 7040)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-03-20 13:51:37 UTC (rev 7041)
@@ -132,8 +132,9 @@
* @param inactiveTabClass
* @param disabledTabClass
*/
- public static void encodeHeader(Element sourceElement,
- nsIDOMDocument visualDocument,
+ public static void encodeHeader(VpeCreationData creationData,
+ Element sourceElement,
+ nsIDOMDocument visualDocument,
nsIDOMElement parentDiv,
boolean active,
String activeTabClass,
@@ -218,12 +219,19 @@
String style = "background-image: url(file:///" + bgImgPath.replace('\\', '/') + ");";
td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, style);
td.setAttribute(VPE_USER_TOGGLE_ID, toggleId);
- String label = sourceElement.getAttribute(LABEL);
- if(label==null) {
+ Node labelFacet = ComponentUtil.getFacet(sourceElement, LABEL, true);
+ String labelAttr = sourceElement.getAttribute(LABEL);
+ if (null != labelFacet) {
+ VpeChildrenInfo child = new VpeChildrenInfo(td);
+ child.addSourceChild(labelFacet);
+ creationData.addChildrenInfo(child);
+ } else if (null != labelAttr) {
+ td.appendChild(visualDocument.createTextNode(labelAttr));
+ } else {
char space = 160;
- label = EMPTY + space;
+ labelAttr = EMPTY + space;
+ td.appendChild(visualDocument.createTextNode(labelAttr));
}
- td.appendChild(visualDocument.createTextNode(label));
encodeSpacer(mainTr, visualDocument);
}
18 years
JBoss Tools SVN: r7040 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-03-20 08:55:49 -0400 (Thu, 20 Mar 2008)
New Revision: 7040
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1697, dir attr added, code adjustment
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-03-20 12:46:17 UTC (rev 7039)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-03-20 12:55:49 UTC (rev 7040)
@@ -44,6 +44,9 @@
private final String HEADER_ALINGMENT = "headerAlignment"; //$NON-NLS-1$
private final String HEADER_SPACING = "headerSpacing"; //$NON-NLS-1$
private final String SELECTED_TAB = "selectedTab"; //$NON-NLS-1$
+ private final String DIR = "dir"; //$NON-NLS-1$
+ private final String DIR_RTL = "RTL"; //$NON-NLS-1$
+ private final String DIR_LTR = "LTR"; //$NON-NLS-1$
private final String CONTENT_CLASS = "contentClass"; //$NON-NLS-1$
private final String CONTENT_STYLE = "contentStyle"; //$NON-NLS-1$
@@ -52,7 +55,6 @@
private final String INACTIVE_TAB_CLASS = "inactiveTabClass"; //$NON-NLS-1$
private final String DISABLED_TAB_CLASS = "disabledTabClass"; //$NON-NLS-1$
-
private final String ZERO = "0"; //$NON-NLS-1$
private final String ONE = "1"; //$NON-NLS-1$
private final String TWO = "2"; //$NON-NLS-1$
@@ -72,6 +74,7 @@
VpeCreationData creationData = new VpeCreationData(table);
ComponentUtil.setCSSLink(pageContext, CSS_FILE_PATH, RICH_FACES_TAB_PANEL);
+ setDirAttr(table, sourceElement);
table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
ComponentUtil.getAttribute(sourceElement, HtmlComponentUtil.HTML_STYLECLASS_ATTR)
+ SPACE + CSS_PANEL
@@ -262,6 +265,22 @@
return style;
}
+
+
+ /**
+ * Sets the dir attribute to the element.
+ *
+ * @param element the element
+ * @param dir the dir value
+ */
+ private void setDirAttr(nsIDOMElement element, Element sourceElement) {
+ String dir = ComponentUtil.getAttribute(sourceElement, DIR);
+ if ((null != dir) && (!EMPTY.equals(dir))){
+ if ((DIR_LTR.equalsIgnoreCase(dir)) || (DIR_RTL.equalsIgnoreCase(dir))) {
+ element.setAttribute(DIR, dir);
+ }
+ }
+ }
private String getHeaderAlignment(Element sourceElement) {
String headerAlignment = sourceElement.getAttribute(HEADER_ALINGMENT);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-03-20 12:46:17 UTC (rev 7039)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-03-20 12:55:49 UTC (rev 7040)
@@ -34,6 +34,7 @@
private static final String DISABLED = "disabled"; //$NON-NLS-1$
private static final String LABEL = "label"; //$NON-NLS-1$
+ private static final String LABEL_WIDTH = "labelWidth"; //$NON-NLS-1$
private static final String CSS_HEADER = "rich-tab-header"; //$NON-NLS-1$
private static final String CSS_LABEL = "rich-tab-label"; //$NON-NLS-1$
@@ -76,7 +77,6 @@
nsIDOMElement td = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
if(creationData==null) {
-
creationData = new VpeCreationData(td);
} else {
parentTr.appendChild(td);
@@ -86,7 +86,6 @@
}
// td.setAttribute("style", "position: relative;");
td.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, "100%");
-
nsIDOMElement table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
td.appendChild(table);
@@ -175,7 +174,7 @@
td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-tbpnl-tbtopbrdr"
+ SPACE + RichFacesTabPanelTemplate.CSS_SIDE_CELL);
td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: "
- + ComponentUtil.getAttribute(sourceElement,"labelWidth") + ";");
+ + ComponentUtil.getAttribute(sourceElement, LABEL_WIDTH) + ";");
td.setAttribute(VPE_USER_TOGGLE_ID, toggleId);
table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
18 years
JBoss Tools SVN: r7039 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/java and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-20 08:46:17 -0400 (Thu, 20 Mar 2008)
New Revision: 7039
Removed:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/JavaScanner.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java
Log:
JBIDE-1750 TypeInfoCollector moved to common plugin.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -28,6 +28,7 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextViewer;
+import org.jboss.tools.common.model.util.TypeInfoCollector;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamProject;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -16,6 +16,7 @@
import java.util.Set;
import org.eclipse.jdt.core.IMember;
+import org.jboss.tools.common.model.util.TypeInfoCollector;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -1,942 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.seam.internal.core.el;
-
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.jboss.tools.common.model.util.EclipseJavaUtil;
-import org.jboss.tools.seam.core.SeamCorePlugin;
-
-/**
- * This class helps to collect information of java elements used in Seam EL.
- * @author Viktor Rubezhny, Alexey Kazakov
- */
-public class TypeInfoCollector {
- IType fType;
- MemberInfo fMember;
- List<MethodInfo> fMethods;
- List<FieldInfo> fFields;
-
- public static class Type {
- private String fName;
- private String fQualifiedName;
- private Type[] fParameters;
- private IType fSource;
- private String fSignature;
- private boolean fIsArray;
- private Type fTypeOfArrayElement;
- private String fQualifiedTypeNameOfArrayElement;
-
- private Type() {
- }
-
- public static Type valueOf(String name) {
- Type instance = new Type();
- instance.setName(name);
- instance.setParameters(new Type[0]);
- return instance;
- }
-
- public Type(String signature, IType source) {
- String erasureSignature = Signature.getTypeErasure(signature);
- String typeOfArraySiganture = Signature.getElementType(erasureSignature);
- fName = String.valueOf(Signature.toString(erasureSignature));
- if(!erasureSignature.equals(typeOfArraySiganture)) {
- // this is an array
- fIsArray = true;
- fTypeOfArrayElement = new Type(typeOfArraySiganture, source);
- }
- String[] signaturesOfParametersOfType = Signature.getTypeArguments(signature);
- fParameters = new Type[signaturesOfParametersOfType.length];
- for (int i = 0; i < signaturesOfParametersOfType.length; i++) {
- fParameters[i] = new Type(signaturesOfParametersOfType[i], source);
- }
- fSource = source;
- }
-
- public void initializeParameters(Map<String, Type> parameters) {
- Type type = parameters.get(fName);
- if(type!=null) {
- fName = type.getName();
- fParameters = type.getParameters();
- fSource = type.getSource();
- fIsArray = type.isArray();
- fTypeOfArrayElement = type.getTypeOfArrayElement();
- }
- for (int i = 0; i < fParameters.length; i++) {
- fParameters[i].initializeParameters(parameters);
- }
- }
-
- public Type getParameter(int index) {
- if(fParameters.length>index) {
- return fParameters[index];
- }
- return null;
- }
-
- public String getQualifiedTypeNameOfArrayElement() {
- if(fQualifiedTypeNameOfArrayElement==null && fSource!=null) {
- fQualifiedTypeNameOfArrayElement = EclipseJavaUtil.resolveType(fSource, fTypeOfArrayElement.getName());
- }
- return fQualifiedTypeNameOfArrayElement;
- }
-
- public String getQualifiedName() {
- if(fQualifiedName == null && fSource!=null) {
- fQualifiedName = EclipseJavaUtil.resolveType(fSource, fName);
- }
- return fQualifiedName;
- }
-
- public boolean isArray() {
- return fIsArray;
- }
-
- public void setArray(boolean array) {
- fIsArray = array;
- }
-
- public Type getTypeOfArrayElement() {
- return fTypeOfArrayElement;
- }
-
- public void setTypeOfArrayElement(Type typeOfArrayElement) {
- fTypeOfArrayElement = typeOfArrayElement;
- }
-
- public String getName() {
- return fName;
- }
-
- public void setName(String name) {
- fName = name;
- }
-
- public Type[] getParameters() {
- return fParameters;
- }
-
- public void setParameters(Type[] parameters) {
- this.fParameters = parameters;
- }
-
- public IType getSource() {
- return fSource;
- }
-
- public void setSource(IType source) {
- this.fSource = source;
- }
-
- public String getSignature() {
- return fSignature;
- }
-
- public void setSignature(String signature) {
- this.fSignature = signature;
- }
- }
-
- public abstract static class MemberInfo {
- private String fDeclaringTypeQualifiedName;
- private String fName;
- private int fModifiers;
- private IType fSourceType;
- private MemberInfo fParentMember;
- private String[] fParametersNamesOfDeclaringType;
- private IType fMemberType;
- private boolean isDataModel;
- private Type fType;
-
- TypeInfoCollector typeInfo;
-
- protected MemberInfo (
- IType sourceType,
- String declaringTypeQualifiedName, String name, int modifiers, MemberInfo parentMember, boolean dataModel, Type type) {
- setSourceType(sourceType);
- setDeclaringTypeQualifiedName(declaringTypeQualifiedName);
- setName(name);
- setModifiers(modifiers);
- setParentMember(parentMember);
- setDataModel(dataModel);
- setType(type);
- }
-
- protected void initializeParametersOfDeclaringType() {
- if(fParametersNamesOfDeclaringType!=null && fParametersNamesOfDeclaringType.length>0 && getParentMember()!=null) {
- Map<String, Type> parametersOfDeclaringType = new HashMap<String, Type>();
- for (int i = 0; i < fParametersNamesOfDeclaringType.length; i++) {
- String parameterName = getParameterNameFromType(fParametersNamesOfDeclaringType[i]);
- Type paramType = getParentMember().getType().getParameter(i);
- if(paramType!=null) {
- parametersOfDeclaringType.put(parameterName, paramType);
- }
- }
- getType().initializeParameters(parametersOfDeclaringType);
- }
- }
-
- protected void setType(Type type) {
- fType = type;
- }
-
- public Type getType() {
- return fType;
- }
-
- public void setSourceType(IType sourceType) {
- fSourceType = sourceType;
- }
-
- public IType getSourceType() {
- return fSourceType;
- }
-
- protected void setName (String name) {
- this.fName = name;
- }
-
- public String getName() {
- return fName;
- }
-
- protected void setDeclaringTypeQualifiedName(String declaringTypeQualifiedName) {
- this.fDeclaringTypeQualifiedName = declaringTypeQualifiedName;
- }
-
- public String getDeclaringTypeQualifiedName() {
- return fDeclaringTypeQualifiedName;
- }
-
- protected void setModifiers (int modifiers) {
- this.fModifiers = modifiers;
- }
-
- public int getModifiers() {
- return fModifiers;
- }
-
- public boolean isPublic() {
- return Modifier.isPublic(fModifiers);
- }
-
- public boolean isStatic() {
- return Modifier.isStatic(fModifiers);
- }
-
- public boolean isJavaLangObject() {
- return "java.lang.Object".equals(getDeclaringTypeQualifiedName());
- }
-
- public MemberInfo getParentMember() {
- return fParentMember;
- }
-
- void setParentMember(MemberInfo parentMember) {
- fParentMember = parentMember;
- }
-
- public String[] getParametersNamesOfDeclaringType() {
- return fParametersNamesOfDeclaringType;
- }
-
- void setParametersNamesOfDeclaringType(
- String[] parametersNamesOfDeclaringType) {
- fParametersNamesOfDeclaringType = parametersNamesOfDeclaringType;
- }
-
- public IType getMemberType() {
- if(fMemberType==null) {
- initializeParametersOfDeclaringType();
- try {
- if(isDataModel() && getType().isArray()) {
- fMemberType = getSourceType().getJavaProject().findType(getType().getQualifiedTypeNameOfArrayElement());
- } else {
- fMemberType = getSourceType().getJavaProject().findType(getType().getQualifiedName());
- }
- } catch (JavaModelException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
- }
- return fMemberType;
- }
-
- public boolean isDataModel() {
- return isDataModel;
- }
-
- void setDataModel(boolean isDataModel) {
- this.isDataModel = isDataModel;
- }
-
- public TypeInfoCollector getTypeCollector() {
- if(typeInfo == null) {
- typeInfo = new TypeInfoCollector(this);
- typeInfo.collectInfo();
- }
- return typeInfo;
- }
-
- abstract public IJavaElement getJavaElement();
- }
-
- public static class TypeInfo extends MemberInfo {
- private IType fType;
-
- public TypeInfo(IType type, MemberInfo parentMember, boolean dataModel) throws JavaModelException {
- super(type.getDeclaringType(), (type.getDeclaringType() == null ? null : type.getDeclaringType().getFullyQualifiedName()), type.getFullyQualifiedName(), type.getFlags(), parentMember, dataModel, Type.valueOf(type.getFullyQualifiedName()));
- this.fType = type;
- }
-
- @Override
- public IType getMemberType() {
- return fType;
- }
-
- @Override
- public IJavaElement getJavaElement() {
- return fType;
- }
- }
-
- public static class FieldInfo extends MemberInfo {
- private IJavaElement fJavaElement;
-
- public FieldInfo(IField field, MemberInfo parentMember, boolean dataModel) throws JavaModelException {
- super(field.getDeclaringType(),
- (field.getDeclaringType() == null ? null : field.getDeclaringType().getFullyQualifiedName()),
- field.getElementName(),
- field.getFlags(),
- parentMember,
- dataModel,
- new Type(field.getTypeSignature(),
- field.getDeclaringType()));
-
- setParametersNamesOfDeclaringType(getTypeErasureFromSignatureArray(field.getDeclaringType().getTypeParameterSignatures()));
- }
-
- public IJavaElement getJavaElement () {
- if(fJavaElement == null) {
- try {
- IType declType = getSourceType().getJavaProject().findType(getDeclaringTypeQualifiedName());
- fJavaElement = (declType == null ? null : declType.getField(getName()));
- } catch (JavaModelException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
- }
- return fJavaElement;
- }
- }
-
- public static class MethodInfo extends MemberInfo {
- private String[] fParameterTypeNames;
- private String[] fParameterTypeQualifiedNames;
- private String[] fParameterNames;
- private IJavaElement fJavaElement;
-
- public MethodInfo(IType sourceType, String declaringTypeQualifiedName, String name,
- int modifiers, String[] parameterTypeQualifiedNames,
- String[] parameterNames,
- String returnTypeQualifiedName,
- MemberInfo parentMember,
- boolean dataModel) {
- super(sourceType, declaringTypeQualifiedName, name, modifiers, parentMember, dataModel, Type.valueOf(name));
- setParameterTypeNames(parameterTypeQualifiedNames);
- setParameterNames(parameterNames);
- }
-
- public MethodInfo(IMethod method, MemberInfo parentMember, boolean dataModel) throws JavaModelException {
- super(method.getDeclaringType(),
- (method.getDeclaringType() == null ? null : method.getDeclaringType().getFullyQualifiedName()),
- method.getElementName(),
- method.getFlags(),
- parentMember,
- dataModel,
- new Type(method.getReturnType(),
- method.getDeclaringType()));
-
- setParameterNames(method.getParameterNames());
- setParameterTypeNames(resolveSignatures(method.getDeclaringType(), method.getParameterTypes()));
- setParametersNamesOfDeclaringType(getTypeErasureFromSignatureArray(method.getDeclaringType().getTypeParameterSignatures()));
- }
-
- protected void setParameterTypeNames(String[] parameterTypeNames) {
- fParameterTypeNames = (parameterTypeNames == null ?
- new String[0] : parameterTypeNames);
- }
-
- public String[] getParameterTypeQualifiedNames() {
- if(fParameterTypeQualifiedNames==null) {
- fParameterTypeQualifiedNames = new String[fParameterTypeNames.length];
- for (int i = 0; i < fParameterTypeQualifiedNames.length; i++) {
- fParameterTypeQualifiedNames[i] = EclipseJavaUtil.resolveType(getSourceType(), fParameterTypeNames[i]);
- }
- }
- return fParameterTypeQualifiedNames;
- }
-
- public String[] getParameterTypeNames() {
- return fParameterTypeNames;
- }
-
- protected void setParameterNames(String[] parameterNames) {
- fParameterNames = (parameterNames == null ?
- new String[0] : parameterNames);
- }
-
- public String[] getParameterNames() {
- return fParameterNames;
- }
-
- public int getNumberOfParameters() {
- return (getParameterNames() == null ? 0 : getParameterNames().length);
- }
-
- public IType getReturnType() {
- return getMemberType();
- }
-
- public boolean isConstructor () {
- return getDeclaringTypeQualifiedName().equals(getName());
- }
-
- public boolean isGetter() {
- return (getName().startsWith("get") && !getName().equals("get")) || getName().startsWith("is");
- }
-
- public boolean isSetter() {
- return (getName().startsWith("set") && !getName().equals("set"));
- }
-
- @Override
- public IJavaElement getJavaElement () {
- if(fJavaElement == null) {
- try {
- IType declType = getSourceType().getJavaProject().findType(getDeclaringTypeQualifiedName());
-
- IMethod[] allMethods = declType.getMethods();
-
- // filter methods by name
- List<IMethod> methods = new ArrayList<IMethod>();
- for (int i = 0; allMethods != null && i < allMethods.length; i++) {
- if (allMethods[i].getElementName().equals(getName())) {
- methods.add(allMethods[i]);
- }
- }
- if (!methods.isEmpty()) {
- if (methods.size() == 1) {
- fJavaElement = methods.get(0);
- } else {
- // filter methods by number of parameters
- List<IMethod> filteredMethods = new ArrayList<IMethod>();
- for (IMethod method : methods) {
- if (method.getNumberOfParameters() == getNumberOfParameters()) {
- filteredMethods.add(method);
- }
- }
- if (!filteredMethods.isEmpty()) {
- if (filteredMethods.size() == 1) {
- fJavaElement = filteredMethods.get(0);
- } else {
- methods = filteredMethods;
-
- // filter methods by parameter types
- for(IMethod method : methods) {
- String[] methodParameterTypes =
- resolveSignatures(method.getDeclaringType(),
- method.getParameterTypes());
- String[] parameterTypes = getParameterTypeQualifiedNames();
-
- boolean equal = true;
- for (int i = 0; parameterTypes != null && i < parameterTypes.length; i++) {
- // simple types must be equal, but complex types may not
- if (!parameterTypes[i].equals(methodParameterTypes[i])) {
- // sure - it's Complex Type
- if (! (parameterTypes[i].indexOf('.') != -1)
- && (methodParameterTypes[i].indexOf('.') == -1)) {
- equal = false;
- break;
- }
- }
- }
- if (equal) {
- fJavaElement = method;
- }
- }
- }
- }
- }
- }
- } catch (JavaModelException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
- }
- return fJavaElement;
- }
- }
-
- public TypeInfoCollector(MemberInfo member) {
- this.fMember = member;
- this.fType = member.getMemberType();
- }
-
- public IType getType() {
- return this.fType;
- }
-
- public void collectInfo() {
- if (fMethods == null) {
- fMethods = new ArrayList<MethodInfo>();
- } else {
- fMethods.clear();
- }
-
- if (fFields == null) {
- fFields = new ArrayList<FieldInfo>();
- } else {
- fFields.clear();
- }
-
- if (fType == null)
- return;
- try {
- IType binType = fType;
- while (binType != null) {
- IMethod[] binMethods = binType.getMethods();
- for (int i = 0; binMethods != null && i < binMethods.length; i++) {
- if (binMethods[i].isConstructor()) continue;
- fMethods.add(new MethodInfo(binMethods[i], fMember, false));
- }
- binType = getSuperclass(binType);
- }
-
- // !!!!!!!
- // This inserts here methods "public int size()" and "public boolean isEmpty()" for javax.faces.model.DataModel
- // as requested by Gavin in JBIDE-1256
- // !!!!!!!
- if(isDataModelObject(fType)) {
- addInfoForDataModelObject();
- }
- // This inserts here methods "public int getRowCount()" for @DataModel variables.
- if(fMember.isDataModel) {
- addInfoForDataModelVariable();
- }
- } catch (JavaModelException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
- }
-
- boolean isDataModelObject(IType type) throws JavaModelException {
- return isInstanceofType(type, "javax.faces.model.DataModel");
- }
-
- public static boolean isResourceBundle(IType type) {
- try {
- return isInstanceofType(type, "java.util.ResourceBundle");
- } catch (JavaModelException e) {
- return false;
- }
- }
-
- public static boolean isNotParameterizedCollection(TypeInfoCollector.MemberInfo mbr) {
- try {
- if(mbr.getType().getParameters()!=null && mbr.getType().getParameters().length>0) {
- return false;
- }
- IType type = mbr.getMemberType();
- if(type!=null) {
- return isInstanceofType(type, "java.util.Map") || isInstanceofType(type, "java.util.Collection");
- }
- return false;
- } catch (JavaModelException e) {
- return false;
- }
- }
-
- public static class SuperTypeInfo {
- IType type;
- Set<String> names = new HashSet<String>();
- IType[] superTypes = new IType[0];
-
- SuperTypeInfo(IType type) throws JavaModelException {
- this.type = type;
- superTypesCache.put(type, this);
- ITypeHierarchy typeHierarchy = type.newSupertypeHierarchy(new NullProgressMonitor());
- superTypes = typeHierarchy == null ? null : typeHierarchy.getAllSupertypes(type);
- if(superTypes != null) for (int i = 0; i < superTypes.length; i++) {
- names.add(superTypes[i].getFullyQualifiedName());
- }
- if(superTypes == null) superTypes = new IType[0];
- }
-
- public Set<String> getNames() {
- return names;
- }
-
- public IType[] getSuperTypes() {
- return superTypes;
- }
- }
-
- static Map<IType, SuperTypeInfo> superTypesCache = new HashMap<IType, SuperTypeInfo>();
-
- public static SuperTypeInfo getSuperTypes(IType type) throws JavaModelException {
- if(type == null) return null;
- SuperTypeInfo ts = superTypesCache.get(type);
- if(ts == null) {
- ts = new SuperTypeInfo(type);
- }
- return ts;
- }
-
- public static boolean isInstanceofType(IType type, String qualifiedTypeName) throws JavaModelException {
- if (qualifiedTypeName == null || type == null) return false;
- boolean isInstanceofType = qualifiedTypeName.equals(type.getFullyQualifiedName());
- if (!isInstanceofType) {
- SuperTypeInfo ts = getSuperTypes(type);
- if(ts != null && ts.getNames().contains(qualifiedTypeName)) {
- return true;
- }
- return false;
- }
- return true;
- }
-
- void addInfoForDataModelVariable() {
- fMethods.add(new MethodInfo(fType,
- fType.getFullyQualifiedName(),
- "getRowCount", Modifier.PUBLIC,
- new String[0],
- new String[0],
- "int",
- fMember,
- false));
- }
-
- void addInfoForDataModelObject() {
- fMethods.add(new MethodInfo(fType,
- fType.getFullyQualifiedName(),
- "size", Modifier.PUBLIC,
- new String[0],
- new String[0],
- "int",
- fMember,
- false));
- fMethods.add(new MethodInfo(fType,
- fType.getFullyQualifiedName(),
- "isEmpty", Modifier.PUBLIC,
- new String[0],
- new String[0],
- "boolean",
- fMember,
- false));
- }
-
- private static IType getSuperclass(IType type) throws JavaModelException {
- String superclassName = type.getSuperclassName();
- if(superclassName!=null) {
- String fullySuperclassName = EclipseJavaUtil.resolveType(type, superclassName);
- if(fullySuperclassName!=null&&!fullySuperclassName.equals("java.lang.Object")) { //$NON-NLS-1$
- if(fullySuperclassName.equals(type.getFullyQualifiedName())) {
- //FIX JBIDE-1642
- return null;
- }
- IType superType = type.getJavaProject().findType(fullySuperclassName);
- return superType;
- }
- }
- return null;
- }
-
- public MethodInfo[] findMethodInfos(IMethod iMethod) {
- List<MethodInfo> methods = new ArrayList<MethodInfo>();
-
- // filter methods by name
- for (MethodInfo info : fMethods) {
- if (info.getName().equals(iMethod.getElementName())) {
- methods.add(info);
- }
- }
- if (methods.isEmpty())
- return new MethodInfo[0];
-
- EclipseJavaUtil.getMemberTypeAsString(iMethod);
-
- if (methods.size() == 1)
- return methods.toArray(new MethodInfo[0]);
-
- // filter methods by number of parameters
- List<MethodInfo> filteredMethods = new ArrayList<MethodInfo>();
- for (MethodInfo method : methods) {
- if (method.getNumberOfParameters() == iMethod.getNumberOfParameters())
- filteredMethods.add(method);
- }
- if (filteredMethods.isEmpty())
- return new MethodInfo[0];
- if (filteredMethods.size() == 1)
- return filteredMethods.toArray(new MethodInfo[0]);
-
- methods = filteredMethods;
-
- // filter methods by parameter types
- filteredMethods = new ArrayList<MethodInfo>();
- for(MethodInfo method : methods) {
- String[] methodParameterTypes =
- resolveSignatures(iMethod.getDeclaringType(),
- iMethod.getParameterTypes());
- String[] parameterTypes = method.getParameterTypeQualifiedNames();
-
- boolean equal = true;
- for (int i = 0; equal && parameterTypes != null && i < parameterTypes.length; i++) {
- // simple types must be equal, but complex types may not
- if (!parameterTypes[i].equals(methodParameterTypes[i])) {
- // sure - it's Complex Type
- if ((parameterTypes[i].indexOf('.') != -1)
- && (methodParameterTypes[i].indexOf('.') == -1)) {
- equal = false;
- }
- }
- }
- if (equal) {
- filteredMethods.add(method);
- }
- }
- return filteredMethods.toArray(new MethodInfo[0]);
- }
-
- /**
- * Returns the methods for the type specified
- *
- * @return
- */
- public List<MemberInfo> getMethods() {
- List<MemberInfo> methods = new ArrayList<MemberInfo>();
- for (MethodInfo info : fMethods) {
- if (info.isPublic() && !info.isConstructor()
- && !info.isStatic() && !info.isJavaLangObject()
- && !info.isGetter() && !info.isSetter())
- methods.add(info);
- }
- return methods;
- }
-
- /**
- * Returns the method presentation strings for the type specified
- *
- * @param type
- * @return
- */
- public Set<String> getMethodPresentations() {
- Set<String> methods = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- List<MemberInfo> mthds = getMethods();
- for (MemberInfo info : mthds) {
- if (!(info instanceof MethodInfo))
- continue;
-
- MethodInfo method = (MethodInfo)info;
-
- StringBuffer name = new StringBuffer(method.getName());
-
- // Add method as 'foo'
- methods.add(name.toString());
-
- // Add method as 'foo(param1,param2)'
- name.append('(');
- String[] mParams = method.getParameterNames();
- for (int j = 0; mParams != null && j < mParams.length; j++) {
- if (j > 0) name.append(", "); //$NON-NLS-1$
- name.append(mParams[j]);
- }
- name.append(')');
-
- methods.add(name.toString());
- }
- return methods;
- }
-
- /**
- * Returns the properties for the type specified
- *
- * @return
- */
- public List<MemberInfo> getProperties() {
- List<MemberInfo> properties = new ArrayList<MemberInfo>();
- for (MethodInfo info : fMethods) {
- if (info.isPublic() && !info.isConstructor()
- && !info.isStatic() && !info.isJavaLangObject()
- && (info.isGetter() || info.isSetter()))
- properties.add(info);
- }
-
- /*
- * The following code was excluded due to the following issue:
- *
- * http://jira.jboss.com/jira/browse/JBIDE-1203#action_12385823
- *
- *
- for (FieldInfo info : fFields) {
- if (info.isPublic()
- && !info.isStatic() && !info.isJavaLangObject())
- properties.add(info);
- }
- */
-
- return properties;
- }
-
- /**
- * Returns the property presentation strings for the type specified
- *
- * @return
- */
- public Set<String> getPropertyPresentations() {
- return getPropertyPresentations(null);
- }
-
- /**
- * Returns the property presentation strings for the type specified
- *
- * @param unpairedGettersOrSetters - map of unpaired getters or setters of type's properties. 'key' is property name.
- * @return
- */
- public Set<String> getPropertyPresentations(Map<String, MethodInfo> unpairedGettersOrSetters) {
- Set<String> properties = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- List<MemberInfo> props = getProperties();
- HashMap<String, MethodInfo> getters = new HashMap<String, MethodInfo>();
- HashMap<String, MethodInfo> setters = new HashMap<String, MethodInfo>();
- for (MemberInfo info : props) {
- if (info instanceof MethodInfo) {
- MethodInfo m = (MethodInfo)info;
-
- if (m.isGetter() || m.isSetter()) {
- StringBuffer name = new StringBuffer(m.getName());
- if(m.getName().startsWith("i")) { //$NON-NLS-1$
- name.delete(0, 2);
- } else {
- name.delete(0, 3);
- }
- name.setCharAt(0, Character.toLowerCase(name.charAt(0)));
- String propertyName = name.toString();
- if(!properties.contains(propertyName)) {
- properties.add(propertyName);
- }
- if(unpairedGettersOrSetters!=null) {
- MethodInfo previousGetter = getters.get(propertyName);
- MethodInfo previousSetter = setters.get(propertyName);
- if((previousGetter!=null && m.isSetter())||(previousSetter!=null && m.isGetter())) {
- // We have both Getter and Setter
- unpairedGettersOrSetters.remove(propertyName);
- } else if(m.isSetter()) {
- setters.put(propertyName, m);
- unpairedGettersOrSetters.put(propertyName, m);
- } else if(m.isGetter()) {
- getters.put(propertyName, m);
- unpairedGettersOrSetters.put(propertyName, m);
- }
- }
- }
- } else {
- properties.add(info.getName());
- }
- }
- return properties;
- }
-
- static Map<IMember, MemberInfo> memberInfoCacheFalse = new HashMap<IMember, MemberInfo>();
- static Map<IMember, MemberInfo> memberInfoCacheTrue = new HashMap<IMember, MemberInfo>();
-
- public static void cleanCache() {
- memberInfoCacheFalse.clear();
- memberInfoCacheTrue.clear();
- superTypesCache.clear();
- }
-
- public static MemberInfo createMemberInfo(IMember member, boolean dataModel) {
- Map<IMember, MemberInfo> cache = dataModel ? memberInfoCacheTrue : memberInfoCacheFalse;
- MemberInfo result = cache.get(member);
- if(result != null) return result;
- try {
- if (member instanceof IType)
- result = new TypeInfo((IType)member, null, dataModel);
- else if (member instanceof IField)
- result = new FieldInfo((IField)member, null, dataModel);
- else if (member instanceof IMethod)
- result = new MethodInfo((IMethod)member, null, dataModel);
- } catch (JavaModelException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
- if(result != null) {
- cache.put(member, result);
- }
-
- return result;
- }
-
- public static MemberInfo createMemberInfo(IMember member) {
- return createMemberInfo(member, false);
- }
-
- static String[] resolveSignatures (IType type, String[] signatures) {
- if (signatures == null || signatures.length == 0)
- return new String[0];
-
- String[] resolvedSignatures = new String[signatures.length];
- for (int i = 0; i < signatures.length; i++) {
- resolvedSignatures[i] = EclipseJavaUtil.resolveTypeAsString(type, signatures[i]);
- }
- return resolvedSignatures;
- }
-
- static String[] convertToStringArray(char[][] names) {
- if (names == null || names.length == 0)
- return new String[0];
- String[] sNames = new String[names.length];
- for (int i = 0; i < sNames.length; i++) {
- sNames[i] = String.valueOf(names[i]);
- }
- return sNames;
- }
-
- static String[] getTypeErasureFromSignatureArray(String[] signatures) {
- if (signatures == null || signatures.length == 0)
- return new String[0];
- String[] result = new String[signatures.length];
- for (int i = 0; i < signatures.length; i++) {
- result[i] = Signature.getTypeErasure(signatures[i]);
- }
- return result;
- }
-
- static String getParameterNameFromType(String typeSignatures) {
- if(typeSignatures==null) {
- return null;
- }
- return Signature.getTypeVariable(typeSignatures);
- }
-}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/JavaScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/JavaScanner.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/JavaScanner.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -27,6 +27,7 @@
import org.eclipse.jdt.core.dom.ASTRequestor;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.SeamCoreMessages;
@@ -172,18 +173,8 @@
}
static String getResolvedType(IType type, String n) {
-
- String[][] rs;
- try {
- rs = type.resolveType(n);
- if(rs != null && rs.length > 0) {
- return (rs[0][0].length() == 0) ? rs[0][1] : rs[0][0] + "." + rs[0][1]; //$NON-NLS-1$
- }
- } catch (JavaModelException e) {
- // ignore
- }
-
- return n;
+ String result = EclipseJavaUtil.resolveType(type, n);
+ return result == null ? n : result;
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -34,6 +34,7 @@
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.TypeInfoCollector;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.IRole;
@@ -60,7 +61,6 @@
import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.seam.internal.core.SeamTextSourceReference;
-import org.jboss.tools.seam.internal.core.el.TypeInfoCollector;
/**
* Validator for Java and XML files.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -41,6 +41,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
+import org.jboss.tools.common.model.util.TypeInfoCollector;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamProject;
@@ -54,7 +55,6 @@
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
import org.jboss.tools.seam.internal.core.el.SeamELStringTokenizer;
import org.jboss.tools.seam.internal.core.el.SeamELTokenizer;
-import org.jboss.tools.seam.internal.core.el.TypeInfoCollector;
import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2008-03-20 12:46:00 UTC (rev 7038)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2008-03-20 12:46:17 UTC (rev 7039)
@@ -19,9 +19,9 @@
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+import org.jboss.tools.common.model.util.TypeInfoCollector;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.internal.core.SeamProject;
-import org.jboss.tools.seam.internal.core.el.TypeInfoCollector;
/**
* This Manager invokes all dependent seam validators that should be invoked in one job.
18 years