Author: max.andersen(a)jboss.com Date: 2007-10-24 09:39:20 -0400 (Wed, 24 Oct 2007) New Revision: 4459 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java Log: JBIDE-1145 List and Home.java was not being generated correctly Bogus implementation of getActionsFolder() and getBeansFolder() was changed to be correct (but hardcoded) Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-24 12:39:30 UTC (rev 4458) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-24 13:39:20 UTC (rev 4459) @@ -10,28 +10,18 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit; -import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; /** @@ -123,7 +113,7 @@ } /** - * Returns list of EJB projects. + * * @return */ public IProject getTestProject() { @@ -131,63 +121,28 @@ } /** - * Returns Content folder of EAR project or null - * if EAR is not available. - * @return + * + * @return the action folder (this folder is not guaranteed to exist!) */ - public IFolder getActionsFolder() { - IFolder actionsFolder = null; + public IFolder getActionFolder() { if(isWarConfiguration()) { - IVirtualComponent com = ComponentCore.createComponent(war); - IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ - final IVirtualFolder srcRootFolder = com.getRootFolder().getFolder(new Path("/WEB-INF/classes")); //$NON-NLS-1$ - IContainer[] folder = webRootFolder.getUnderlyingFolders(); - if(folder.length==1) { - actionsFolder = (IFolder)folder[0]; - } else if(folder.length>1) { - IContainer parent = folder[0].getParent(); - IResource actions = parent.findMember("actions"); //$NON-NLS-1$ - if(actions!=null && actions instanceof IFolder) { - actionsFolder = (IFolder)actions; - } else { - actionsFolder = (IFolder)folder[0]; - } - } + return war.getFolder("src/action"); } else { - IVirtualComponent com = ComponentCore.createComponent(ejb); - IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ - actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder(); + return getEjbProject().getFolder("ejbModule"); } - return actionsFolder; + } /** - * Returns Content folder for first found WAR project. - * @return + * + * @return the model folder if exists, otherwise null */ - public IFolder getBeansFolder() { - IFolder actionsFolder = null; + public IFolder getModelFolder() { if(isWarConfiguration()) { - IVirtualComponent com = ComponentCore.createComponent(war); - final IVirtualFolder srcRootFolder = com.getRootFolder().getFolder(new Path("/WEB-INF/classes")); //$NON-NLS-1$ - IContainer[] folder = srcRootFolder.getUnderlyingFolders(); - if(folder.length==1) { - actionsFolder = (IFolder)folder[0]; - } else if(folder.length>1) { - IContainer parent = folder[0].getParent(); - IResource actions = parent.findMember("model"); //$NON-NLS-1$ - if(actions!=null && actions instanceof IFolder) { - actionsFolder = (IFolder)actions; - } else { - actionsFolder = (IFolder)folder[0]; - } - } + return war.getFolder("src/model"); } else { - IVirtualComponent com = ComponentCore.createComponent(ejb); - IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ - actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder(); - } - return actionsFolder; + return getEjbProject().getFolder("ejbModule"); + } } /** Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-24 12:39:30 UTC (rev 4458) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-24 13:39:20 UTC (rev 4459) @@ -79,8 +79,8 @@ SeamProjectsSet seamProjectsSet = SeamProjectsSet.create(project); wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, - seamProjectsSet.getBeansFolder()==null? - "":seamProjectsSet.getBeansFolder().getFullPath().toString()); //$NON-NLS-1$ + seamProjectsSet.getModelFolder()==null? + "":seamProjectsSet.getModelFolder().getFullPath().toString()); //$NON-NLS-1$ boolean isReverseEngineer = "true".equals(params.get(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER)); //$NON-NLS-1$ wc.setAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, isReverseEngineer); @@ -234,7 +234,7 @@ hbmtemplateAttributes.put("file_pattern", "{package-name}/{class-name}List.java"); //$NON-NLS-1$ //$NON-NLS-2$ } hbmtemplateAttributes.put("template_name", "src/EntityList.java.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionFolder().getFullPath().toString()); //$NON-NLS-1$ hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -269,7 +269,7 @@ } hbmtemplateAttributes.put("template_name", "src/EntityHome.java.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionFolder().getFullPath().toString()); //$NON-NLS-1$ hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8.properties", hbmtemplateAttributes); //$NON-NLS-1$ Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-10-24 12:39:30 UTC (rev 4458) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-10-24 13:39:20 UTC (rev 4459) @@ -18,6 +18,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.seam.core.SeamProjectsSet; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; @@ -145,6 +146,10 @@ fproj.installProjectFacet(getSeamFacetVersion(), config, null); + SeamProjectsSet seamProjectsSet = new SeamProjectsSet(fproj.getProject()); + assertTrue(seamProjectsSet.getActionFolder().exists()); + assertTrue(seamProjectsSet.getModelFolder().exists()); + return fproj; } @@ -183,7 +188,7 @@ assertTrue(testProject.exists()); assertTrue(ejbProject.exists()); assertTrue(earProject.exists()); - + return fproj; } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2007-10-24 12:39:30 UTC (rev 4458) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2007-10-24 13:39:20 UTC (rev 4459) @@ -45,4 +45,5 @@ assertTrue(fproj.getProject().findMember("src/action/x/y/z").exists()); } + }