Author: dgolovin Date: 2007-06-29 15:54:06 -0400 (Fri, 29 Jun 2007) New Revision: 2226 Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/PushButtonField.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java Removed: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/FieldEditorID.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/SeamGuiPlugin.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BrowseFolderFieldEditor.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFaceInstallDelegeteTest.java Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/ISeamFacetDataModelProperties.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDataModelProvider.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.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/internal/project/facet/ValidatorFactory.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/BaseFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CheckBoxFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/CheckBoxField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.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 trunk/tests/features/org.jboss.tools.test.feature/feature.xml trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java Log: http://jira.jboss.com/jira/browse/EXIN-221 New Seam Project Wizard Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -49,7 +49,7 @@ } /** - * @return Studio enveroment. + * @return Studio environment. */ public static String getEnvironment() { if(environment == null) { Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/FieldEditorID.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/FieldEditorID.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/FieldEditorID.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,18 +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; - -public enum FieldEditorID { - TEXT_EDITOR, - CHECKBOX_EDITOR, - COMOBOX_EDITOR, - RADIO_EDITOR; -} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/ISeamFacetDataModelProperties.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/ISeamFacetDataModelProperties.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/ISeamFacetDataModelProperties.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -11,6 +11,9 @@ package org.jboss.tools.seam.core.internal.project.facet; +import java.util.HashMap; +import java.util.Map; + import org.eclipse.wst.common.project.facet.core.IActionConfigFactory; public interface ISeamFacetDataModelProperties extends IActionConfigFactory { @@ -51,6 +54,6 @@ public static final String JBOSS_SEAM_HOME = PREFIX + "JBOSS_SEAM_HOME"; + public static final String WEB_CONTENTS_FOLDER = PREFIX + "WEB_CONTENTS_FOLDER"; - } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDataModelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDataModelProvider.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDataModelProvider.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.seam.core.internal.project.facet; +import java.util.HashMap; +import java.util.Map; import java.util.Set; import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; @@ -21,10 +23,18 @@ */ public class SeamFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISeamFacetDataModelProperties { - + + public static final Map<String,String[]> SEAM_LIBRARIES= new HashMap<String,String[]>(); + + static { + SEAM_LIBRARIES.put("1.2",new String[] { + + }); + } + @Override public Set getPropertyNames() { - Set names = super.getPropertyNames(); + Set<String> names = super.getPropertyNames(); // General group names.add(ISeamFacetDataModelProperties.JBOSS_AS_HOME); @@ -51,9 +61,11 @@ names.add(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME); names.add(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME); names.add(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME); + names.add(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER); return names; } + public Object getDefaultProperty(String propertyName) { if(JBOSS_AS_HOME.equals(propertyName)) { return "Jboss_AS_HOME"; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/internal/project/facet/SeamFacetInstallDelegete.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -11,57 +11,99 @@ package org.jboss.tools.seam.core.internal.project.facet; import java.io.File; -import java.util.Collection; +import java.io.FileFilter; +import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Properties; +import java.util.regex.Pattern; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; +import org.apache.tools.ant.util.FileUtils; +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; 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.core.runtime.Path; +import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit; +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.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 static FileSet VIEW_FILESET = new FileSet() + .include("home\\.xhtml") + .include("error\\.xhtml") + .include("login\\.xhtml") + .include("login\\.page.xml") + .include("index\\.html") + .include("layout\\.*") + .include("stylesheet\\.*") + .include("img\\.*") + .exclude(".*\\\\.*\\.ftl"); + public static FileSet VIEW_ = new FileSet() + .include("home\\.xhtml") + .include("error\\.xhtml") + .include("login\\.xhtml") + .include("login\\.page.xml") + .include("index\\.html") + .include("layout\\.*") + .include("stylesheet\\.*") + .include("img\\.*") + .exclude(".*\\\\.*\\.ftl"); + 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(); + WebArtifactEdit edit = + WebArtifactEdit.getWebArtifactEditForRead(project); + IVirtualComponent com = ComponentCore.createComponent(project); + IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); + IContainer folder = webRootFolder.getUnderlyingFolder(); + File webContentFolder = folder.getLocation().toFile(); - 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>()); + copyViewFolder(source, webContentFolder, new HashMap<String, String>()); + // project location with filled out FIlterSet // TODO copy manifest and configuration resources the same way as view + // TODO modify existing faces-config.xml // TODO copy libraries/link libraries + File seamHome = new File(seamHomeFolder); + File webLibFolder = new File(webContentFolder,"WEB-INF/lib"); + copyFiles(seamHome,webLibFolder,seamLibs); + copyFiles(new File(source.getParentFile(),"lib"),webLibFolder,javaLibs); + copyFiles(new File(source.getParentFile(),"drools/lib"),webLibFolder,javaLibs); + String jdbcDriverFileName = model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH).toString(); + File jdbcDriverFile = new File(jdbcDriverFileName); + if(jdbcDriverFile.exists()) + AntCopyUtils.copyFile(jdbcDriverFile, webLibFolder, true); + // 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 + // TODO generate build.xml + + project.refreshLocal(IResource.DEPTH_INFINITE, monitor); } protected void copyViewFolder(File viewSource, File viewDestination, HashMap<String, String> properties) { @@ -76,4 +118,124 @@ AntCopyUtils.copyFilesAndFolders(viewSource, viewDestination, filters, true); } + + protected void copySeamLibraries(File source, File dest) { + } + + public static void copyFiles(File source, File dest, FileFilter filter) { + dest.mkdir(); + for (File file:source.listFiles(filter)) { + try { + FileUtils.getFileUtils().copyFile(file, new File(dest,file.getName()),new FilterSetCollection(),true); + } catch (IOException e) { + // TODO add logging + } + } + } + + static private FileFilter seamLibs = new FileFilter() { + + Pattern includePattern = Pattern.compile("jboss-seam.*\\.jar"); + Pattern excludePattern = Pattern.compile("jboss-seam-gen\\.jar"); + + public boolean accept(File pathname){ + return + !excludePattern.matcher(pathname.getName()).matches() + && + includePattern.matcher(pathname.getName()).matches(); + } + }; + + static private FileFilter javaLibs = new FileFilter() { + + Pattern libs = Pattern.compile(".*\\.jar"); + Pattern zips = Pattern.compile(".*\\.zip"); + + public boolean accept(File pathname){ + return + libs.matcher(pathname.getName()).matches() + || + zips.matcher(pathname.getName()).matches(); + } + }; + + + public static class FileSet { + File dir = null; + List<Pattern> include = new ArrayList<Pattern>(); + List<Pattern> exclude = new ArrayList<Pattern>(); + public FileSet(String dir) { + this.dir = new File(dir); + } + public FileSet() { + } + public FileSet dir(String dir) { + this.dir = new File(dir); + return this; + } + public FileSet include(String pattern) { + include.add(Pattern.compile(pattern)); + return this; + + } + public FileSet exclude(String pattern) { + exclude.add(Pattern.compile(pattern)); + return this; + } + + public boolean isIncluded(String file) { + int i = dir.getAbsolutePath().length()+1; + String relatedPath = file.substring(i); + System.out.println(relatedPath); + for (Pattern pattern : include) { + if(pattern.matcher(relatedPath).matches() ) { + return !isExcluded(relatedPath); + } + } + return false; + } + + public boolean isExcluded(String file){ + for (Pattern pattern : exclude) { + if(pattern.matcher(file).matches()) return true; + } + return false; + } + } + + public static class FileSetFileFilter implements FileFilter { + + FileSet set; + public FileSetFileFilter(FileSet set) { + this.set = set; + } + + public boolean accept(File pathname){ + System.out.println(pathname); + System.out.println(set.isIncluded(pathname.getAbsolutePath())); + return set.isIncluded(pathname.getAbsolutePath()); + } + } + + + public static void main(String[] args) { + + FileSet include = new FileSet() + .dir("C:\\java\\jboss-seam-1.2.1.GA\\seam-gen\\view") + .include("home\\.xhtml") + .include("error\\.xhtml") + .include("login\\.xhtml") + .include("login\\.page.xml") + .include("index\\.html") + .include("layout\\.*") + .include("stylesheet\\.*") + .include("img\\.*") + .exclude(".*\\\\.*\\.ftl"); + + FileSetFileFilter fileSetFilter = new FileSetFileFilter(include); + File file1 = new File("C:\\java\\jboss-seam-1.2.1.GA\\seam-gen\\view"); + File[] copy = file1.listFiles(fileSetFilter); + copyFiles(file1,new File("c:\\temp\\1"),fileSetFilter); + AntCopyUtils.copyFilesAndFolders(file1, new File("c:\\temp\\12"),fileSetFilter, new FilterSetCollection(), true); + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath 2007-06-29 19:54:06 UTC (rev 2226) @@ -3,5 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2007-06-29 19:54:06 UTC (rev 2226) @@ -3,7 +3,7 @@ Bundle-Name: Seam GUI tools Bundle-SymbolicName: org.jboss.tools.seam.ui; singleton:=true Bundle-Version: 1.0.0 -Bundle-Activator: org.jboss.tools.seam.SeamGuiPlugin +Bundle-Activator: org.jboss.tools.seam.ui.SeamGuiPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -19,9 +19,10 @@ org.eclipse.wst.common.frameworks.ui, org.jboss.tools.seam.core, org.apache.log4j, - org.hibernate.eclipse.console + org.hibernate.eclipse.console, + org.eclipse.jst.j2ee Eclipse-LazyStart: true -Export-Package: org.jboss.tools.seam, +Export-Package: org.jboss.tools.seam.ui, org.jboss.tools.seam.ui.internal.project.facet;x-internal:=true, org.jboss.tools.seam.ui.widget.editor, org.jboss.tools.seam.ui.widget.field, Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/SeamGuiPlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/SeamGuiPlugin.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/SeamGuiPlugin.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,71 +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; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class SeamGuiPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.seam.ui"; - - // The shared instance - private static SeamGuiPlugin plugin; - - /** - * The constructor - */ - public SeamGuiPlugin() { - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static SeamGuiPlugin getDefault() { - return plugin; - } - - /** - * Returns an image descriptor for the image file at the given - * plug-in relative path - * - * @param path the path - * @return the image descriptor - */ - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } -} Copied: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java (from rev 2173, trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/SeamGuiPlugin.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -0,0 +1,63 @@ +/******************************************************************************* + * 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.ui; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class SeamGuiPlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.seam.ui"; + + // The shared instance + private static SeamGuiPlugin plugin; + + /** + * The constructor + */ + public SeamGuiPlugin() { + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static SeamGuiPlugin getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -18,28 +18,53 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; +/** + * + * @author eskimo + * + */ public class DataModelSynchronizer implements PropertyChangeListener { + /** + * + */ + protected IDataModel model; - IDataModel model; + /** + * + */ + Map<String,IFieldEditor> editors = new HashMap<String,IFieldEditor>(); + /** + * + * @param model + */ public DataModelSynchronizer(IDataModel model) { this.model = model; } + /** + * + */ public void propertyChange(PropertyChangeEvent evt) { model.setProperty(evt.getPropertyName(), evt.getNewValue()); } + /** + * + * @param name + * @return + */ public IFieldEditor getNamedElement(String name) { return editors.get(name); } - Map<String,IFieldEditor> editors = new HashMap<String,IFieldEditor>(); - + /** + * + * @param editor + */ public void register(IFieldEditor editor) { editors.put(editor.getName(), editor); model.setProperty(editor.getName(), editor.getValue()); editor.addPropertyChangeListener(this); } - } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -25,30 +24,60 @@ */ public class DataModelValidatorDelegate implements IDataModelListener { - IDataModel model = null; - WizardPage page = null; - Map<String,IValidator> mapPropToValidator = new HashMap<String,IValidator>(); + /** + * + */ + protected IDataModel model = null; + /** + * + */ + protected WizardPage page = null; + + /** + * + */ + protected Map<String,IValidator> mapPropToValidator = new HashMap<String,IValidator>(); + + /** + * + * @param model + * @param page + */ public DataModelValidatorDelegate(IDataModel model,WizardPage page) { this.model = model; this.page = page; model.addListener(this); } + /** + * + * @return + */ public Map<String, String> validate() { Map<String, String> errors = new HashMap<String,String>(); return errors; } + /** + * + */ public void propertyChanged(DataModelEvent event) { validateUntillError(); } + /** + * + */ public void validateUntillError() { page.setErrorMessage(getFirstValidationError()); } + /** + * + * @return + */ public String getFirstValidationError() { for (String validatorName : mapPropToValidator.keySet()) { Map<String,String> errors = getValidator(validatorName).validate( @@ -61,11 +90,21 @@ return null; } + /** + * + * @param name + * @return + */ public IValidator getValidator(String name) { IValidator validator = mapPropToValidator.get(name); return validator==null?ValidatorFactory.NO_ERRORS_VALIDATOR:validator; } + /** + * + * @param name + * @param validator + */ public void addValidatorForProperty(String name, IValidator validator) { mapPropToValidator.put(name, validator); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -12,8 +12,18 @@ import java.util.Map; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; - +/** + * + * @author eskimo + * + */ public interface IValidator { + + /** + * + * @param value + * @param context + * @return + */ Map<String,String> validate(Object value, Object context); } 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-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -14,12 +14,15 @@ import java.util.Arrays; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; +import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener; import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage; import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage; import org.hibernate.eclipse.console.utils.DriverClassHelpers; @@ -31,10 +34,23 @@ * @author eskimo * */ -public class SeamInstallWizardPage extends AbstractFacetWizardPage implements IFacetWizardPage{ +public class SeamInstallWizardPage extends AbstractFacetWizardPage implements IFacetWizardPage, IDataModelListener{ + /** + * + */ DriverClassHelpers HIBERNATE_HELPER = new DriverClassHelpers(); + /** + * + */ + IDataModel model = null; + + /** + * + */ + DataModelValidatorDelegate validatorDelegate; + // General group IFieldEditor jBossAsHomeEditor = IFieldEditorFactory.INSTANCE.createBrowseFolderEditor( ISeamFacetDataModelProperties.JBOSS_AS_HOME, @@ -44,7 +60,8 @@ "JBoss Seam Home Folder:","c:\\JBossAS"); IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE.createComboEditor( ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, - "Deploy as:",new ArrayList<Object>(),"war"); + "Deploy as:",Arrays.asList(new String[]{"war","ear"}),"war"); + // Database group IFieldEditor jBossAsDbTypeEditor = IFieldEditorFactory.INSTANCE.createComboEditor( ISeamFacetDataModelProperties.DB_TYPE, @@ -79,6 +96,7 @@ IFieldEditor pathToJdbcDriverJar = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties. JDBC_DRIVER_JAR_PATH, "File :", "url://domain/"); + // Code generation group IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, @@ -90,43 +108,59 @@ ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, "Session Bean Package Name:","com.mydomain.projectname.test"); - + /** + * + */ public SeamInstallWizardPage() { super("Seam Facet"); setTitle("Seam Facet"); setDescription("Seam Facest Description"); } - - public void dispose() { - // TODO Auto-generated method stub - super.dispose(); - } - IDataModel model = null; - DataModelValidatorDelegate validatorDelegate; - + /** + * + */ private DataModelSynchronizer sync; + /** + * + */ @Override public void setWizard(IWizard newWizard) { super.setWizard(newWizard); } + /** + * + */ public void setConfig(Object config) { model = (IDataModel)config; sync = new DataModelSynchronizer(model); validatorDelegate = new DataModelValidatorDelegate(model,this); + model.addListener(this); } - + + /** + * + */ public void transferStateToConfig() { } + /** + * + * @param editor + * @param parent + * @param columns + */ public void registerEditor(IFieldEditor editor,Composite parent,int columns) { sync.register(editor); - editor.doFillIntoGrid(parent, columns); + editor.doFillIntoGrid(parent); } + /** + * + */ public void createControl(Composite parent) { // TODO Auto-generated method stub initializeDialogUnits(parent); @@ -188,4 +222,14 @@ validatorDelegate.addValidatorForProperty(jBossAsHomeEditor.getName(), ValidatorFactory.JBOSS_AS_HOME_FOLDER_VALIDATOR); } + + /** + * + */ + public void propertyChanged(DataModelEvent event) { + if(event.getPropertyName().equals(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)) { + model.setStringProperty(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, event.getProperty() + .toString()); + } + } } 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-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -12,31 +12,84 @@ import java.util.List; -import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.seam.ui.widget.editor.BrowseFolderFieldEditor; +import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor; import org.jboss.tools.seam.ui.widget.editor.CheckBoxFieldEditor; import org.jboss.tools.seam.ui.widget.editor.ComboFieldEditor; +import org.jboss.tools.seam.ui.widget.editor.CompositeEditor; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory; +import org.jboss.tools.seam.ui.widget.editor.LabelFieldEditor; import org.jboss.tools.seam.ui.widget.editor.TextFieldEditor; +/** + * + * @author eskimo + * + */ public class SwtFieldEditorFactory implements IFieldEditorFactory { + /** + * + */ public IFieldEditor createCheckboxEditor(String name, String label, boolean defaultValue) { - return new CheckBoxFieldEditor(name,label,Boolean.valueOf(defaultValue)); + CompositeEditor editor = new CompositeEditor(name,label, defaultValue); + editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), + new CheckBoxFieldEditor(name,label,Boolean.valueOf(defaultValue))}); + return editor; } + /** + * + */ public IFieldEditor createComboEditor(String name, String label, List values, Object defaultValue) { - return new ComboFieldEditor(name,label,values,defaultValue.toString()); + CompositeEditor editor = new CompositeEditor(name,label, defaultValue); + editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), + new ComboFieldEditor(name,label,values,defaultValue.toString())}); + return editor; } + /** + * + */ public IFieldEditor createTextEditor(String name, String label, String defaultValue) { - return new TextFieldEditor(name,label,defaultValue); + CompositeEditor editor = new CompositeEditor(name,label, defaultValue); + editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), + new TextFieldEditor(name,label, defaultValue)}); + return editor; } + /** + * + */ public IFieldEditor createBrowseFolderEditor(String name, String label, String defaultValue) { - return new BrowseFolderFieldEditor(name,label,defaultValue); + CompositeEditor editor = new CompositeEditor(name,label, defaultValue); + editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), + new TextFieldEditor(name,label, defaultValue), + new ButtonFieldEditor(name,createSelectFolderAction("Browse"))}); + return editor; } + + /** + * + * @param buttonName + * @return + */ + public ButtonFieldEditor.ButtonPressedAction createSelectFolderAction(String buttonName) { + return new ButtonFieldEditor.ButtonPressedAction(buttonName) { + @Override + public void run() { + DirectoryDialog dialog = new DirectoryDialog(Display.getCurrent().getActiveShell()); + dialog.setMessage("Select Seam Home Folder"); + dialog.setFilterPath(getFieldEditor().getValueAsString()); + String directory = dialog.open(); + if(directory!=null) { + getFieldEditor().setValue(directory); + } + } + }; + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -17,14 +17,26 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.jboss.tools.seam.core.internal.project.facet.ISeamFacetDataModelProperties; - - +/** + * + * @author eskimo + * + */ public class ValidatorFactory { + /** + * + */ static public Map<String,IValidator> validators = new HashMap<String, IValidator>(); + /** + * + */ static public Map<String,String> NO_ERRORS = new HashMap<String,String>(); + /** + * + */ static public IValidator NO_ERRORS_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { // TODO Auto-generated method stub @@ -32,21 +44,38 @@ } }; + /** + * + * @param id + * @return + */ public static IValidator getValidator(String id) { IValidator validator = validators.get(id); return validator==null?NO_ERRORS_VALIDATOR:validator; } + /** + * + * @return + */ public static Map<String,String> createErrorMap() { return new HashMap<String,String>(); } + /** + * + * @param text + * @return + */ public static Map<String,String> createErrormessage(String text) { Map<String,String> map = createErrorMap(); map.put("", text); return map; } + /** + * + */ public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() { public Map<String, String> validate(Object value, Object context) { @@ -64,6 +93,9 @@ }; + /** + * + */ public static IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { Map<String,String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(value, context); @@ -85,6 +117,9 @@ } }; + /** + * + */ public static IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { Map<String,String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(value, context); @@ -105,6 +140,9 @@ } }; + /** + * + */ public static IValidator CLASS_QNAME_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { @@ -112,6 +150,9 @@ } }; + /** + * + */ public static IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() { public java.util.Map<String,String> validate(Object value, Object context) { return ValidatorFactory.NO_ERRORS; 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-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamComponentsView.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.ui.views; import java.util.ArrayList; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -18,14 +18,13 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +/** + * + * @author eskimo + * + */ public abstract class BaseFieldEditor implements IFieldEditor { - public BaseFieldEditor(String name, String label,Object defaultValue) { - this.value = defaultValue; - this.labelText = label; - this.nameText = name; - } - PropertyChangeSupport pcs = new PropertyChangeSupport(this); private Object value = new Object(); @@ -33,19 +32,40 @@ private String labelText = "No label"; private String nameText = null; + + Label labelControl = null; + /** + * + * @param name + * @param label + * @param defaultValue + */ + public BaseFieldEditor(String name, String label,Object defaultValue) { + this.value = defaultValue; + this.labelText = label; + this.nameText = name; + } + + /** + * + */ public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); } + /** + * + */ public void removePropertyChangeListener(PropertyChangeListener listener) { pcs.removePropertyChangeListener(listener); } - - public abstract void createEditorControls(Object composite); - Label labelControl = null; - + /** + * + * @param parent + * @return + */ public Label createLabelControl(Composite parent) { if(labelControl==null) { labelControl = new Label(parent,SWT.NO_BACKGROUND); @@ -57,17 +77,32 @@ return labelControl; } + /** + * + * @return + */ public Label getLabelControl() { return createLabelControl(null); } - - abstract public void doFillIntoGrid(Object parent, int columns); + /** + * + */ + abstract public void doFillIntoGrid(Object parent); /** * */ + public abstract Object[] getEditorControls(Object composite); + + /** + * + */ public abstract Object[] getEditorControls(); + /** + * + * @return + */ public Control[] getSwtControls() { return (Control[])getEditorControls(); } @@ -129,7 +164,6 @@ public void setValue(Object newValue) { pcs.firePropertyChange(nameText,value,newValue); value = newValue; - System.out.println("new value - " + newValue); } /** @@ -139,9 +173,10 @@ value = stringValue; } - + /** + * + */ public String getName() { - // TODO Auto-generated method stub return nameText; } @@ -155,4 +190,20 @@ pcs.removePropertyChangeListener(propertyChangeListener); } } + + /** + * + * @return + */ + public String getLabelText() { + return labelText; + } + + /** + * + * @param labelText + */ + public void setLabelText(String labelText) { + this.labelText = labelText; + } } Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BrowseFolderFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BrowseFolderFieldEditor.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BrowseFolderFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,95 +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.ui.widget.editor; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; - -public class BrowseFolderFieldEditor extends TextFieldEditor { - - private Button browseControl; - - public BrowseFolderFieldEditor(String name, String labelText, String defaultvalue) { - super(name, labelText, defaultvalue); - } - - @Override - public void createEditorControls(Object composite) { - // TODO Auto-generated method stub - - } - - @Override - public void doFillIntoGrid(Object parent, int columns) { - Assert.isTrue(parent instanceof Composite); - Composite aComposite = (Composite) parent; - createLabelControl(aComposite); - fTextField = getTextControl(aComposite); - - GridData gd = new GridData(); - - gd.horizontalSpan = columns - 2; - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = true; - - fTextField.setLayoutData(gd); - - createBrowseButtonControl(aComposite); - - gd = new GridData(); - - gd.horizontalSpan = columns - 2; - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = false; - browseControl.setLayoutData(gd); - - } - - private void createBrowseButtonControl(Composite composite) { - if(browseControl==null) { - browseControl = new Button(composite,SWT.PUSH); - browseControl.setText("Browse"); - } else if(composite!=null){ - Assert.isTrue(browseControl.getParent()==composite); - } - } - - public Button getBrowseControl() { - createBrowseButtonControl(null); - return browseControl; - } - - @Override - public Object[] getEditorControls() { - // TODO Auto-generated method stub - return null; - } - - public boolean isEditable() { - // TODO Auto-generated method stub - return false; - } - - public void save(Object object) { - // TODO Auto-generated method stub - - } - - public void setEditable(boolean ediatble) { - // TODO Auto-generated method stub - - } - -} Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -0,0 +1,96 @@ +/** + * + */ +package org.jboss.tools.seam.ui.widget.editor; + +import java.beans.PropertyChangeListener; + +import org.eclipse.jface.action.Action; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; +import org.jboss.tools.seam.ui.widget.field.PushButtonField; + +/** + * @author eskimo + * + */ +public class ButtonFieldEditor extends BaseFieldEditor { + + PushButtonField button= null; + + private ButtonPressedAction buttonAction = new ButtonPressedAction("Browse") { + @Override + public void run() { + throw new RuntimeException("Not implemented yet. Please setup real acion for editor."); + } + }; + + public ButtonFieldEditor(String name, String label) { + super(name, label, new Object()); + } + + public ButtonFieldEditor(String name, ButtonPressedAction action) { + super(name, action.getText(), new Object()); + buttonAction = action; + buttonAction.setFieldEditor(this); + } + + @Override + public void doFillIntoGrid(Object parent) { + } + + @Override + public Object[] getEditorControls() { + return null; + } + + public boolean isEditable() { + return false; + } + + public void save(Object object) { + } + + public void setEditable(boolean ediatble) { + } + + public Object[] getEditorControls(Object composite) { + if(button==null && composite!=null) { + button = new PushButtonField((Composite)composite,buttonAction); + } + return new Control[]{button.getControl()}; + } + + public ButtonPressedAction getButtonaction() { + return buttonAction; + } + + public static class ButtonPressedAction extends Action implements SelectionListener{ + + private IFieldEditor editor = null; + + public ButtonPressedAction(String label) { + super(label); + } + + public void setFieldEditor(IFieldEditor newEditor) { + editor = newEditor; + } + + public IFieldEditor getFieldEditor() { + return editor; + } + + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + run(); + } + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CheckBoxFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CheckBoxFieldEditor.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CheckBoxFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -42,9 +42,9 @@ * @see org.jboss.tools.seam.ui.internal.project.facet.BaseFieldEditor#createEditorControls(java.lang.Object) */ @Override - public void createEditorControls(Object composite) { + public Object[] getEditorControls(Object composite) { // TODO Auto-generated method stub - + return new Control[] {createCheckBoxControl((Composite)composite)}; } /* (non-Javadoc) @@ -52,7 +52,7 @@ */ @Override public Object[] getEditorControls() { - return new Object[] {getLabelControl(),getCheckBoxControl()}; + return new Control[] {getCheckBoxControl()}; } public Control getCheckBoxControl() { @@ -95,19 +95,8 @@ } @Override - public void doFillIntoGrid(Object parent, int columns) { - Assert.isTrue(parent instanceof Composite); - Composite aComposite = (Composite) parent; - createLabelControl(aComposite); - checkBoxControl = createCheckBoxControl(aComposite); + public void doFillIntoGrid(Object parent) { - GridData gd = new GridData(); - - gd.horizontalSpan = columns - 1; - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = true; - - checkBoxControl.setLayoutData(gd); } public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -33,25 +33,13 @@ private Control comboControl; @Override - public void createEditorControls(Object composite) { + public Object[] getEditorControls(Object composite) { // TODO Auto-generated method stub - + return new Control[] {getComboControl((Composite)composite)}; } @Override - public void doFillIntoGrid(Object parent, int columns) { - Assert.isTrue(parent instanceof Composite); - Composite aComposite = (Composite) parent; - createLabelControl(aComposite); - comboControl = getComboControl(aComposite); - - GridData gd = new GridData(); - - gd.horizontalSpan = columns - 1; - gd.horizontalAlignment = SWT.BEGINNING; - gd.grabExcessHorizontalSpace = true; - - comboControl.setLayoutData(gd); + public void doFillIntoGrid(Object parent) { } public Control getComboControl(Composite composite) { Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -0,0 +1,103 @@ +/** + * + */ +package org.jboss.tools.seam.ui.widget.editor; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +/** + * @author eskimo + * + */ +public class CompositeEditor extends BaseFieldEditor implements PropertyChangeListener { + + public CompositeEditor(String name, String label, Object defaultValue) { + super(name, label, defaultValue); + // TODO Auto-generated constructor stub + } + + + @Override + public void doFillIntoGrid(Object parent) { + Assert.isTrue(parent instanceof Composite, "Parent control should be Composite"); + Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,"Editor supports only grid layout"); + Composite aComposite = (Composite) parent; + Control[] controls = (Control[])getEditorControls(aComposite); + GridLayout gl = (GridLayout)((Composite)parent).getLayout(); + + for(int i=0;i<controls.length;i++) { + GridData gd = new GridData(); + gd.horizontalSpan = controls.length-1==i?gl.numColumns-i:1; + gd.horizontalAlignment = controls[i] instanceof Combo?SWT.BEGINNING:GridData.FILL; + gd.grabExcessHorizontalSpace = (i==1); + controls[i].setLayoutData(gd); + } + } + + List<Control> controls = new ArrayList<Control>(); + + @Override + public Object[] getEditorControls() { + if(controls.size()>0) return controls.toArray(); + else throw new IllegalStateException("This metod can be invoked after getEditorControls(parent) only"); + } + + + public Object[] getEditorControls(Object parent) { + for (IFieldEditor editor : editors) { + controls.addAll(Arrays.asList((Control[])editor.getEditorControls(parent))); + } + return controls.toArray(new Control[]{}); + } + + public boolean isEditable() { + return true; + } + + public void save(Object object) { + } + + public void setEditable(boolean ediatble) { + } + + List<IFieldEditor> editors = new ArrayList<IFieldEditor>(); + + public CompositeEditor addFieldEditors(IFieldEditor[] editors) { + this.editors.addAll( Arrays.asList(editors)); + for (IFieldEditor editor : Arrays.asList(editors)) { + editor.addPropertyChangeListener(this); + } + return this; + } + + public void setValue(Object newValue) { + for (IFieldEditor editor : editors) { + editor.removePropertyChangeListener(this); + editor.setValue(newValue); + editor.addPropertyChangeListener(this); + } + } + + public void propertyChange(PropertyChangeEvent event) { + for (IFieldEditor editor : editors) { + if(event.getSource()!=editor) { + editor.removePropertyChangeListener(this); + editor.setValue(event.getNewValue()); + editor.addPropertyChangeListener(this); + } + } + super.setValue(event.getNewValue()); + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -18,7 +18,7 @@ * * @param composite */ - public void createEditorControls(Object composite); + public Object[] getEditorControls(Object composite); /** * @@ -35,9 +35,8 @@ /** * * @param parent - * @param columns */ - public void doFillIntoGrid(Object parent, int columns); + public void doFillIntoGrid(Object parent); /** * @@ -53,12 +52,6 @@ /** * - * @param object - */ - public void save(Object object); - - /** - * * @return */ public boolean isEditable(); Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -0,0 +1,69 @@ +package org.jboss.tools.seam.ui.widget.editor; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +/** + * @author eskimo + * + */ +public class LabelFieldEditor extends BaseFieldEditor { + + public LabelFieldEditor(String name, String label) { + super(name, label, ""); + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#doFillIntoGrid(java.lang.Object) + */ + @Override + public void doFillIntoGrid(Object parent) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#getEditorControls(java.lang.Object) + */ + @Override + public Object[] getEditorControls(Object composite) { + // TODO Auto-generated method stub + return new Control[]{createLabelControl((Composite)composite)}; + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#getEditorControls() + */ + @Override + public Object[] getEditorControls() { + return getEditorControls(null); + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#isEditable() + */ + public boolean isEditable() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#save(java.lang.Object) + */ + public void save(Object object) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#setEditable(boolean) + */ + public void setEditable(boolean ediatble) { + // TODO Auto-generated method stub + + } + + public void setValue(Object value) { + // supress parent method + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -23,7 +23,9 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Text; import org.jboss.tools.seam.ui.widget.field.TextField; @@ -48,7 +50,7 @@ /** * */ - protected Text fTextField = null; + protected TextField fTextField = null; /** * @@ -59,26 +61,28 @@ * */ public Object[] getEditorControls() { - return new Object[] {getLabelControl(),getTextControl()}; + return new Control[] {getTextControl()}; } /** - * @see com.kabira.ide.ex.workbench.ui.feature.IFeatureFieldEditor#doFillIntoGrid(java.lang.Object, int) + * @see com.kabira.ide.ex.workbench.ui.feature.IFeatureFieldEditor#doFillIntoGrid(java.lang.Object) */ - public void doFillIntoGrid(Object aParent,int aNnumColumns) { - Assert.isTrue(aParent instanceof Composite); + public void doFillIntoGrid(Object aParent) { + Assert.isTrue(aParent instanceof Composite, "Parent control should be Composite"); + Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,"Editor supports only grid layout"); Composite aComposite = (Composite) aParent; - createLabelControl(aComposite); - fTextField = getTextControl(aComposite); + Control[] controls = (Control[])getEditorControls(aComposite); + GridLayout gl = (GridLayout)((Composite)aParent).getLayout(); + getTextControl(aComposite); GridData gd = new GridData(); - gd.horizontalSpan = aNnumColumns - 1; + gd.horizontalSpan = gl.numColumns - 1; gd.horizontalAlignment = GridData.FILL; gd.grabExcessHorizontalSpace = true; - fTextField.setLayoutData(gd); + fTextField.getTextControl().setLayoutData(gd); } /** @@ -88,16 +92,16 @@ */ public Text getTextControl(Composite parent) { if (fTextField == null) { - TextField textField = new TextField(parent, getInitialStyle()); - fTextField = textField.getTextControl(); - fTextField.setFont(parent.getFont()); + fTextField = new TextField(parent, getInitialStyle()); + Text textField = fTextField.getTextControl(); + textField.setFont(parent.getFont()); Object value = getValue(); - fTextField.setText(getValue().toString()); - textField.addPropertyChangeListener(this); + textField.setText(getValue().toString()); + fTextField.addPropertyChangeListener(this); } else if (parent!=null){ - Assert.isTrue(parent==fTextField.getParent()); + Assert.isTrue(parent==fTextField.getTextControl().getParent()); } - return fTextField; + return fTextField.getTextControl(); } protected void updateWidgetValues() { @@ -156,7 +160,7 @@ * text field is created yet */ protected Text getTextControl() { - return fTextField; + return fTextField.getTextControl(); } @@ -165,41 +169,36 @@ */ public boolean setFocus() { boolean setfocus = false; - if(fTextField!=null && !fTextField.isDisposed()) - setfocus = fTextField.setFocus(); + if(fTextField!=null && !fTextField.getTextControl().isDisposed()) + setfocus = fTextField.getTextControl().setFocus(); return setfocus; } @Override - public void createEditorControls(Object composite) { - // TODO Auto-generated method stub - + public Object[] getEditorControls(Object composite) { + return new Control[]{getTextControl((Composite)composite)}; } - public void save(Object object) { - // TODO Auto-generated method stub - } - public void setValue() { - // TODO Auto-generated method stub - + public void setValue(Object newWalue) { + fTextField.removePropertyChangeListener(this); + fTextField.getTextControl().setText(newWalue.toString()); + fTextField.addPropertyChangeListener(this); } - public boolean isEditable() { // TODO Auto-generated method stub return false; } - public void setEditable(boolean aEdiatble) { // TODO Auto-generated method stub } public void propertyChange(PropertyChangeEvent evt) { - setValue(evt.getNewValue()); + super.setValue(evt.getNewValue()); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.ui.widget.field; import java.beans.PropertyChangeListener; @@ -3,6 +13,10 @@ import java.beans.PropertyChangeSupport; -public class BaseField { +import org.eclipse.swt.widgets.Control; + +public abstract class BaseField { + public static final String PROPERTY_NAME = "value"; + private PropertyChangeSupport pcs = new PropertyChangeSupport(this); @@ -12,10 +26,12 @@ } public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); + pcs.removePropertyChangeListener(listener); } public void firePropertyChange(Object oldValue, Object newValue) { pcs.firePropertyChange(PROPERTY_NAME, oldValue, newValue); } + + abstract public Control getControl(); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/CheckBoxField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/CheckBoxField.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/CheckBoxField.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.ui.widget.field; import org.eclipse.swt.SWT; @@ -5,6 +15,7 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; public class CheckBoxField extends BaseField implements SelectionListener { private Button checkBox = null; @@ -21,10 +32,16 @@ public void widgetSelected(SelectionEvent e) { firePropertyChange(!checkBox.getSelection(), checkBox.getSelection()); - System.out.println(checkBox.getSelection()); } public Button getCheckBox() { return checkBox; } + + @Override + public Control getControl() { + return getCheckBox(); + } + + } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,6 +1,13 @@ -/** - * - */ +/******************************************************************************* + * 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.ui.widget.field; import java.util.ArrayList; @@ -21,6 +28,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; /** * @author eskimo @@ -94,10 +102,16 @@ public void selectionChanged(SelectionChangedEvent event) { firePropertyChange("", event.getSelection()); - System.out.println(event.getSelection()); } public Combo getComboControl() { return comboControl.getCombo(); } + + @Override + public Control getControl() { + return getComboControl(); + } + + } Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/PushButtonField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/PushButtonField.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/PushButtonField.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -0,0 +1,34 @@ +/** + * + */ +package org.jboss.tools.seam.ui.widget.field; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor.ButtonPressedAction; + +/** + * @author eskimo + * + */ +public class PushButtonField extends BaseField { + + Button button; + + /** + * + */ + @Override + public Control getControl() { + return button; + } + + + public PushButtonField(Composite composite, ButtonPressedAction listener) { + button = new Button(composite,SWT.PUSH); + button.setText(listener.getText()); + button.addSelectionListener(listener); + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.ui.widget.field; import java.beans.PropertyChangeListener; @@ -22,10 +32,14 @@ public void modifyText(ModifyEvent e) { firePropertyChange("",((Text)e.widget).getText()); - System.out.println("modify text to - " + ((Text)e.widget).getText()); } public Text getTextControl() { return textField; } + + @Override + public Control getControl() { + return getTextControl(); + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -10,9 +10,16 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; +import java.util.Arrays; + import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; +import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory; /** * @author eskimo @@ -46,5 +53,26 @@ // TODO Auto-generated method stub } + + public static void main(String[] args) { + Display d = new Display(); + Shell shell = new Shell(d); + shell.setText("test"); + shell.open(); + GridLayout gl = new GridLayout(3,false); + shell.setLayout(gl); + IFieldEditor editor = IFieldEditorFactory.INSTANCE.createBrowseFolderEditor("test", "test1", "test2"); + editor.doFillIntoGrid(shell); + editor = IFieldEditorFactory.INSTANCE.createTextEditor("test", "test1", "test2"); + editor.doFillIntoGrid(shell); + editor = IFieldEditorFactory.INSTANCE.createComboEditor("test", "test1", Arrays.asList(new String[]{"war","ear"}),"test2"); + editor.doFillIntoGrid(shell); + shell.update(); + while(!shell.isDisposed()) { + if(!d.readAndDispatch()) d.sleep(); + } + + d.dispose(); + } } 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-29 19:46:45 UTC (rev 2225) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2007-06-29 19:54:06 UTC (rev 2226) @@ -6,7 +6,8 @@ Bundle-ClassPath: seam-core-tests.jar Bundle-Vendor: Red Hat, Inc. Bundle-Localization: plugin -Export-Package: org.jboss.tools.seam.core.test +Export-Package: org.jboss.tools.seam.core.test, + org.jboss.tools.seam.core.test.project.facet Require-Bundle: org.junit, org.eclipse.core.runtime, 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-29 19:46:45 UTC (rev 2225) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.core.test; -import org.jboss.tools.seam.core.test.project.facet.SeamFaceInstallDelegeteTest; +import org.jboss.tools.seam.core.test.project.facet.SeamFacetInstallDelegeteTest; import junit.framework.Test; import junit.framework.TestSuite; @@ -25,7 +25,7 @@ TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); suite.addTestSuite(ScannerTest.class); - suite.addTestSuite(SeamFaceInstallDelegeteTest.class); + suite.addTestSuite(SeamFacetInstallDelegeteTest.class); return suite; } } Deleted: 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 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFaceInstallDelegeteTest.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -1,36 +0,0 @@ -/** - * - */ -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"); - } - -} Copied: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java (from rev 2186, 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/SeamFacetInstallDelegeteTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -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 SeamFacetInstallDelegeteTest 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"); + } + +} Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2007-06-29 19:54:06 UTC (rev 2226) @@ -82,4 +82,24 @@ install-size="0" version="0.0.0"/> + <plugin + id="org.jboss.tools.jst.web.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam.core.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.seam.ui.tets" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -99,41 +99,53 @@ public void testVpePluginsResolved () { assertPluginsResolved(new String[] { - rhdsNS + "vpe.mozilla", - rhdsNS + "vpe.ui", - rhdsNS + "vpe", - rhdsNS + "vpe.ui.palette" + rhdsNS+"vpe.mozilla", + rhdsNS+"vpe.ui", + rhdsNS+"vpe", + rhdsNS+"vpe.ui.palette" }); } public void testStrutsPluginsResolved () { assertPluginsResolved(new String[] { - rhdsNS + "struts", - rhdsNS + "struts.debug", - rhdsNS + "struts.text.ext", - rhdsNS + "struts.ui", - rhdsNS + "struts.validator.ui", - rhdsNS + "struts.verification" + rhdsNS+"struts", + rhdsNS+"struts.debug", + rhdsNS+"struts.text.ext", + rhdsNS+"struts.ui", + rhdsNS+"struts.validator.ui", + rhdsNS+"struts.verification" }); } public void testShalePluginsResolved () { assertPluginsResolved(new String[] { - rhdsNS + "shale.ui", - rhdsNS + "shale", - rhdsNS + "shale.text.ext" + rhdsNS+"shale.ui", + rhdsNS+"shale", + rhdsNS+"shale.text.ext" }); } public void testCorePluginsResolved () { assertPluginsResolved(new String[] { - jbideNS+"core", jbideNS+"jdt.core", jbideNS+"jdt.j2ee.core", - jbideNS+"jdt.j2ee.ui", jbideNS+"jdt.j2ee.xml.ui", jbideNS+"jdt.test.core", jbideNS+"jdt.test.ui", jbideNS+"jdt.ui", - jbideNS+"jdt.ws.core", jbideNS+"jdt.ws.ui", jbideNS+"archives.core", jbideNS+"archives.ui", - jbideNS+"ui", jbideNS+"xdoclet.assist", jbideNS+"xdoclet.core", jbideNS+"xdoclet.run", + jbideNS+"core", + jbideNS+"jdt.core", + jbideNS+"jdt.j2ee.core", + jbideNS+"jdt.j2ee.ui", + jbideNS+"jdt.j2ee.xml.ui", + jbideNS+"jdt.test.core", + jbideNS+"jdt.test.ui", + jbideNS+"jdt.ui", + jbideNS+"jdt.ws.core", + jbideNS+"jdt.ws.ui", + jbideNS+"archives.core", + jbideNS+"archives.ui", + jbideNS+"ui", + jbideNS+"xdoclet.assist", + jbideNS+"xdoclet.core", + jbideNS+"xdoclet.run", jbideNS+"xdoclet.ui" }); } @@ -141,29 +153,37 @@ public void testEjb3PluginsResolved () { assertPluginsResolved(new String[] { - jbideNS+"ejb3.wizards.core", jbideNS+"ejb3.wizards.ui" + jbideNS+"ejb3.wizards.core", + jbideNS+"ejb3.wizards.ui" }); } public void testASPluginsResolved () { assertPluginsResolved(new String[] { - jbideNS+"as.core", jbideNS+"as.ui", jbideNS+"as.ui.mbeans" + jbideNS+"as.core", + jbideNS+"as.ui", + jbideNS+"as.ui.mbeans" }); } public void testHibernatePluginsResolved () { assertPluginsResolved(new String[] { - "org.hibernate.eclipse", hibNS + "console", hibNS + "help", hibNS + "mapper", hibNS + "jdt.ui", hibNS + "jdt.apt.ui" - + "org.hibernate.eclipse", + hibNS+"console", + hibNS+"help", + hibNS+"mapper", + hibNS+"jdt.ui", + hibNS+"jdt.apt.ui" }); } public void testJbpmPluginsResolved () { assertPluginsResolved(new String[] { - jbpmNS + "core", jbpmNS + "ui" + jbpmNS+"core", + jbpmNS+"ui" }); } @@ -176,15 +196,19 @@ public void testDroolsPluginsResolved () { - assertPluginsResolved(new String[] { - "org.drools.ide" - }); + // Skipped until drools migartion to 3.3 is finished + // assertPluginsResolved(new String[] { + // "org.drools.ide" + // }); } public void testJBossWSPluginsResolved () { assertPluginsResolved(new String[] { - jbwsNS+"core", jbwsNS + "eclipse.core", jbwsNS+"jbosside.wstools", jbwsNS+"libs" + jbwsNS+"core", + jbwsNS+"eclipse.core", + jbwsNS+"jbosside.wstools", + jbwsNS+"libs" }); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2007-06-29 19:46:45 UTC (rev 2225) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2007-06-29 19:54:06 UTC (rev 2226) @@ -139,8 +139,6 @@ if (wtpModel != null) return wtpModel.getDocument(); } catch(Exception e) { VpePlugin.getPluginLog().logError(e); - } finally { - if (wtpModel != null) wtpModel.releaseFromRead(); } return null; }