Author: dgolovin Date: 2007-06-26 18:49:05 -0400 (Tue, 26 Jun 2007) New Revision: 2186 Added: trunk/common/plugins/org.jboss.tools.common.model/images/flow/Thumbs.db trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/build/ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFaceInstallDelegeteTest.java Removed: trunk/common/plugins/org.jboss.tools.common.gef/resources/org/jboss/tools/common/gef/outline/icons/xpl/ trunk/common/plugins/org.jboss.tools.common.model/images/10x10/ trunk/common/plugins/org.jboss.tools.common.model/images/Modifiers/ trunk/common/plugins/org.jboss.tools.common.model/images/bc/ trunk/common/plugins/org.jboss.tools.common.model/images/debugger/ trunk/common/plugins/org.jboss.tools.common.model/images/deployment/ trunk/common/plugins/org.jboss.tools.common.model/images/engines/ trunk/common/plugins/org.jboss.tools.common.model/images/events/ trunk/common/plugins/org.jboss.tools.common.model/images/flow/change_base_class.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_base.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_join.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_send.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_wait.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_base.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_fork.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_join.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_module_based.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_send.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_start.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_stop.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_wait.gif trunk/common/plugins/org.jboss.tools.common.model/images/flow/cursors/ trunk/common/plugins/org.jboss.tools.common.model/images/jasmine/ trunk/common/plugins/org.jboss.tools.common.model/images/jdo/ trunk/common/plugins/org.jboss.tools.common.model/images/process/ trunk/common/plugins/org.jboss.tools.common.model/images/registration/ trunk/common/plugins/org.jboss.tools.common.model/images/tabicons/align/ trunk/common/plugins/org.jboss.tools.common.model/images/tabicons/table/ trunk/common/plugins/org.jboss.tools.common.model/images/timer/ trunk/common/plugins/org.jboss.tools.common.model/images/wizards/ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFaceInstallDelegete.java Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/AntCopyUtils.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetUninstallDelegate.java 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/SwtFieldEditorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamComponentsView.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 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/SeamCoreAllTests.java Log: http://jira.jboss.com/jira/browse/EXIN-239 Added: trunk/common/plugins/org.jboss.tools.common.model/images/flow/Thumbs.db =================================================================== (Binary files differ) Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/flow/Thumbs.db ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/change_base_class.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_base.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_join.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_send.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/convert_to_wait.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_base.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_fork.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_join.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_module_based.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_send.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_start.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_stop.gif =================================================================== (Binary files differ) Deleted: trunk/common/plugins/org.jboss.tools.common.model/images/flow/create_wait.gif =================================================================== (Binary files differ) Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-06-26 22:49:05 UTC (rev 2186) @@ -18,7 +18,9 @@ org.eclipse.wst.common.modulecore, org.apache.ant, org.eclipse.ant.core, - org.eclipse.wst.validation + org.eclipse.wst.validation, + org.eclipse.jst.j2ee.web, + org.eclipse.jst.j2ee Provide-Package: org.jboss.tools.seam.core, org.jboss.tools.seam.internal.core, org.jboss.tools.seam.internal.core.scanner Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2007-06-26 22:49:05 UTC (rev 2186) @@ -70,7 +70,7 @@ type="install" version="1.2"> <delegate - class="org.jboss.tools.seam.core.internal.project.facet.SeamFaceInstallDelegete"> + class="org.jboss.tools.seam.core.internal.project.facet.SeamFacetInstallDelegete"> </delegate> <config-factory class="org.jboss.tools.seam.core.internal.project.facet.SeamFacetInstallDataModelProvider"> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/AntCopyUtils.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/AntCopyUtils.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/AntCopyUtils.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -33,7 +33,7 @@ //set.readFiltersFromFile(filtersFile); set.addFilter("methodName", "testValue"); - copycopyFoldersByAntByAnt(new File("C:\\java\\jboss-seam-1.2.1.GA\\seam-gen\\view"), new File("C:\\temp\\WebContent"), new FilterSetCollection(set),true); + copyFilesAndFolders(new File("C:\\java\\jboss-seam-1.2.1.GA\\seam-gen\\view"), new File("C:\\temp\\WebContent"), new FilterSetCollection(set),true); } @@ -43,12 +43,12 @@ public File getBaseDir(); } - public static void copycopyFoldersByAntByAnt(File sourceFolder, File destinationFolder, FilterSetCollection set, boolean override) { + public static void copyFilesAndFolders(File sourceFolder, File destinationFolder, FilterSetCollection set, boolean override) { if(!destinationFolder.exists()) destinationFolder.mkdirs(); File[] files = sourceFolder.listFiles(); for (File file : files) { if(file.isDirectory()) { - copycopyFoldersByAntByAnt(file,new File(destinationFolder,file.getName()),set,override); + copyFilesAndFolders(file,new File(destinationFolder,file.getName()),set,override); } else { try { FileUtils.getFileUtils().copyFile(file, new File(destinationFolder,file.getName()),set,override); Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFaceInstallDelegete.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFaceInstallDelegete.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFaceInstallDelegete.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.seam.core.internal.project.facet; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.project.facet.core.IDelegate; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; - -public class SeamFaceInstallDelegete extends Object implements IDelegate { - - public void execute(IProject project, IProjectFacetVersion fv, - Object config, IProgressMonitor monitor) throws CoreException { - IDataModel model = (IDataModel)config; - System.out.println("InstallDelegate invoked"); - - for (Object property : model.getAllProperties()) { - System.out.println(property + " + " + model.getProperty(property.toString())); - } - - } - -} Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java (from rev 2173, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFaceInstallDelegete.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.core.internal.project.facet; + +import java.io.File; +import java.util.Collection; +import java.util.HashMap; +import java.util.Properties; + +import org.apache.tools.ant.types.FilterSet; +import org.apache.tools.ant.types.FilterSetCollection; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties; +import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; + +public class SeamFacetInstallDelegete extends Object implements IDelegate { + + public void execute(IProject project, IProjectFacetVersion fv, + Object config, IProgressMonitor monitor) throws CoreException { + IDataModel model = (IDataModel)config; + System.out.println("InstallDelegate invoked"); + + for (Object property : model.getNestedModel("").getAllProperties()) { + System.out.println(property + " + " + model.getProperty(property.toString())); + } + Properties propertiew = new Properties(); + + + // Collect data typed by user + Collection properties = model.getAllProperties(); + // get WebContents folder path from model + String webContentFolder = model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER).toString(); + + File destination = new File(project.getLocation().toFile(),webContentFolder); + String seamHomeFolder = model.getProperty(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME).toString(); + File source = new File(seamHomeFolder,"seam-gen/view"); + // TODO - copy veiw folder from seam-gen installation to + copyViewFolder(source, destination, new HashMap<String, String>()); + // project location with filled out FIlterSet + + // TODO copy manifest and configuration resources the same way as view + + // TODO copy libraries/link libraries + + // TODO generate db support as seam-gen does + + // TODO may be generate RHDS studio feature to show it on projects view + + // TODO say JBoss AS adapter what kind of deployment to use + + // TODO ggenerate build.xml + } + + protected void copyViewFolder(File viewSource, File viewDestination, HashMap<String, String> properties) { + + FilterSet filterSet = new FilterSet(); + for (Object propertyName : properties.keySet()) { + filterSet.addFilter(propertyName.toString(), properties.get(propertyName)); + } + + FilterSetCollection filters = new FilterSetCollection(); + filters.addFilterSet(filterSet); + AntCopyUtils.copyFilesAndFolders(viewSource, viewDestination, filters, true); + + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetUninstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetUninstallDelegate.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetUninstallDelegate.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -21,20 +21,7 @@ public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException { - // TODO - copy veiw folder from seam-gen installation to - // project location with filled out FIlterSet - - // TODO copy manifest and configuration resources the same way as view - - // TODO copy libraries/link libraries - - // TODO generate db support as seam-gen does - - // TODO may be generate RHDS studio feature to show it on projects view - - // TODO say JBoss AS adapter what kind of deployment to use - - // TODO ggenerate build.xml + } } 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 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -52,22 +52,22 @@ IFieldEditor jBossHibernateDialectEditor = IFieldEditorFactory.INSTANCE.createComboEditor( ISeamFacetDataModelProperties.HIBERNATE_DIALECT, "Hibernate Dialect:",Arrays.asList(HIBERNATE_HELPER.getDialectNames()),"HSQL"); - IFieldEditor jdbcDriverClassname = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor jdbcDriverClassname = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME, "JDBC Driver Class for Your Database:","com.package1.Classname"); - IFieldEditor jdbcUrlForDb = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor jdbcUrlForDb = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.JDBC_URL_FOR_DB, "JDBC Url for Your Database:", "url://domain/"); - IFieldEditor dbUserName = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor dbUserName = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.DB_USER_NAME, "Database User Name:", "username"); - IFieldEditor dbUserPassword = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor dbUserPassword = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.DB_PASSWORD, "User Password:", "password"); - IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.DB_SCHEMA_NAME, "Database Schema Name:", "schema-name"); - IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.DB_CATALOG_NAME, "Database Catalog Name:", "catalog-name"); IFieldEditor dbTablesExists = IFieldEditorFactory.INSTANCE.createCheckboxEditor( @@ -76,17 +76,17 @@ IFieldEditor recreateTablesOnDeploy = IFieldEditorFactory.INSTANCE.createCheckboxEditor( ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, "Recreate database tables and data on deploy:", false); - IFieldEditor pathToJdbcDriverJar = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor pathToJdbcDriverJar = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties. JDBC_DRIVER_JAR_PATH, "File :", "url://domain/"); // Code generation group - IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, "Session Bean Package Name:","com.mydomain.projectname.session"); - IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, "Entity Bean Package Name:","com.mydomain.projectname.entity"); - IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE.createTextExitor( + IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, "Session Bean Package Name:","com.mydomain.projectname.test"); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -24,20 +24,16 @@ public IFieldEditor createCheckboxEditor(String name, String label, boolean defaultValue) { - // TODO Auto-generated method stub return new CheckBoxFieldEditor(name,label,Boolean.valueOf(defaultValue)); } public IFieldEditor createComboEditor(String name, String label, List values, Object defaultValue) { - // TODO Auto-generated method stub return new ComboFieldEditor(name,label,values,defaultValue.toString()); } - public IFieldEditor createTextExitor(String name, String label, String defaultValue) { - // TODO Auto-generated method stub + public IFieldEditor createTextEditor(String name, String label, String defaultValue) { return new TextFieldEditor(name,label,defaultValue); - } public IFieldEditor createBrowseFolderEditor(String name, String label, String defaultValue) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamComponentsView.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamComponentsView.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamComponentsView.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -133,24 +133,54 @@ * expose its hierarchy. */ private void initialize() { - TreeObject to1 = new TreeObject("Leaf 1"); - TreeObject to2 = new TreeObject("Leaf 2"); - TreeObject to3 = new TreeObject("Leaf 3"); - TreeParent p1 = new TreeParent("Parent 1"); - p1.addChild(to1); - p1.addChild(to2); - p1.addChild(to3); + TreeParent to1 = new TreeParent("Conetx Variable 1"); + TreeObject class1 = new TreeObject("org.domain.package.Class1"); + TreeObject class2 = new TreeObject("org.domain.package.Class2"); + TreeObject role1 = new TreeObject("role1"); + TreeObject xml1 = new TreeObject("component.xml"); + TreeObject xml2 = new TreeObject("Class3.component.xml"); + to1.addChild(class1); + to1.addChild(class2); + to1.addChild(xml1); + to1.addChild(xml2); + to1.addChild(role1); - TreeObject to4 = new TreeObject("Leaf 4"); - TreeParent p2 = new TreeParent("Parent 2"); - p2.addChild(to4); + TreeParent to2 = new TreeParent("Conetx Variable 2"); + TreeParent to3 = new TreeParent("Conetx Variable 3"); + TreeParent stateless = new TreeParent("STATELESS"); + stateless.addChild(to1); + stateless.addChild(to2); + stateless.addChild(to3); - TreeParent root = new TreeParent("Root"); - root.addChild(p1); - root.addChild(p2); + TreeObject to4 = new TreeParent("Conetx Variable 4"); + TreeParent method = new TreeParent("METHOD"); + method.addChild(to4); + TreeParent event = new TreeParent("EVENT"); + + TreeParent page = new TreeParent("PAGE"); + TreeParent conversation = new TreeParent("CONVERSATION"); + TreeParent session = new TreeParent("SESSION"); + TreeParent app = new TreeParent("APPLICATION"); + TreeParent bp = new TreeParent("BUSINESS_PROCESS"); + TreeParent unspec = new TreeParent("UNSPECIFIED"); + + TreeParent root1 = new TreeParent("Seam Project 1"); + + TreeParent root2 = new TreeParent("Seam Project 2"); + + root1.addChild(stateless); + root1.addChild(method); + root1.addChild(event); + root1.addChild(page); + root1.addChild(conversation); + root1.addChild(session); + root1.addChild(app); + root1.addChild(bp); + root1.addChild(unspec); + invisibleRoot = new TreeParent(""); - invisibleRoot.addChild(root); + invisibleRoot.addChild(root1); } } class ViewLabelProvider extends LabelProvider { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -24,7 +24,7 @@ * @param defaultValue * @return */ - IFieldEditor createTextExitor(String name, String label, String defaultValue); + IFieldEditor createTextEditor(String name, String label, String defaultValue); /** * * @param name TODO 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 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2007-06-26 22:49:05 UTC (rev 2186) @@ -15,5 +15,6 @@ org.jboss.tools.seam.core, org.jboss.tools.seam.xml, org.jboss.tools.common.test, - org.jboss.tools.jsf + org.jboss.tools.jsf, + org.eclipse.wst.common.project.facet.core 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/SeamCoreAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2007-06-26 13:28:44 UTC (rev 2185) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.seam.core.test; +import org.jboss.tools.seam.core.test.project.facet.SeamFaceInstallDelegeteTest; + import junit.framework.Test; import junit.framework.TestSuite; /** @@ -23,6 +25,7 @@ TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); suite.addTestSuite(ScannerTest.class); + suite.addTestSuite(SeamFaceInstallDelegeteTest.class); return suite; } } Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFaceInstallDelegeteTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFaceInstallDelegeteTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFaceInstallDelegeteTest.java 2007-06-26 22:49:05 UTC (rev 2186) @@ -0,0 +1,36 @@ +/** + * + */ +package org.jboss.tools.seam.core.test.project.facet; + +import org.jboss.tools.seam.core.internal.project.facet.SeamFacetInstallDelegete; + +import junit.framework.TestCase; + +/** + * @author eskimo + * + */ +public class SeamFaceInstallDelegeteTest extends TestCase { + + /** + * @throws java.lang.Exception + */ + protected void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + protected void tearDown() throws Exception { + } + + /** + * Test method for {@link org.jboss.tools.seam.core.internal.project.facet.SeamFacetInstallDelegete#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)}. + */ + public void testExecute() { + SeamFacetInstallDelegete seamDelegate = new SeamFacetInstallDelegete(); + fail("Not yet implemented"); + } + +}