jbosstools-commits August 2009

jbosstools-commits@lists.jboss.org

1 participants
462 discussions

JBoss Tools SVN: r17180 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal: context and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-08-20 04:27:30 -0400 (Thu, 20 Aug 2009) New Revision: 17180 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java Log: https://jira.jboss.org/jira/browse/JBIDE-4761 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-08-20 07:59:29 UTC (rev 17179) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-08-20 08:27:30 UTC (rev 17180) @@ -25,9 +25,17 @@ import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.java.JavaColumn.Owner; +import org.eclipse.jpt.core.context.orm.OrmBasicMapping; +import org.eclipse.jpt.core.context.orm.OrmEntity; +import org.eclipse.jpt.core.context.orm.OrmIdMapping; +import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; import org.eclipse.jpt.core.context.persistence.Persistence; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.XmlId; import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; @@ -50,6 +58,9 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGenerator; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGeneratorImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaParameter; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmBasicMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmIdMapping; /** @@ -140,5 +151,23 @@ org.eclipse.jpt.core.context.java.JavaJoinColumn.Owner owner) { return new HibernateJavaJoinColumn(parent, owner); } + + @Override + public OrmEntity buildOrmEntity(OrmPersistentType parent, + XmlEntity resourceMapping) { + return new HibernateOrmEntity(parent, resourceMapping); + } + + @Override + public OrmBasicMapping buildOrmBasicMapping(OrmPersistentAttribute parent, + XmlBasic resourceMapping) { + return new HibernateOrmBasicMapping(parent, resourceMapping); + } + + @Override + public OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent, + XmlId resourceMapping) { + return new HibernateOrmIdMapping(parent, resourceMapping); + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2009-08-20 07:59:29 UTC (rev 17179) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2009-08-20 08:27:30 UTC (rev 17180) @@ -105,10 +105,8 @@ String ccName = ((HibernateJpaProject)jpaProject).getDefaultConsoleConfigurationName(); if (ccfg.getName().equals(ccName)){ jpaProject.getJavaProject().getProject().build(IncrementalProjectBuilder.FULL_BUILD, null); - } + } } - - } } catch (CoreException e) { logException(e); @@ -133,7 +131,6 @@ } revalidateProjects(root); } - }); } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2009-08-20 08:27:30 UTC (rev 17180) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.hibernate.jpt.core.internal.context.orm; + +import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmBasicMapping; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.hibernate.cfg.NamingStrategy; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; + +/** + * @author Dmitry Geraskov + * + */ +@SuppressWarnings("restriction") +public class HibernateOrmBasicMapping extends GenericOrmBasicMapping<XmlBasic> { + + public HibernateOrmBasicMapping(OrmPersistentAttribute parent, + XmlBasic resourceMapping) { + super(parent, resourceMapping); + } + + @Override + public HibernateJpaProject getJpaProject() { + return (HibernateJpaProject) super.getJpaProject(); + } + + @Override + public String getDefaultColumnName() { + NamingStrategy ns = getJpaProject().getNamingStrategy(); + if (ns != null) { + return ns.propertyToColumnName(getName()); + } + return super.getDefaultColumnName(); + } + +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java 2009-08-20 08:27:30 UTC (rev 17180) @@ -0,0 +1,109 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.hibernate.jpt.core.internal.context.orm; + +import org.eclipse.jpt.core.context.BaseJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEntity; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.utility.TextRange; +import org.eclipse.jpt.utility.internal.ClassTools; +import org.hibernate.cfg.NamingStrategy; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; + +/** + * @author Dmitry Geraskov + * + */ +@SuppressWarnings("restriction") +public class HibernateOrmEntity extends AbstractOrmEntity { + + public HibernateOrmEntity(OrmPersistentType parent, + XmlEntity resourceMapping) { + super(parent, resourceMapping); + } + + @Override + public HibernateJpaProject getJpaProject() { + return (HibernateJpaProject) super.getJpaProject(); + } + + @Override + protected String buildDefaultName() { + NamingStrategy ns = getJpaProject().getNamingStrategy(); + if (!isMetadataComplete()) { + JavaEntity javaEntity = getJavaEntity(); + if (javaEntity != null) { + return javaEntity.getName(); + } + } + String className = getClass_(); + if (className != null) { + return ns == null ? ClassTools.shortNameForClassNamed(className) + : ns.classToTableName(className); + } + return null; + } + + @Override + protected OrmBaseJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { + return new HibernatePrimaryKeyJoinColumnOwner(); + } + + // ********** pk join column owner ********** + + class HibernatePrimaryKeyJoinColumnOwner implements OrmBaseJoinColumn.Owner + { + public TypeMapping getTypeMapping() { + return HibernateOrmEntity.this; + } + + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + return HibernateOrmEntity.this.getDbTable(tableName); + } + + public org.eclipse.jpt.db.Table getReferencedColumnDbTable() { + Entity parentEntity = HibernateOrmEntity.this.getParentEntity(); + return (parentEntity == null) ? null : parentEntity.getPrimaryDbTable(); + } + + public int joinColumnsSize() { + return HibernateOrmEntity.this.primaryKeyJoinColumnsSize(); + } + + public boolean isVirtual(BaseJoinColumn joinColumn) { + return HibernateOrmEntity.this.defaultPrimaryKeyJoinColumns.contains(joinColumn); + } + + public String getDefaultColumnName() { + if (joinColumnsSize() != 1) { + return null; + } + Entity parentEntity = HibernateOrmEntity.this.getParentEntity(); + NamingStrategy ns = HibernateOrmEntity.this.getJpaProject().getNamingStrategy(); + if (ns == null) + return parentEntity.getPrimaryKeyColumnName(); + + String name = ns.joinKeyColumnName(parentEntity.getPrimaryKeyColumnName(), + parentEntity.getPrimaryTableName()); + return name; + } + + public TextRange getValidationTextRange() { + return null; + } + } +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java 2009-08-20 08:27:30 UTC (rev 17180) @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.hibernate.jpt.core.internal.context.orm; + +import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmIdMapping; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.hibernate.cfg.NamingStrategy; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateOrmIdMapping extends GenericOrmIdMapping { + + public HibernateOrmIdMapping(OrmPersistentAttribute parent, + XmlId resourceMapping) { + super(parent, resourceMapping); + } + + @Override + public HibernateJpaProject getJpaProject() { + return (HibernateJpaProject) super.getJpaProject(); + } + + @Override + public String getDefaultColumnName() { + NamingStrategy namingStrategy = getJpaProject().getNamingStrategy(); + if (namingStrategy != null && getName() != null){ + return namingStrategy.propertyToColumnName(getName()); + } + return super.getDefaultColumnName(); + } + +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17179 - trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-08-20 03:59:29 -0400 (Thu, 20 Aug 2009) New Revision: 17179 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java Log: https://jira.jboss.org/jira/browse/JBIDE-4777 Fixed NPE Fixed problem with adding primary key's columns Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2009-08-20 07:20:06 UTC (rev 17178) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2009-08-20 07:59:29 UTC (rev 17179) @@ -71,6 +71,7 @@ import org.hibernate.eclipse.mapper.model.RevEngPrimaryKeyAdapter; import org.hibernate.eclipse.mapper.model.RevEngTableAdapter; import org.hibernate.mapping.Column; +import org.hibernate.mapping.PrimaryKey; import org.hibernate.mapping.Table; public class TablePropertiesBlock extends MasterDetailsBlock { @@ -206,6 +207,13 @@ columns.put(lastTable,existing); } existing.add(object); + } else if (object instanceof PrimaryKey) { + List existing = (List) columns.get(lastTable); + if(existing==null) { + existing = new ArrayList(); + columns.put(lastTable,existing); + } + existing.addAll(((PrimaryKey)object).getColumns()); } } } @@ -231,7 +239,9 @@ Column column = (Column) colIterator.next(); IRevEngColumn revCol = editor.getReverseEngineeringDefinition().createColumn(); revCol.setName(column.getName()); - revCol.setJDBCType(column.getSqlType()); // TODO: should not be required + if (column.getSqlType() != null){ + revCol.setJDBCType(column.getSqlType()); // TODO: should not be required + } retable.addColumn(revCol); } }

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17178 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: icons/full/obj16 and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-08-20 03:20:06 -0400 (Thu, 20 Aug 2009) New Revision: 17178 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/package_obj.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeCompletionProposal.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposal.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypePackageCompletionProcessor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeProposalLabelProvider.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java Log: JBIDE-4692 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-08-20 03:30:29 UTC (rev 17177) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-08-20 07:20:06 UTC (rev 17178) @@ -10,7 +10,7 @@ org.eclipse.core.resources, org.eclipse.ui.editors, org.eclipse.ui.ide, - org.jboss.tools.smooks.core;bundle-version="1.0.0", + org.jboss.tools.smooks.core, org.eclipse.ui.forms, org.eclipse.wst.sse.core, org.eclipse.wst.sse.ui, @@ -20,13 +20,13 @@ org.eclipse.jdt.core, org.eclipse.jdt.ui, org.eclipse.wst.validation, - org.eclipse.pde.ui, org.eclipse.xsd, org.eclipse.wst.wsdl, org.apache.xerces, javax.wsdl, - org.jboss.tools.smooks.runtime;bundle-version="1.1.2", - org.eclipse.gef + org.jboss.tools.smooks.runtime, + org.eclipse.gef, + org.eclipse.jdt.launching Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/package_obj.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/package_obj.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-08-20 03:30:29 UTC (rev 17177) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -64,13 +64,11 @@ @Override protected void initializeImageRegistry(ImageRegistry reg) { super.initializeImageRegistry(reg); - reg.put(GraphicsConstants.JAVA_PROPERTY_ICON, - getImageDescriptor(GraphicsConstants.JAVA_PROPERTY_ICON_PATH)); - + reg.put(GraphicsConstants.JAVA_PROPERTY_ICON, getImageDescriptor(GraphicsConstants.JAVA_PROPERTY_ICON_PATH)); + reg.put(GraphicsConstants.IMAGE_UNKNOWN_OBJ, imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_UNKNOWN_OBJ)); - // regist ovr images reg.put(GraphicsConstants.IMAGE_OVR_ERROR, getImageDescriptor(GraphicsConstants.IMAGE_OVR_ERROR)); reg.put(GraphicsConstants.IMAGE_OVR_WARING, getImageDescriptor(GraphicsConstants.IMAGE_OVR_WARING)); @@ -90,7 +88,9 @@ reg.put(GraphicsConstants.IMAGE_CHECKBOX_UNCHECK, imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_CHECKBOX_UNCHECK)); reg.put(GraphicsConstants.IMAGE_JAVA_OBJECT, imageDescriptorFromPlugin(PLUGIN_ID, - "icons/full/obj16/class_obj.gif")); + GraphicsConstants.IMAGE_JAVA_OBJECT)); + reg.put(GraphicsConstants.IMAGE_PACKAGE_OBJECT, imageDescriptorFromPlugin(PLUGIN_ID, + GraphicsConstants.IMAGE_PACKAGE_OBJECT)); reg.put(GraphicsConstants.IMAGE_JAVA_ARRAY, imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_JAVA_ARRAY)); reg.put(GraphicsConstants.IMAGE_JAVA_COLLECTION, imageDescriptorFromPlugin(PLUGIN_ID, @@ -98,14 +98,12 @@ reg.put(GraphicsConstants.IMAGE_JAVA_FILE, imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_JAVA_FILE)); - // for the xml2xml line - reg.put(GraphicsConstants.IMAGE_XML_FILE, imageDescriptorFromPlugin(PLUGIN_ID, - GraphicsConstants.IMAGE_XML_FILE)); - - reg.put(GraphicsConstants.IMAGE_XSD_FILE, imageDescriptorFromPlugin(PLUGIN_ID, - GraphicsConstants.IMAGE_XSD_FILE)); + reg.put(GraphicsConstants.IMAGE_XML_FILE, + imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_XML_FILE)); + reg.put(GraphicsConstants.IMAGE_XSD_FILE, + imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_XSD_FILE)); reg.put(GraphicsConstants.IMAGE_BINDING_LINE, imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_BINDING_LINE)); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-08-20 03:30:29 UTC (rev 17177) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -8,8 +8,10 @@ public static final String IMAGE_JAVA_ATTRIBUTE = "icons/full/obj16/att_obj.gif"; - public static final String IMAGE_JAVA_OBJECT = "java_object"; + public static final String IMAGE_JAVA_OBJECT = "icons/full/obj16/class_obj.gif"; + public static final String IMAGE_PACKAGE_OBJECT = "icons/full/obj16/package_obj.gif"; + public static final String IMAGE_OVR_ERROR = "icons/full/ovr16/error_co.gif"; public static final String IMAGE_OVR_WARING = "icons/full/ovr16/warning_co.gif"; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-20 03:30:29 UTC (rev 17177) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -30,6 +30,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI; @@ -47,9 +48,13 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.search.IJavaSearchConstants; +import org.eclipse.jdt.core.search.IJavaSearchScope; +import org.eclipse.jdt.core.search.SearchEngine; +import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.ToolBarManager; @@ -71,9 +76,6 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalListener; -import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalProvider; -import org.eclipse.pde.internal.ui.editor.contentassist.TypeProposalLabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -125,6 +127,9 @@ import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel; import org.jboss.tools.smooks.configuration.editors.javabean.JavaMethodsSelectionDialog; import org.jboss.tools.smooks.configuration.editors.javabean.JavaPropertiesSelectionDialog; +import org.jboss.tools.smooks.contentassist.TypeContentProposalListener; +import org.jboss.tools.smooks.contentassist.TypeContentProposalProvider; +import org.jboss.tools.smooks.contentassist.TypeProposalLabelProvider; import org.jboss.tools.smooks.core.SmooksCoreActivator; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; @@ -2412,5 +2417,39 @@ return false; } + + public static IJavaSearchScope getSearchScope(IJavaProject project) { + return SearchEngine.createJavaSearchScope(getNonJRERoots(project)); + } + public static IJavaSearchScope getSearchScope(IProject project) { + return getSearchScope(JavaCore.create(project)); + } + + public static IPackageFragmentRoot[] getNonJRERoots(IJavaProject project) { + ArrayList<Object> result = new ArrayList<Object>(); + try { + IPackageFragmentRoot[] roots = project.getAllPackageFragmentRoots(); + for (int i = 0; i < roots.length; i++) { + if (!isJRELibrary(roots[i])) { + result.add(roots[i]); + } + } + } catch (JavaModelException e) { + } + return (IPackageFragmentRoot[]) result.toArray(new IPackageFragmentRoot[result.size()]); + } + + public static boolean isJRELibrary(IPackageFragmentRoot root) { + try { + IPath path = root.getRawClasspathEntry().getPath(); + if (path.equals(new Path(JavaRuntime.JRE_CONTAINER)) || path.equals(new Path(JavaRuntime.JRELIB_VARIABLE))) { + return true; + } + } catch (JavaModelException e) { + } + return false; + } + + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java 2009-08-20 03:30:29 UTC (rev 17177) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -12,8 +12,8 @@ import org.eclipse.jface.fieldassist.IContentProposalListener; import org.eclipse.jface.fieldassist.IContentProposalListener2; -import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalListener; import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; +import org.jboss.tools.smooks.contentassist.TypeContentProposalListener; /** * @author Dart (dpeng(a)redhat.com) Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeCompletionProposal.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeCompletionProposal.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeCompletionProposal.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -0,0 +1,146 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.contentassist; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IInformationControlCreator; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3; +import org.eclipse.jface.text.contentassist.ICompletionProposalExtension5; +import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; + +/** + * @author Dart + * + */ +public class TypeCompletionProposal implements ICompletionProposal, ICompletionProposalExtension3, ICompletionProposalExtension5 { + + protected String fReplacementString; + protected Image fImage; + protected String fDisplayString; + protected int fBeginInsertPoint; + protected int fLength; + protected String fAdditionalInfo; +// private IInformationControlCreator fCreator; + + public TypeCompletionProposal(String replacementString, Image image, String displayString) { + this(replacementString, image, displayString, 0, 0); + } + + public TypeCompletionProposal(String replacementString, Image image, String displayString, int startOffset, int length) { + Assert.isNotNull(replacementString); + + fReplacementString = replacementString; + fImage = image; + fDisplayString = displayString; + fBeginInsertPoint = startOffset; + fLength = length; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument) + */ + public void apply(IDocument document) { + if (fLength == -1) { + fLength = document.getLength(); + } + try { + document.replace(fBeginInsertPoint, fLength, fReplacementString); + } catch (BadLocationException e) { + // DEBUG + // e.printStackTrace(); + } + } + + /* (non-Javadoc) + * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo() + */ + public String getAdditionalProposalInfo() { + // No additional proposal information + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation() + */ + public IContextInformation getContextInformation() { + // No context information + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString() + */ + public String getDisplayString() { + return fDisplayString; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage() + */ + public Image getImage() { + return fImage; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument) + */ + public Point getSelection(IDocument document) { + if (fReplacementString.equals("\"\"")) //$NON-NLS-1$ + return new Point(fBeginInsertPoint + 1, 0); + return new Point(fBeginInsertPoint + fReplacementString.length(), 0); + } + + public String getReplacementString() { + return fReplacementString; + } + + public Object getAdditionalProposalInfo(IProgressMonitor monitor) { + return fAdditionalInfo; + } + + public void setAdditionalProposalInfo(String info) { + fAdditionalInfo = info; + } + + public IInformationControlCreator getInformationControlCreator() { +// if (!BrowserInformationControl.isAvailable(null)) +// return null; +// +// if (fCreator == null) { +// fCreator = new AbstractReusableInformationControlCreator() { +// +// /* +// * @see org.eclipse.jdt.internal.ui.text.java.hover.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell) +// */ +// public IInformationControl doCreateInformationControl(Shell parent) { +// return new BrowserInformationControl(parent, SWT.NO_TRIM | SWT.TOOL, SWT.NONE, EditorsUI.getTooltipAffordanceString()); +// } +// }; +// } +// return fCreator; + return null; + } + + public int getPrefixCompletionStart(IDocument document, int completionOffset) { + return fBeginInsertPoint; + } + + public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) { + return fReplacementString; + } + +} \ No newline at end of file Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeCompletionProposal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposal.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposal.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposal.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -0,0 +1,95 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.contentassist; + +import org.eclipse.jface.fieldassist.IContentProposal; +import org.eclipse.swt.graphics.Image; + +/** + * @author Dart + * + */ +public class TypeContentProposal implements IContentProposal { + + private String fLabel; + + private String fContent; + + private String fDescription; + + private Image fImage; + + /** + * + */ + public TypeContentProposal(String label, String content, String description, Image image) { + fLabel = label; + fContent = content; + fDescription = description; + fImage = image; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.fieldassist.IContentProposal#getContent() + */ + public String getContent() { + return fContent; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.fieldassist.IContentProposal#getCursorPosition() + */ + public int getCursorPosition() { + if (fContent != null) { + return fContent.length(); + } + return 0; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.fieldassist.IContentProposal#getDescription() + */ + public String getDescription() { + return fDescription; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.fieldassist.IContentProposal#getLabel() + */ + public String getLabel() { + return fLabel; + } + + /** + * @return + */ + public Image getImage() { + return fImage; + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + public String toString() { + return fLabel; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalListener.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalListener.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.contentassist; + +import org.eclipse.jface.fieldassist.ContentProposalAdapter; +import org.eclipse.jface.fieldassist.IContentProposal; +import org.eclipse.jface.fieldassist.IContentProposalListener; +import org.eclipse.jface.fieldassist.IContentProposalListener2; +import org.eclipse.jface.fieldassist.IContentProposalProvider; + +/** + * @author Dart + * + */ +public class TypeContentProposalListener implements IContentProposalListener, IContentProposalListener2 { + + /** + * + */ + public TypeContentProposalListener() { + // NO-OP + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalListener#proposalAccepted(org.eclipse.jface.fieldassist.IContentProposal) + */ + public void proposalAccepted(IContentProposal proposal) { + // NO-OP + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalListener2#proposalPopupClosed(org.eclipse.jface.fieldassist.ContentProposalAdapter) + */ + public void proposalPopupClosed(ContentProposalAdapter adapter) { + IContentProposalProvider provider = adapter.getContentProposalProvider(); + if (provider instanceof TypeContentProposalProvider) { + // Reset state related information used for filtering existing proposals + ((TypeContentProposalProvider) provider).reset(); + } + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalListener2#proposalPopupOpened(org.eclipse.jface.fieldassist.ContentProposalAdapter) + */ + public void proposalPopupOpened(ContentProposalAdapter adapter) { + // NO-OP + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalProvider.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -0,0 +1,216 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.contentassist; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.ListIterator; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.fieldassist.IContentProposal; +import org.eclipse.jface.fieldassist.IContentProposalProvider; +import org.eclipse.swt.graphics.Image; + +/** + * @author Dart + * + */ +public class TypeContentProposalProvider extends TypePackageCompletionProcessor implements + IContentProposalProvider { + public static final char F_DOT = '.'; + + private IProject fProject; + + private int fTypeScope; + + private ArrayList<Object> fInitialContentProposals; + + private String fInitialContent; + + private Comparator<Object> fComparator; + + /** + * + */ + public TypeContentProposalProvider(IProject project, int scope) { + fProject = project; + fTypeScope = scope; + fComparator = new TypeComparator(); + + reset(); + } + + /** + * TypeComparator + * + */ + private static class TypeComparator implements Comparator<Object> { + + /** + * + */ + public TypeComparator() { + // NO-OP + } + + /* + * (non-Javadoc) + * + * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) + */ + public int compare(Object arg0, Object arg1) { + String proposalSortKey1 = ((IContentProposal) arg0).getLabel(); + String proposalSortKey2 = ((IContentProposal) arg1).getLabel(); + return proposalSortKey1.compareToIgnoreCase(proposalSortKey2); + } + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java + * .lang.String, int) + */ + public IContentProposal[] getProposals(String contents, int position) { + // Generate a list of proposals based on the current contents + ArrayList<Object> currentContentProposals = null; + // Determine method to obtain proposals based on current field contents + if (position == 0) { + // If the document offset is at the 0 position (i.e. no input + // entered), + // do not perform content assist. The operation is too expensive + // because all classes and interfaces (depending on the specified + // scope) + // will need to be resolved as proposals + currentContentProposals = null; + } else if ((fInitialContentProposals == null) || (contents.length() < fInitialContent.length()) + || (endsWithDot(contents))) { + // Generate new proposals if the content assist session was just + // started + // Or generate new proposals if the current contents of the field + // is less than the initial contents of the field used to + // generate the original proposals; thus, widening the search + // scope. This can occur when the user types backspace + // Or generate new proposals if the current contents ends with a + // dot + currentContentProposals = generateContentProposals(contents); + } else { + // Filter existing proposals from a prevous search; thus, narrowing + // the search scope. This can occur when the user types additional + // characters in the field causing new characters to be appended to + // the initial field contents + currentContentProposals = filterContentProposals(contents); + } + + return convertResultsToSortedProposals(currentContentProposals); + } + + /** + * + */ + public void reset() { + fInitialContentProposals = null; + } + + /* + * (non-Javadoc) + * + * @seeorg.eclipse.pde.internal.ui.editor.contentassist. + * TypePackageCompletionProcessor + * #addProposalToCollection(java.util.Collection, int, int, + * java.lang.String, java.lang.String, org.eclipse.swt.graphics.Image) + */ + protected void addProposalToCollection(Collection<Object> collection, int startOffset, int length, String label, + String content, Image image) { + // Create content proposals for field assist + // start offset and length not required + IContentProposal proposal = new TypeContentProposal(label, content, null, image); + // Add the proposal to the list of proposals + collection.add(proposal); + } + + /** + * @param string + * @return + */ + private boolean endsWithDot(String string) { + int index = string.lastIndexOf(F_DOT); + if ((index + 1) == string.length()) { + return true; + } + return false; + } + + /** + * @param currentContent + * @return + */ + private ArrayList<Object> generateContentProposals(String currentContent) { + fInitialContentProposals = new ArrayList<Object>(); + // Store the initial field contents to determine if we need to + // widen the scope later + fInitialContent = currentContent; + generateTypePackageProposals(currentContent, fProject, fInitialContentProposals, 0, fTypeScope, true); + return fInitialContentProposals; + } + + /** + * @param list + * @return + */ + private IContentProposal[] convertResultsToSortedProposals(ArrayList<Object> list) { + IContentProposal[] proposals = null; + if ((list != null) && (list.size() != 0)) { + // Convert the results array list into an array of completion + // proposals + proposals = (IContentProposal[]) list.toArray(new IContentProposal[list.size()]); + // Sort the proposals alphabetically + Arrays.sort(proposals, fComparator); + } else { + proposals = new IContentProposal[0]; + } + return proposals; + } + + /** + * @param currentContent + * @return + */ + private ArrayList<Object> filterContentProposals(String currentContent) { + String lowerCaseCurrentContent = currentContent.toLowerCase(); + ListIterator<Object> iterator = fInitialContentProposals.listIterator(); + // Maintain a list of filtered search results + ArrayList<Object> filteredContentProposals = new ArrayList<Object>(); + // Iterate over the initial search results + while (iterator.hasNext()) { + Object object = iterator.next(); + IContentProposal proposal = (IContentProposal) object; + String compareString = null; + if (lowerCaseCurrentContent.indexOf(F_DOT) == -1) { + // Use only the type name + compareString = proposal.getLabel().toLowerCase(); + } else { + // Use the fully qualified type name + compareString = proposal.getContent().toLowerCase(); + } + // Filter out any proposal not matching the current contents + // except for the edge case where the proposal is identical to the + // current contents + if (compareString.startsWith(lowerCaseCurrentContent, 0)) { + filteredContentProposals.add(proposal); + } + } + return filteredContentProposals; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeContentProposalProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypePackageCompletionProcessor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypePackageCompletionProcessor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypePackageCompletionProcessor.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -0,0 +1,288 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.contentassist; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.CompletionProposal; +import org.eclipse.jdt.core.CompletionRequestor; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IBuffer; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.search.IJavaSearchConstants; +import org.eclipse.jdt.core.search.IJavaSearchScope; +import org.eclipse.jdt.core.search.SearchEngine; +import org.eclipse.jdt.core.search.SearchPattern; +import org.eclipse.jdt.core.search.TypeNameRequestor; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.jface.text.contentassist.IContextInformationValidator; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; +import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; + +/** + * @author Dart + * + */ +public class TypePackageCompletionProcessor implements IContentAssistProcessor { + + private String fErrorMessage; + private SearchEngine fSearchEngine; + private Comparator<? super Object> fComparator; + + abstract class ProposalGenerator { + abstract protected ICompletionProposal generateClassCompletion(String pName, String cName, boolean isClass); + + abstract protected ICompletionProposal generatePackageCompletion(String pName); + } + + public TypePackageCompletionProcessor() { + fSearchEngine = new SearchEngine(); + } + + public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) { + return null; + } + + public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) { + return null; + } + + public char[] getCompletionProposalAutoActivationCharacters() { + return null; + } + + public char[] getContextInformationAutoActivationCharacters() { + return null; + } + + public IContextInformationValidator getContextInformationValidator() { + return null; + } + + public String getErrorMessage() { + return fErrorMessage; + } + + protected void generateTypePackageProposals(String currentContent, IProject project, Collection<Object> c, + int startOffset, int typeScope) { + generateTypePackageProposals(currentContent, project, c, startOffset, typeScope, false); + } + + protected void generateTypePackageProposals(String currentContent, IProject project, Collection<Object> c, + int startOffset, int typeScope, boolean replaceEntireContents) { + currentContent = removeLeadingSpaces(currentContent); + if (c == null || currentContent.length() == 0) + return; + int length = (replaceEntireContents) ? -1 : currentContent.length(); + generateProposals(currentContent, project, c, startOffset, length, typeScope); + } + + private void generateProposals(String currentContent, IProject project, final Collection<Object> c, + final int startOffset, final int length, final int typeScope) { + + class TypePackageCompletionRequestor extends CompletionRequestor { + + public TypePackageCompletionRequestor() { + super(true); + setIgnored(CompletionProposal.PACKAGE_REF, false); + setIgnored(CompletionProposal.TYPE_REF, false); + } + + public void accept(CompletionProposal proposal) { + if (proposal.getKind() == CompletionProposal.PACKAGE_REF) { + String pkgName = new String(proposal.getCompletion()); + addProposalToCollection(c, startOffset, length, pkgName, pkgName, SmooksConfigurationActivator + .getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_PACKAGE_OBJECT)); + } else { + boolean isInterface = Flags.isInterface(proposal.getFlags()); + String completion = new String(proposal.getCompletion()); + if (isInterface && typeScope == IJavaSearchConstants.CLASS + || (!isInterface && typeScope == IJavaSearchConstants.INTERFACE) + || completion.equals("Dummy2")) //$NON-NLS-1$ + // don't want Dummy class showing up as option. + return; + int period = completion.lastIndexOf('.'); + String cName = null, pName = null; + if (period == -1) { + cName = completion; + } else { + cName = completion.substring(period + 1); + pName = completion.substring(0, period); + } + Image image = isInterface ? SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_JAVA_INTERFACE) : SmooksConfigurationActivator.getDefault() + .getImageRegistry().get(GraphicsConstants.IMAGE_JAVA_OBJECT); + addProposalToCollection(c, startOffset, length, cName + " - " + pName, //$NON-NLS-1$ + completion, image); + } + } + + } + + try { + ICompilationUnit unit = getWorkingCopy(project); + if (unit == null) { + generateTypeProposals(currentContent, project, c, startOffset, length, 1); + return; + } + IBuffer buff = unit.getBuffer(); + buff.setContents("class Dummy2 { " + currentContent); //$NON-NLS-1$ + + CompletionRequestor req = new TypePackageCompletionRequestor(); + unit.codeComplete(15 + currentContent.length(), req); + unit.discardWorkingCopy(); + } catch (JavaModelException e) { + } + } + + private ICompilationUnit getWorkingCopy(IProject project) throws JavaModelException { + IPackageFragmentRoot[] roots = JavaCore.create(project).getPackageFragmentRoots(); + if (roots.length > 0) { + IPackageFragment frag = null; + for (int i = 0; i < roots.length; i++) + if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE + || project.equals(roots[i].getCorrespondingResource()) + || (roots[i].isArchive() && !roots[i].isExternal())) { + IJavaElement[] elems = roots[i].getChildren(); + if ((elems.length > 0) && (i < elems.length) && (elems[i] instanceof IPackageFragment)) { + frag = (IPackageFragment) elems[i]; + break; + } + } + if (frag != null) + return frag.getCompilationUnit("Dummy2.java").getWorkingCopy(new NullProgressMonitor()); //$NON-NLS-1$ + } + return null; + } + + protected void generateTypeProposals(String currentContent, IProject project, final Collection<Object> c, + final int startOffset, final int length, int typeScope) { + // Dynamically adjust the search scope depending on the current + // state of the project + IJavaSearchScope scope = SmooksUIUtils.getSearchScope(project); + char[] packageName = null; + char[] typeName = null; + int index = currentContent.lastIndexOf('.'); + + if (index == -1) { + // There is no package qualification + // Perform the search only on the type name + typeName = currentContent.toCharArray(); + } else if ((index + 1) == currentContent.length()) { + // There is a package qualification and the last character is a + // dot + // Perform the search for all types under the given package + // Pattern for all types + typeName = "".toCharArray(); //$NON-NLS-1$ + // Package name without the trailing dot + packageName = currentContent.substring(0, index).toCharArray(); + } else { + // There is a package qualification, followed by a dot, and + // a type fragment + // Type name without the package qualification + typeName = currentContent.substring(index + 1).toCharArray(); + // Package name without the trailing dot + packageName = currentContent.substring(0, index).toCharArray(); + } + + try { + TypeNameRequestor req = new TypeNameRequestor() { + public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, + char[][] enclosingTypeNames, String path) { + // Accept search results from the JDT SearchEngine + String cName = new String(simpleTypeName); + String pName = new String(packageName); + String label = cName + " - " + pName; //$NON-NLS-1$ + String content = pName + "." + cName; //$NON-NLS-1$ + Image image = (Flags.isInterface(modifiers)) ? SmooksConfigurationActivator.getDefault() + .getImageRegistry().get(GraphicsConstants.IMAGE_JAVA_INTERFACE) + : SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_JAVA_OBJECT); + addProposalToCollection(c, startOffset, length, label, content, image); + } + }; + // Note: Do not use the search() method, its performance is + // bad compared to the searchAllTypeNames() method + fSearchEngine.searchAllTypeNames(packageName, SearchPattern.R_EXACT_MATCH, typeName, + SearchPattern.R_PREFIX_MATCH, typeScope, scope, req, + IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null); + } catch (CoreException e) { + fErrorMessage = e.getMessage(); + } + } + + public void sortCompletions(ICompletionProposal[] proposals) { + Arrays.sort(proposals, getComparator()); + } + + private Comparator<? super Object> getComparator() { + if (fComparator == null) { + fComparator = new Comparator<? super Object>() { + /* + * (non-Javadoc) + * + * @see java.util.Comparator#compare(java.lang.Object, + * java.lang.Object) + */ + public int compare(Object arg0, Object arg1) { + ICompletionProposal p1 = (ICompletionProposal) arg0; + ICompletionProposal p2 = (ICompletionProposal) arg1; + + return getSortKey(p1).compareToIgnoreCase(getSortKey(p2)); + } + + protected String getSortKey(ICompletionProposal p) { + return p.getDisplayString(); + } + }; + } + return fComparator; + } + + protected final String removeLeadingSpaces(String value) { + char[] valueArray = value.toCharArray(); + int i = 0; + for (; i < valueArray.length; i++) + if (!Character.isWhitespace(valueArray[i])) + break; + return (i == valueArray.length) ? "" : new String(valueArray, i, valueArray.length - i); //$NON-NLS-1$ + } + + /** + * @param c + * @param startOffset + * @param length + * @param label + * @param content + * @param image + */ + protected void addProposalToCollection(final Collection<Object> c, final int startOffset, final int length, + String label, String content, Image image) { + TypeCompletionProposal proposal = new TypeCompletionProposal(content, image, label, startOffset, length); + c.add(proposal); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypePackageCompletionProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeProposalLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeProposalLabelProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeProposalLabelProvider.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.contentassist; + +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; + +/** + * @author Dart + * + */ +public class TypeProposalLabelProvider extends LabelProvider { + + /** + * + */ + public TypeProposalLabelProvider() { + // NO-OP + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) + */ + public Image getImage(Object element) { + if (element instanceof TypeContentProposal) { + return ((TypeContentProposal) element).getImage(); + } + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/contentassist/TypeProposalLabelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-08-20 03:30:29 UTC (rev 17177) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-08-20 07:20:06 UTC (rev 17178) @@ -37,16 +37,16 @@ } public IFigure createFigure() { -// TreeNodeConnection model = (TreeNodeConnection) getModel(); -// AbstractSmooksGraphicalModel sourceModel = model.getSourceNode(); -// AbstractSmooksGraphicalModel targetModel = model.getTargetNode(); -// PolylineConnection connection1 = new PolylineConnection() { -// @Override -// public void paintFigure(Graphics graphics) { -// graphics.setAlpha(alpha); -// super.paintFigure(graphics); -// } -// }; + // TreeNodeConnection model = (TreeNodeConnection) getModel(); + // AbstractSmooksGraphicalModel sourceModel = model.getSourceNode(); + // AbstractSmooksGraphicalModel targetModel = model.getTargetNode(); + // PolylineConnection connection1 = new PolylineConnection() { + // @Override + // public void paintFigure(Graphics graphics) { + // graphics.setAlpha(alpha); + // super.paintFigure(graphics); + // } + // }; // if (sourceModel instanceof TreeContainerModel || targetModel // instanceof TreeContainerModel) { // // connection1.setConnectionRouter(new ManhattanConnectionRouter()); @@ -183,7 +183,7 @@ pointList.addPoint(p3); graphics.fillPolygon(pointList); graphics.drawPolygon(pointList); - }else{ + } else { Point p = this.getBounds().getTopRight(); Point p2 = this.getBounds().getBottomRight(); Point p3 = this.getBounds().getTopLeft(); @@ -200,8 +200,8 @@ } }; - targetFlagFigure.setSize(5, 5); - sourceFlagFigure.setSize(5, 5); + targetFlagFigure.setSize(7, 7); + sourceFlagFigure.setSize(7, 7); ConnectionLocator targetLocator = new ConnectionLocator(connection, ConnectionLocator.TARGET); connection.add(targetFlagFigure, targetLocator); ConnectionLocator sourceLocator = new ConnectionLocator(connection, ConnectionLocator.SOURCE);

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17177 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 23:30:29 -0400 (Wed, 19 Aug 2009) New Revision: 17177 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java Log: JBIDE-4320 - AS Tools commit Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-08-20 02:37:24 UTC (rev 17176) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-08-20 03:30:29 UTC (rev 17177) @@ -15,7 +15,8 @@ org.eclipse.wst.xml.core, org.apache.ant, org.jboss.tools.jmx.core;bundle-version="0.2.1", - org.eclipse.core.variables;bundle-version="3.2.200" + org.eclipse.core.variables;bundle-version="3.2.200", + org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0" Eclipse-LazyStart: true Export-Package: org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.core.extensions.descriptors, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-08-20 02:37:24 UTC (rev 17176) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-08-20 03:30:29 UTC (rev 17177) @@ -26,9 +26,9 @@ import org.eclipse.wst.server.core.model.ServerDelegate; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.util.IWTPConstants; import org.jboss.ide.eclipse.as.core.util.ModuleUtil; import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; public class DeployableServer extends ServerDelegate implements IDeployableServer { @@ -78,14 +78,27 @@ private IModule[] doGetParentModules(IModule module) { - IModule[] ears = org.eclipse.wst.server.core.ServerUtil.getModules(IWTPConstants.FACET_EAR); + // get all supported modules + IModule[] supported = + org.eclipse.wst.server.core.ServerUtil.getModules( + getServer().getServerType().getRuntimeType().getModuleTypes()); ArrayList<IModule> list = new ArrayList<IModule>(); - for (int i = 0; i < ears.length; i++) { - IEnterpriseApplication ear = (IEnterpriseApplication)ears[i].loadAdapter(IEnterpriseApplication.class,null); - IModule[] childs = ear.getModules(); - for (int j = 0; j < childs.length; j++) { - if(childs[j].equals(module)) - list.add(ears[i]); + + for( int i = 0; i < supported.length; i++ ) { + IEnterpriseApplication jeeMod = (IEnterpriseApplication)supported[i].loadAdapter(IEnterpriseApplication.class,null); + IJBTModule jbtMod = (IJBTModule)supported[i].loadAdapter(IJBTModule.class, null); + if( jeeMod != null ) { + IModule[] childs = jeeMod.getModules(); + for (int j = 0; j < childs.length; j++) { + if(childs[j].equals(module)) + list.add(supported[i]); + } + } else if( jbtMod != null ) { + IModule[] childs = jbtMod.getModules(); + for (int j = 0; j < childs.length; j++) { + if(childs[j].equals(module)) + list.add(supported[i]); + } } } return list.toArray(new IModule[list.size()]); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2009-08-20 02:37:24 UTC (rev 17176) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2009-08-20 03:30:29 UTC (rev 17177) @@ -15,11 +15,9 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jst.server.core.IEnterpriseApplication; -import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IModuleType; import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; public class ModuleUtil { public static ArrayList<IModule[]> getShallowChildren(IServer server, IModule[] root) { @@ -50,24 +48,14 @@ public static IModule[] getChildModules(IModule[] module) { int last = module.length-1; if (module[last] != null && module[last].getModuleType() != null) { - IModuleType moduleType = module[last].getModuleType(); - if(IJBossServerConstants.FACET_EAR.equals(moduleType.getId())) { - IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0] - .loadAdapter(IEnterpriseApplication.class, null); - if (enterpriseApplication != null) { - IModule[] earModules = enterpriseApplication.getModules(); - if ( earModules != null) { - return earModules; - } - } - } - else if (IJBossServerConstants.FACET_WEB.equals(moduleType.getId())) { - IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null); - if (webModule != null) { - IModule[] modules = webModule.getModules(); - return modules; - } - } + IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[last] + .loadAdapter(IEnterpriseApplication.class, null); + if( enterpriseApplication != null ) + return enterpriseApplication.getModules() == null ? new IModule[]{} : enterpriseApplication.getModules(); + + IJBTModule jbtMod = (IJBTModule)module[last].loadAdapter(IJBTModule.class, null); + if( jbtMod != null ) + return jbtMod.getModules(); } return new IModule[0]; }

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17176 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 22:37:24 -0400 (Wed, 19 Aug 2009) New Revision: 17176 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java Log: NLS failing after renamed plugin Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2009-08-20 02:33:24 UTC (rev 17175) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2009-08-20 02:37:24 UTC (rev 17176) @@ -3,7 +3,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.wtp.override.ui.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.wtp.ui.messages"; //$NON-NLS-1$ public static String AddModuleDependenciesPropertiesPage_AddProjectButton; public static String AddModuleDependenciesPropertiesPage_DeployPathColumn; public static String AddModuleDependenciesPropertiesPage_RemoveSelectedButton;

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17175 - in trunk/as/plugins: org.jboss.ide.eclipse.as.wtp.ui and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 22:33:24 -0400 (Wed, 19 Aug 2009) New Revision: 17175 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/ Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/override/ Log: FUCK SVN Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/.project 2009-08-20 00:29:38 UTC (rev 17169) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project 2009-08-20 02:33:24 UTC (rev 17175) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.ide.eclipse.as.wtp.override.ui</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project (from rev 17171, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/.project) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/.project 2009-08-20 02:33:24 UTC (rev 17175) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.ide.eclipse.as.wtp.ui</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 00:29:38 UTC (rev 17169) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2009-08-20 02:33:24 UTC (rev 17175) @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: WTP UI Overrides -Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.override.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources;bundle-version="3.5.0", - org.eclipse.wst.common.modulecore;bundle-version="1.1.300", - org.eclipse.jst.j2ee;bundle-version="1.1.300", - org.eclipse.jst.j2ee.core;bundle-version="1.1.300", - org.eclipse.jst.j2ee.ui;bundle-version="1.1.300", - org.eclipse.wst.common.core;bundle-version="1.1.201", - org.eclipse.wst.common.frameworks;bundle-version="1.1.300", - org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.300", - org.eclipse.jst.common.frameworks;bundle-version="1.1.300", - org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0", - org.eclipse.jdt;bundle-version="3.5.0", - org.eclipse.jdt.core;bundle-version="3.5.0", - org.eclipse.jem.util;bundle-version="2.0.200", - org.eclipse.jst.jee;bundle-version="1.0.200", - org.eclipse.jdt.ui;bundle-version="3.5.0", - org.jboss.ide.eclipse.as.wtp.override.core;bundle-version="1.0.0", - org.eclipse.wst.server.ui;bundle-version="1.1.102", - org.eclipse.wst.server.core;bundle-version="1.1.101", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300", - org.eclipse.emf.ecore;bundle-version="2.5.0" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: JBoss by Red Hat Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF (from rev 17172, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2009-08-20 02:33:24 UTC (rev 17175) @@ -0,0 +1,30 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: WTP UI Overrides +Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.ui;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.core.resources;bundle-version="3.5.0", + org.eclipse.wst.common.modulecore;bundle-version="1.1.300", + org.eclipse.jst.j2ee;bundle-version="1.1.300", + org.eclipse.jst.j2ee.core;bundle-version="1.1.300", + org.eclipse.jst.j2ee.ui;bundle-version="1.1.300", + org.eclipse.wst.common.core;bundle-version="1.1.201", + org.eclipse.wst.common.frameworks;bundle-version="1.1.300", + org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.300", + org.eclipse.jst.common.frameworks;bundle-version="1.1.300", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0", + org.eclipse.jdt;bundle-version="3.5.0", + org.eclipse.jdt.core;bundle-version="3.5.0", + org.eclipse.jem.util;bundle-version="2.0.200", + org.eclipse.jst.jee;bundle-version="1.0.200", + org.eclipse.jdt.ui;bundle-version="3.5.0", + org.eclipse.wst.server.ui;bundle-version="1.1.102", + org.eclipse.wst.server.core;bundle-version="1.1.101", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300", + org.eclipse.emf.ecore;bundle-version="2.5.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: JBoss by Red Hat Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-08-20 00:29:38 UTC (rev 17169) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-08-20 02:33:24 UTC (rev 17175) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - <extension-point id="moduleDependencyPropertyPage" name="org.jboss.ide.eclipse.as.wtp.override.moduleDependencyPropertyPage" schema="schema/moduleDependencyPropertyPage.exsd"/> - <extension-point id="referenceWizardFragment" name="referenceWizardFragment" schema="schema/referenceWizardFragment.exsd"/> - <extension point="org.eclipse.ui.propertyPages"> - - - - <page - adaptable="true" - objectClass="org.eclipse.core.resources.IProject" - name="Module Assembly" - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ModuleAssemblyRootPage" - id="org.jboss.ide.eclipse.as.wtp.override.ui.J2EEDependenciesPage"> - <enabledWhen> - <and> - <adapt - type="org.eclipse.core.resources.IProject"> - </adapt> - </and> - </enabledWhen> - </page> - </extension> - <extension - point="org.jboss.ide.eclipse.as.wtp.override.ui.moduleDependencyPropertyPage"> - <dependencyPage - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.impl.EarModuleDependencyPageProvider" - id="org.jboss.ide.eclipse.as.wtp.override.ui.earDependencyPage"> - </dependencyPage> - </extension> - <extension - point="org.jboss.ide.eclipse.as.wtp.override.ui.referenceWizardFragment"> - <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ProjectReferenceWizardFragment" - icon="icons/prj_obj.gif" - id="org.jboss.ide.eclipse.as.wtp.override.ui.newProjectReference" - name="Project"> - </referenceFragment> - <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.JarReferenceWizardFragment" - icon="icons/jar_obj.gif" - id="org.jboss.ide.eclipse.as.wtp.override.ui.jarReference" - name="Jar"> - </referenceFragment> - <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ExternalJarReferenceWizardFragment" - icon="icons/jar_obj.gif" - id="org.jboss.ide.eclipse.as.wtp.override.ui.externalJarReference" - name="External Jar"> - </referenceFragment> - <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.VariableReferenceWizardFragment" - icon="icons/jar_obj.gif" - id="org.jboss.ide.eclipse.as.wtp.override.ui.variableReference" - name="Variable"> - </referenceFragment> - </extension> -</plugin> Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml (from rev 17172, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-08-20 02:33:24 UTC (rev 17175) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension-point id="moduleDependencyPropertyPage" name="org.jboss.ide.eclipse.as.wtp.override.moduleDependencyPropertyPage" schema="schema/moduleDependencyPropertyPage.exsd"/> + <extension-point id="referenceWizardFragment" name="referenceWizardFragment" schema="schema/referenceWizardFragment.exsd"/> + <extension point="org.eclipse.ui.propertyPages"> + + + + <page + adaptable="true" + objectClass="org.eclipse.core.resources.IProject" + name="Module Assembly" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage" + id="org.jboss.ide.eclipse.as.wtp.override.ui.J2EEDependenciesPage"> + <enabledWhen> + <and> + <adapt + type="org.eclipse.core.resources.IProject"> + </adapt> + </and> + </enabledWhen> + </page> + </extension> + <extension + point="org.jboss.ide.eclipse.as.wtp.ui.moduleDependencyPropertyPage"> + <dependencyPage + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl.EarModuleDependencyPageProvider" + id="org.jboss.ide.eclipse.as.wtp.override.ui.earDependencyPage"> + </dependencyPage> + </extension> + <extension + point="org.jboss.ide.eclipse.as.wtp.ui.referenceWizardFragment"> + <referenceFragment + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ProjectReferenceWizardFragment" + icon="icons/prj_obj.gif" + id="org.jboss.ide.eclipse.as.wtp.override.ui.newProjectReference" + name="Project"> + </referenceFragment> + <referenceFragment + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.JarReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.jboss.ide.eclipse.as.wtp.override.ui.jarReference" + name="Jar"> + </referenceFragment> + <referenceFragment + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ExternalJarReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.jboss.ide.eclipse.as.wtp.override.ui.externalJarReference" + name="External Jar"> + </referenceFragment> + <referenceFragment + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.VariableReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.jboss.ide.eclipse.as.wtp.override.ui.variableReference" + name="Variable"> + </referenceFragment> + </extension> +</plugin> Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src (from rev 17172, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src)

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17174 - trunk/as/plugins.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 22:27:22 -0400 (Wed, 19 Aug 2009) New Revision: 17174 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/ Log: grrrrrrrrrr hate svn

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17173 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 22:04:45 -0400 (Wed, 19 Aug 2009) New Revision: 17173 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ Log: in steps: legacy folder

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17172 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui: META-INF and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 21:40:26 -0400 (Wed, 19 Aug 2009) New Revision: 17172 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddFolderDialog.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExternalJarReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IDependencyPageProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IModuleDependenciesControl.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/JarReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ModuleAssemblyRootPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ProjectReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/VariableReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/ Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/WTPOveridePlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddFolderDialog.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ComponentDependencyContentProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IDependencyPageProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IModuleDependenciesControl.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceWizard.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java Log: in steps: renaming packages / classes to remove "override" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 01:40:26 UTC (rev 17172) @@ -3,7 +3,7 @@ Bundle-Name: WTP UI Overrides Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.ui;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin +Bundle-Activator: org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.5.0", Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-08-20 01:40:26 UTC (rev 17172) @@ -11,7 +11,7 @@ adaptable="true" objectClass="org.eclipse.core.resources.IProject" name="Module Assembly" - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ModuleAssemblyRootPage" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage" id="org.jboss.ide.eclipse.as.wtp.override.ui.J2EEDependenciesPage"> <enabledWhen> <and> @@ -25,32 +25,32 @@ <extension point="org.jboss.ide.eclipse.as.wtp.ui.moduleDependencyPropertyPage"> <dependencyPage - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.impl.EarModuleDependencyPageProvider" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl.EarModuleDependencyPageProvider" id="org.jboss.ide.eclipse.as.wtp.override.ui.earDependencyPage"> </dependencyPage> </extension> <extension point="org.jboss.ide.eclipse.as.wtp.ui.referenceWizardFragment"> <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ProjectReferenceWizardFragment" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ProjectReferenceWizardFragment" icon="icons/prj_obj.gif" id="org.jboss.ide.eclipse.as.wtp.override.ui.newProjectReference" name="Project"> </referenceFragment> <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.JarReferenceWizardFragment" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.JarReferenceWizardFragment" icon="icons/jar_obj.gif" id="org.jboss.ide.eclipse.as.wtp.override.ui.jarReference" name="Jar"> </referenceFragment> <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ExternalJarReferenceWizardFragment" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ExternalJarReferenceWizardFragment" icon="icons/jar_obj.gif" id="org.jboss.ide.eclipse.as.wtp.override.ui.externalJarReference" name="External Jar"> </referenceFragment> <referenceFragment - class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.VariableReferenceWizardFragment" + class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.VariableReferenceWizardFragment" icon="icons/jar_obj.gif" id="org.jboss.ide.eclipse.as.wtp.override.ui.variableReference" name="Variable"> Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.wtp.override.ui.messages"; //$NON-NLS-1$ - public static String AddModuleDependenciesPropertiesPage_AddProjectButton; - public static String AddModuleDependenciesPropertiesPage_DeployPathColumn; - public static String AddModuleDependenciesPropertiesPage_RemoveSelectedButton; - public static String AddModuleDependenciesPropertiesPage_SelectAProjectTitle; - public static String AddModuleDependenciesPropertiesPage_SourceColumn; - public static String J2EEDependenciesPage_Description; - public static String J2EEDependenciesPage_ErrorCheckingFacets; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/WTPOveridePlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/WTPOveridePlugin.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/WTPOveridePlugin.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,87 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class WTPOveridePlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.ui"; //$NON-NLS-1$ - - // The shared instance - private static WTPOveridePlugin plugin; - - /** - * The constructor - */ - public WTPOveridePlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - 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 WTPOveridePlugin getDefault() { - return plugin; - } - - public static void log(Exception e) { - log(e.getMessage(), e); - } - - public static void log(String message, Exception e) { - IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, e); - getDefault().getLog().log(status); - } - public static IStatus createStatus(int severity, int aCode, - String aMessage, Throwable exception) { - return new Status(severity, PLUGIN_ID, aCode, - aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$ - } - public static IStatus createErrorStatus(int aCode, String aMessage, - Throwable exception) { - return createStatus(IStatus.ERROR, aCode, aMessage, exception); - } - - public static IStatus createStatus(int severity, String message, Throwable exception) { - return new Status(severity, PLUGIN_ID, message, exception); - } - - public static IStatus createStatus(int severity, String message) { - return createStatus(severity, message, null); - } - public static void logError(Throwable exception) { - Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception)); - } - - public static void logError(CoreException exception) { - Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() ); - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,7 +0,0 @@ -AddModuleDependenciesPropertiesPage_AddProjectButton=Add Project... -AddModuleDependenciesPropertiesPage_DeployPathColumn=Deploy Path -AddModuleDependenciesPropertiesPage_RemoveSelectedButton=Remove selected... -AddModuleDependenciesPropertiesPage_SelectAProjectTitle=Select a Project -AddModuleDependenciesPropertiesPage_SourceColumn=Source -J2EEDependenciesPage_Description=ModuleDependency Page Description -J2EEDependenciesPage_ErrorCheckingFacets=Error Checking Project Facets Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddFolderDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddFolderDialog.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddFolderDialog.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,133 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -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.jface.dialogs.TitleAreaDialog; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - -public class AddFolderDialog extends TitleAreaDialog { - private IProject project; - private TreeViewer viewer; - private IContainer selected = null; - public AddFolderDialog(Shell parentShell, IProject project) { - super(parentShell); - this.project = project; - } - - protected void configureShell(Shell shell) { - super.configureShell(shell); - shell.setText("Add Folder"); - shell.setBounds(shell.getLocation().x, shell.getLocation().y, 400,300); - } - - protected Control createDialogArea(Composite parent) { - Composite c = (Composite)super.createDialogArea(parent); - this.viewer = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - viewer.setContentProvider(getContentProvider()); - viewer.setLabelProvider(getLabelProvider()); - viewer.addFilter(getFilter()); - viewer.setInput(project); - viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); - viewer.addSelectionChangedListener(getListener()); - return c; - } - - protected ISelectionChangedListener getListener() { - return new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); - Object first = sel.getFirstElement(); - if( first instanceof IContainer) - selected = (IContainer)first; - } - }; - } - - public IContainer getSelected() { - return selected; - } - - protected ViewerFilter getFilter() { - return new ViewerFilter() { - public boolean select(Viewer viewer, Object parentElement, - Object element) { - return element instanceof IContainer; - } - }; - } - - protected ITreeContentProvider getContentProvider() { - return new ITreeContentProvider() { - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - - public void dispose() { - } - - public Object[] getElements(Object inputElement) { - try { - return project.members(); - } catch( CoreException ce ) { - return new Object[]{}; - } - } - - public boolean hasChildren(Object element) { - if( element instanceof IContainer) { - try { - return ((IContainer)element).members().length > 0; - } catch( CoreException ce ) { - } - } - return false; - } - - public Object getParent(Object element) { - if( element instanceof IResource) - return ((IResource)element).getParent(); - return null; - } - - public Object[] getChildren(Object parentElement) { - if( parentElement instanceof IContainer) { - try { - return ((IContainer)parentElement).members(); - } catch( CoreException ce ) { - } - } - return new Object[]{}; - } - }; - } - - protected LabelProvider getLabelProvider() { - return new LabelProvider() { - public Image getImage(Object element) { - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER); - } - public String getText(Object element) { - if( element instanceof IResource) - return ((IResource)element).getName(); - return element.toString(); - } - }; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,908 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are 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: - * IBM Corporation - initial API and implementation - * David Schneider, david.schneider(a)unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences - * Stefan Dimov, stefan.dimov(a)sap.com - bugs 207826, 222651 - *******************************************************************************/ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TextCellEditor; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.TableItem; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties; -import org.eclipse.wst.common.componentcore.internal.ComponentResource; -import org.eclipse.wst.common.componentcore.internal.StructureEdit; -import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent; -import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider; -import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; -import org.jboss.ide.eclipse.as.wtp.override.ui.Messages; -import org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin; - -public class AddModuleDependenciesPropertiesPage implements Listener, - IModuleDependenciesControl { - - private static final String DEPLOY_PATH_PROPERTY = new Integer(0).toString(); - private static final String SOURCE_PROPERTY = new Integer(1).toString(); - - - protected final String PATH_SEPARATOR = ComponentDependencyContentProvider.PATH_SEPARATOR; - private boolean hasInitialized = false; - protected final IProject project; - protected final ModuleAssemblyRootPage propPage; - protected IVirtualComponent rootComponent = null; - protected Text componentNameText; - protected Label availableModules; - protected TableViewer availableComponentsViewer; - protected Button addMappingButton, addReferenceButton, removeButton; - protected Composite buttonColumn; - protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS; - protected Listener tableListener; - protected Listener labelListener; - - // Mappings that existed when the page was opened (or last saved) - protected HashMap<IVirtualComponent, String> oldComponentToRuntimePath = new HashMap<IVirtualComponent, String>(); - - // Mappings that are current - protected HashMap<IVirtualComponent, String> objectToRuntimePath = new HashMap<IVirtualComponent, String>(); - - // A single list of wb-resource mappings. If there's any change, - // all old will be removed and new ones added - protected ArrayList<ComponentResourceProxy> resourceMappings = new ArrayList<ComponentResourceProxy>(); - - // keeps track if a change has occurred in wb-resource mappings - protected boolean resourceMappingsChanged = false; - - /** - * Constructor for AddModulestoEARPropertiesControl. - */ - public AddModuleDependenciesPropertiesPage(final IProject project, - final ModuleAssemblyRootPage page) { - this.project = project; - this.propPage = page; - rootComponent = ComponentCore.createComponent(project); - } - - /* - * UI Creation Methods - */ - - public Composite createContents(final Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.marginWidth = 0; - layout.marginWidth = 0; - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - ModuleAssemblyRootPage.createDescriptionComposite(composite, - "TODO Change this: Create and change packaging structure for this project "); - createListGroup(composite); - refresh(); - Dialog.applyDialogFont(parent); - return composite; - } - - protected void createListGroup(Composite parent) { - Composite listGroup = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - layout.marginWidth = 0; - layout.marginHeight = 0; - listGroup.setLayout(layout); - GridData gData = new GridData(GridData.FILL_BOTH); - gData.horizontalIndent = 5; - listGroup.setLayoutData(gData); - - availableModules = new Label(listGroup, SWT.NONE); - gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL - | GridData.VERTICAL_ALIGN_FILL); - availableModules.setText("Module Assembly"); //$NON-NLS-1$ - availableModules.setLayoutData(gData); - createTableComposite(listGroup); - } - - protected void createTableComposite(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - GridData gData = new GridData(GridData.FILL_BOTH); - composite.setLayoutData(gData); - fillComposite(composite); - } - - public void fillComposite(Composite parent) { - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginHeight = 0; - parent.setLayout(layout); - parent.setLayoutData(new GridData(GridData.FILL_BOTH)); - createTable(parent); - createButtonColumn(parent); - } - - protected void createButtonColumn(Composite parent) { - buttonColumn = createButtonColumnComposite(parent); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END); - buttonColumn.setLayoutData(data); - createPushButtons(); - } - - protected void createPushButtons() { - addMappingButton = createPushButton("Add Folder..."); - addReferenceButton = createPushButton("Add Reference..."); - removeButton = createPushButton("Remove selected"); - } - - protected Button createPushButton(String label) { - Button aButton = new Button(buttonColumn, SWT.PUSH); - aButton.setText(label); - aButton.addListener(SWT.Selection, this); - aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - return aButton; - } - - public Composite createButtonColumnComposite(Composite parent) { - Composite aButtonColumn = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - layout.marginHeight = 0; - layout.marginWidth = 0; - aButtonColumn.setLayout(layout); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL - | GridData.VERTICAL_ALIGN_BEGINNING); - aButtonColumn.setLayoutData(data); - return aButtonColumn; - } - - public Group createGroup(Composite parent) { - return new Group(parent, SWT.NULL); - } - - protected void createTable(Composite parent) { - if (rootComponent != null) { - availableComponentsViewer = createAvailableComponentsViewer(parent); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL - | GridData.FILL_VERTICAL); - availableComponentsViewer.getTable().setLayoutData(gd); - - ComponentDependencyContentProvider provider = createProvider(); - provider.setRuntimePaths(objectToRuntimePath); - provider.setResourceMappings(resourceMappings); - availableComponentsViewer.setContentProvider(provider); - availableComponentsViewer.setLabelProvider(provider); - addTableListeners(); - } - } - - /** - * Subclasses should over-ride this and extend the class - */ - protected ComponentDependencyContentProvider createProvider() { - return new ComponentDependencyContentProvider(); - } - - /* - * Listeners of various events - */ - - protected void addTableListeners() { - addHoverHelpListeners(); - addDoubleClickListener(); - addSelectionListener(); - } - - protected void addHoverHelpListeners() { - final Table table = availableComponentsViewer.getTable(); - createLabelListener(table); - createTableListener(table); - table.addListener(SWT.Dispose, tableListener); - table.addListener(SWT.KeyDown, tableListener); - table.addListener(SWT.MouseMove, tableListener); - table.addListener(SWT.MouseHover, tableListener); - } - - protected void createLabelListener(final Table table) { - labelListener = new Listener() { - public void handleEvent(Event event) { - Label label = (Label) event.widget; - Shell shell = label.getShell(); - switch (event.type) { - case SWT.MouseDown: - Event e = new Event(); - e.item = (TableItem) label.getData("_TABLEITEM"); //$NON-NLS-1$ - table.setSelection(new TableItem[] { (TableItem) e.item }); - table.notifyListeners(SWT.Selection, e); - shell.dispose(); - table.setFocus(); - break; - case SWT.MouseExit: - shell.dispose(); - break; - } - } - }; - } - - protected void createTableListener(final Table table) { - tableListener = new Listener() { - Shell tip = null; - Label label = null; - - public void handleEvent(Event event) { - switch (event.type) { - case SWT.Dispose: - case SWT.KeyDown: - case SWT.MouseMove: { - if (tip == null) - break; - tip.dispose(); - tip = null; - label = null; - break; - } - case SWT.MouseHover: { - TableItem item = table.getItem(new Point(event.x, event.y)); - if (item != null && item.getData() != null && !canEdit(item.getData())) { - if (tip != null && !tip.isDisposed()) - tip.dispose(); - tip = new Shell(PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getShell(), - SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); - tip.setBackground(Display.getDefault().getSystemColor( - SWT.COLOR_INFO_BACKGROUND)); - FillLayout layout = new FillLayout(); - layout.marginWidth = 2; - tip.setLayout(layout); - label = new Label(tip, SWT.WRAP); - label.setForeground(Display.getDefault() - .getSystemColor(SWT.COLOR_INFO_FOREGROUND)); - label.setBackground(Display.getDefault() - .getSystemColor(SWT.COLOR_INFO_BACKGROUND)); - label.setData("_TABLEITEM", item); //$NON-NLS-1$ - label.setText(J2EEUIMessages - .getResourceString(J2EEUIMessages.HOVER_HELP_FOR_DISABLED_LIBS)); - label.addListener(SWT.MouseExit, labelListener); - label.addListener(SWT.MouseDown, labelListener); - Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT); - Rectangle rect = item.getBounds(0); - Point pt = table.toDisplay(rect.x, rect.y); - tip.setBounds(pt.x, pt.y - size.y, size.x, size.y); - tip.setVisible(true); - } - } - } - } - }; - } - - protected boolean canEdit(Object data) { - if( data == null ) return false; - if( !(data instanceof VirtualArchiveComponent)) return true; - - VirtualArchiveComponent d2 = (VirtualArchiveComponent)data; - boolean sameProject = d2.getWorkspaceRelativePath() != null - && d2.getWorkspaceRelativePath().segment(0) - .equals(rootComponent.getProject().getName()); - return !(sameProject && isPhysicallyAdded(d2)); - } - - protected void addDoubleClickListener() { - availableComponentsViewer.setColumnProperties(new String[] { - DEPLOY_PATH_PROPERTY, SOURCE_PROPERTY }); - - CellEditor[] editors = new CellEditor[] { - new TextCellEditor(availableComponentsViewer.getTable()), - new TextCellEditor()}; - availableComponentsViewer.setCellEditors(editors); - availableComponentsViewer - .setCellModifier(new RuntimePathCellModifier()); - } - - protected void addSelectionListener() { - availableComponentsViewer.addSelectionChangedListener( - new ISelectionChangedListener(){ - public void selectionChanged(SelectionChangedEvent event) { - viewerSelectionChanged(); - } - }); - } - - protected void viewerSelectionChanged() { - removeButton.setEnabled(getSelectedObject() != null && canEdit(getSelectedObject())); - } - - protected Object getSelectedObject() { - IStructuredSelection sel = (IStructuredSelection)availableComponentsViewer.getSelection(); - return sel.getFirstElement(); - } - - private class RuntimePathCellModifier implements ICellModifier { - - public boolean canModify(Object element, String property) { - if( property.equals(DEPLOY_PATH_PROPERTY)) { - if (element instanceof VirtualArchiveComponent) { - try { - return canEdit(element); - } catch (IllegalArgumentException iae) { - } - } - return true; - } - return false; - } - - public Object getValue(Object element, String property) { - Object data = element; //((TableItem)element).getData(); - if( data instanceof IVirtualComponent ) { - return objectToRuntimePath.get(element) == null ? new Path("/") //$NON-NLS-1$ - .toString() : objectToRuntimePath.get(element); - } else if( data instanceof ComponentResourceProxy) { - return ((ComponentResourceProxy)data).runtimePath.toString(); - } - return new Path("/"); - } - - public void modify(Object element, String property, Object value) { - if (property.equals(DEPLOY_PATH_PROPERTY)) { - TableItem item = (TableItem) element; - if( item.getData() instanceof IVirtualComponent) { - objectToRuntimePath.put((IVirtualComponent)item.getData(), (String) value); - } else if( item.getData() instanceof ComponentResourceProxy) { - ComponentResourceProxy c = ((ComponentResourceProxy)item.getData()); - c.runtimePath = new Path((String)value); - resourceMappingsChanged = true; - } - refresh(); - } - } - - } - - public void handleEvent(Event event) { - if( event.widget == addMappingButton) - handleAddMappingButton(); - else if( event.widget == addReferenceButton) - handleAddReferenceButton(); - else if( event.widget == removeButton ) - handleRemoveSelectedButton(); - } - - protected void handleAddMappingButton() { - AddFolderDialog afd = new AddFolderDialog(addMappingButton.getShell(), project); - if( afd.open() == Window.OK) { - IContainer c = afd.getSelected(); - if( c != null ) { - IPath p = c.getProjectRelativePath(); - ComponentResourceProxy proxy = new ComponentResourceProxy(p, new Path("/")); - resourceMappings.add(proxy); - refresh(); - } - } - } - - protected void handleAddReferenceButton() { - NewReferenceWizard wizard = new NewReferenceWizard(); - // fill the task model - wizard.getTaskModel().putObject(NewReferenceWizard.PROJECT, project); - wizard.getTaskModel().putObject(NewReferenceWizard.ROOT_COMPONENT, rootComponent); - - WizardDialog wd = new WizardDialog(addReferenceButton.getShell(), wizard); - if( wd.open() != Window.CANCEL) { - Object c1 = wizard.getTaskModel().getObject(NewReferenceWizard.COMPONENT); - Object p1 = wizard.getTaskModel().getObject(NewReferenceWizard.COMPONENT_PATH); - IVirtualComponent[] compArr = c1 instanceof IVirtualComponent ? - new IVirtualComponent[] { (IVirtualComponent)c1 } : - (IVirtualComponent[])c1; - String[] pathArr = p1 instanceof String ? - new String[] { (String)p1 } : - (String[])p1; - for( int i = 0; i < compArr.length; i++ ) { - objectToRuntimePath.put(compArr[i], pathArr[i]); - } - refresh(); - } - } - - protected void handleRemoveSelectedButton() { - ISelection sel = availableComponentsViewer.getSelection(); - if( sel instanceof IStructuredSelection ) { - Object o = ((IStructuredSelection)sel).getFirstElement(); - if( o instanceof IVirtualComponent) - objectToRuntimePath.remove(o); - else if( o instanceof ComponentResourceProxy) - resourceMappings.remove(o); - refresh(); - } - } - - public TableViewer createAvailableComponentsViewer(Composite parent) { - int flags = SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI; - - Table table = new Table(parent, flags); - availableComponentsViewer = new TableViewer(table); - - // set up table layout - TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout(); - tableLayout.addColumnData(new ColumnWeightData(400, true)); - tableLayout.addColumnData(new ColumnWeightData(500, true)); - table.setLayout(tableLayout); - table.setHeaderVisible(true); - table.setLinesVisible(true); - availableComponentsViewer.setSorter(null); - - TableColumn bndColumn = new TableColumn(table, SWT.NONE, 0); - bndColumn.setText(Messages.AddModuleDependenciesPropertiesPage_DeployPathColumn); - bndColumn.setResizable(true); - - TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1); - projectColumn.setText(Messages.AddModuleDependenciesPropertiesPage_SourceColumn); - projectColumn.setResizable(true); - - tableLayout.layout(table, true); - return availableComponentsViewer; - - } - - protected boolean isPhysicallyAdded(VirtualArchiveComponent component) { - try { - component.getProjectRelativePath(); - return true; - } catch (IllegalArgumentException e) { - return false; - } - } - - /** - * This should only be called on changes, such as adding a project - * reference, adding a lib reference etc. - * - * It will reset the input, manually re-add missing elements, and do other - * tasks - */ - public void refresh() { - resetTableUI(); - if (!hasInitialized) { - initialize(); - resetTableUI(); - } - - } - - protected void resetTableUI() { - IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot(); - availableComponentsViewer.setInput(input); - GridData data = new GridData(GridData.FILL_BOTH); - int numlines = Math.min(10, availableComponentsViewer.getTable() - .getItemCount()); - data.heightHint = availableComponentsViewer.getTable().getItemHeight() - * numlines; - availableComponentsViewer.getTable().setLayoutData(data); - GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL - | GridData.VERTICAL_ALIGN_BEGINNING); - buttonColumn.setLayoutData(btndata); - } - - protected void initialize() { - IVirtualReference[] refs = rootComponent.getReferences(); - IVirtualComponent comp; - for( int i = 0; i < refs.length; i++ ) { - comp = refs[i].getReferencedComponent(); - String val = refs[i].getRuntimePath().append(refs[i].getArchiveName()).toString(); - objectToRuntimePath.put(comp, val); - oldComponentToRuntimePath.put((IVirtualComponent) comp, val); - } - - ComponentResource[] allMappings = findAllMappings(); - for( int i = 0; i < allMappings.length; i++ ) { - resourceMappings.add(new ComponentResourceProxy( - allMappings[i].getSourcePath(), allMappings[i].getRuntimePath() - )); - } - hasInitialized = true; - } - - protected ComponentResource[] findAllMappings() { - StructureEdit structureEdit = null; - try { - structureEdit = StructureEdit.getStructureEditForRead(project); - WorkbenchComponent component = structureEdit.getComponent(); - Object[] arr = component.getResources().toArray(); - ComponentResource[] result = new ComponentResource[arr.length]; - for( int i = 0; i < arr.length; i++ ) - result[i] = (ComponentResource)arr[i]; - return result; - } catch(Exception e) { - } finally { - structureEdit.dispose(); - } - return new ComponentResource[]{}; - } - - public class ComponentResourceProxy { - public IPath source, runtimePath; - public ComponentResourceProxy(IPath source, IPath runtimePath) { - this.source = source; - this.runtimePath = runtimePath; - } - } - - /* - * Clean-up methods are below. These include performCancel, performDefaults, - * performOK, and any other methods that are called *only* by this one. - */ - public void setVisible(boolean visible) { - } - - public void performDefaults() { - } - - public boolean performCancel() { - return true; - } - - public void dispose() { - Table table = null; - if (availableComponentsViewer != null) { - table = availableComponentsViewer.getTable(); - } - if (table == null || tableListener == null) - return; - table.removeListener(SWT.Dispose, tableListener); - table.removeListener(SWT.KeyDown, tableListener); - table.removeListener(SWT.MouseMove, tableListener); - table.removeListener(SWT.MouseHover, tableListener); - } - - - - /* - * This is where the OK work goes. Lots of it. Watch your head. - * xiao xin - */ - protected boolean preHandleChanges(IProgressMonitor monitor) { - return true; - } - - protected boolean postHandleChanges(IProgressMonitor monitor) { - return true; - } - - public boolean performOk() { - boolean result = true; - result &= saveResourceChanges(); - result &= saveReferenceChanges(); - return result; - } - - protected boolean saveResourceChanges() { - removeAllResourceMappings(); - addNewResourceMappings(); - return true; - } - protected boolean addNewResourceMappings() { - ComponentResourceProxy[] proxies = (ComponentResourceProxy[]) resourceMappings.toArray(new ComponentResourceProxy[resourceMappings.size()]); - IVirtualFolder rootFolder = rootComponent.getRootFolder(); - for( int i = 0; i < proxies.length; i++ ) { - try { - rootFolder.getFolder(proxies[i].runtimePath).createLink(proxies[i].source, 0, null); - } catch( CoreException ce ) { - } - } - resourceMappingsChanged = false; - return true; - } - - protected boolean removeAllResourceMappings() { - StructureEdit moduleCore = null; - try { - moduleCore = StructureEdit.getStructureEditForWrite(project); - moduleCore.getComponent().getResources().clear(); - } - finally { - if (moduleCore != null) { - moduleCore.saveIfNecessary(new NullProgressMonitor()); - moduleCore.dispose(); - } - } - return true; - } - - protected boolean saveReferenceChanges() { - // Fill our delta lists - ArrayList<IVirtualComponent> added = new ArrayList<IVirtualComponent>(); - ArrayList<IVirtualComponent> removed = new ArrayList<IVirtualComponent>(); - ArrayList<IVirtualComponent> changed = new ArrayList<IVirtualComponent>(); - - Iterator<IVirtualComponent> j = oldComponentToRuntimePath.keySet().iterator(); - Object key, val; - while (j.hasNext()) { - key = j.next(); - val = oldComponentToRuntimePath.get(key); - if( !objectToRuntimePath.containsKey(key)) - removed.add((IVirtualComponent)key); - else if (!val.equals(objectToRuntimePath.get(key))) - changed.add((IVirtualComponent)key); - } - - j = objectToRuntimePath.keySet().iterator(); - while (j.hasNext()) { - key = j.next(); - if (!oldComponentToRuntimePath.containsKey(key)) - added.add((IVirtualComponent)key); - } - - NullProgressMonitor monitor = new NullProgressMonitor(); - boolean subResult = preHandleChanges(monitor); - if( !subResult ) - return false; - - handleDeltas(removed, changed, added); - subResult &= postHandleChanges(monitor); - - // Now update the variables - oldComponentToRuntimePath.clear(); - ArrayList<IVirtualComponent> keys = new ArrayList<IVirtualComponent>(); - keys.addAll(objectToRuntimePath.keySet()); - Iterator<IVirtualComponent> i = keys.iterator(); - while(i.hasNext()) { - IVirtualComponent vc = i.next(); - String path = objectToRuntimePath.get(vc); - oldComponentToRuntimePath.put(vc, path); - } - return subResult; - } - - // Subclass can override if it has a good way to handle changed elements - protected void handleDeltas(ArrayList<IVirtualComponent> removed, - ArrayList<IVirtualComponent> changed, ArrayList<IVirtualComponent> added) { - ArrayList<IVirtualComponent> removed2 = new ArrayList<IVirtualComponent>(); - ArrayList<IVirtualComponent> added2 = new ArrayList<IVirtualComponent>(); - removed2.addAll(removed); - removed2.addAll(changed); - added2.addAll(added); - added2.addAll(changed); - - // meld the changed into the added / removed for less efficiency ;) - // basically we lack "change" operations and only have add / remove - handleRemoved(removed2); - handleAdded(added2); - } - protected void handleRemoved(ArrayList<IVirtualComponent> removed) { - // If it's removed it should *only* be a virtual component already - Iterator<IVirtualComponent> i = removed.iterator(); - IVirtualComponent component; - while(i.hasNext()) { - try { - component = i.next(); - IDataModelOperation operation = getRemoveComponentOperation(component); - operation.execute(null, null); - } catch( ExecutionException e) { - WTPOveridePlugin.logError(e); - } - } - } - - protected IDataModelOperation getRemoveComponentOperation(IVirtualComponent component) { - String path, archiveName; - path = new Path(oldComponentToRuntimePath.get(component)).removeLastSegments(1).toString(); - archiveName = new Path(oldComponentToRuntimePath.get(component)).lastSegment(); - - IDataModelProvider provider = getRemoveReferenceDataModelProvider(component); - IDataModel model = DataModelFactory.createDataModel(provider); - model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, rootComponent); - List<IVirtualComponent> modHandlesList = (List<IVirtualComponent>) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); - modHandlesList.add(component); - model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList); - model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path); - Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>(); - uriMap.put(component, archiveName); - model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap); - return model.getDefaultOperation(); - } - - protected IDataModelProvider getRemoveReferenceDataModelProvider(IVirtualComponent component) { - return new RemoveReferenceComponentsDataModelProvider(); - } - - - protected void handleChanged(ArrayList<IVirtualComponent> changed) { - Iterator<IVirtualComponent> i = changed.iterator(); - IVirtualComponent component; - IVirtualReference ref; - IPath p; - while(i.hasNext()) { - component = i.next(); - ref = rootComponent.getReference(component.getName()); - p = new Path(objectToRuntimePath.get(component)); - ref.setRuntimePath(p); - } - } - - protected void handleAdded(ArrayList<IVirtualComponent> added) { - final ArrayList<IVirtualComponent> components = new ArrayList<IVirtualComponent>(); - Iterator<IVirtualComponent> i = added.iterator(); - IVirtualComponent o; - while(i.hasNext()) { - o = i.next(); - components.add((IVirtualComponent)o); - } - - IWorkspaceRunnable runnable = new IWorkspaceRunnable(){ - public void run(IProgressMonitor monitor) throws CoreException{ - addComponents(components); - } - }; - try { - ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor()); - } catch( CoreException e ) { - WTPOveridePlugin.logError(e); - } - } - - protected void addComponents(ArrayList<IVirtualComponent> components) throws CoreException { - Iterator<IVirtualComponent> i = components.iterator(); - while(i.hasNext()) { - addOneComponent(i.next()); - } - } - - protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) { - return new CreateReferenceComponentsDataModelProvider(); - } - - protected void addOneComponent(IVirtualComponent component) throws CoreException { - String path, archiveName; - path = new Path(objectToRuntimePath.get(component)).removeLastSegments(1).toString(); - archiveName = new Path(objectToRuntimePath.get(component)).lastSegment(); - - IDataModelProvider provider = getAddReferenceDataModelProvider(component); - IDataModel dm = DataModelFactory.createDataModel(provider); - - dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, rootComponent); - dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Arrays.asList(component)); - - //[Bug 238264] the uri map needs to be manually set correctly - Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>(); - uriMap.put(component, archiveName); - dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap); - dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path); - - IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); - if (stat != OK_STATUS) - throw new CoreException(stat); - try { - dm.getDefaultOperation().execute(new NullProgressMonitor(), null); - } catch (ExecutionException e) { - WTPOveridePlugin.logError(e); - } - } - /** - * Method returns the name of the given IVirtualComponent being sure the correct extension - * is on the end of the name, this is important for internal projects. Added for [Bug 241509] - * - * Note (rs) : I do not believe this ever gets called with a binary virtComp - * - * @param virtComp the IVirtualComponent to get the name of with the correct extension - * @return the name of the given IVirtualComponent with the correct extension - */ - protected String getVirtualComponentNameWithExtension(IVirtualComponent virtComp) { - String virtCompURIMapName = this.getURIMappingName(virtComp); - String extension = ".jar"; - virtCompURIMapName += extension; - return virtCompURIMapName; - } - - /** - * [Bug 238264] - * determines a unique URI mapping name for a given component - * this is in case two components have the same name. - * - * @return returns a valid (none duplicate) uri mapping name for the given component\ - */ - private String getURIMappingName(IVirtualComponent archive) { - - //get the default uri map name for the given archive - IPath componentPath = Path.fromOSString(archive.getName()); - String uriMapName = componentPath.lastSegment().replace(' ', '_'); - - - //check to be sure this uri mapping is not already in use by another reference - boolean dupeArchiveName; - String refedCompName; - int lastDotIndex; - String increment; - IVirtualReference [] existingRefs = rootComponent.getReferences(); - for(int i=0;i<existingRefs.length;i++){ - refedCompName = existingRefs[i].getReferencedComponent().getName(); - - //if uri mapping names of the refed component and the given archive are the same - // find a new uri map name for the given archive - if(existingRefs[i].getArchiveName().equals(uriMapName)){ - dupeArchiveName = true; - //find a new uriMapName for the given component - for(int j=1; dupeArchiveName; j++){ - lastDotIndex = uriMapName.lastIndexOf('.'); - increment = "_"+j; //$NON-NLS-1$ - - //create the new potential name - if(lastDotIndex != -1){ - uriMapName = uriMapName.substring(0, lastDotIndex) + increment + uriMapName.substring(lastDotIndex); - } else { - uriMapName = uriMapName.substring(0)+increment; - } - - //determine if the new potential name is valid - for(int k=0; k<existingRefs.length; k++) { - dupeArchiveName = existingRefs[k].getArchiveName().equals(uriMapName); - if(dupeArchiveName) { - break; - } - } - } - } - } - - return uriMapName; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ComponentDependencyContentProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ComponentDependencyContentProvider.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ComponentDependencyContentProvider.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are 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: - * IBM Corporation - initial API and implementation - * Stefan Dimov, stefan.dimov(a)sap.com - bug 207826 - *******************************************************************************/ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; -import java.util.HashMap; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.common.componentcore.internal.ComponentResource; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy; - - -/* - * The only valid elements this content provider (should) provide - * are IProject or IVirtualComponent objects. The runtime paths portion is - * shared with the preference page itself where they can both modify the data. - * - * This provider no longer "meddles" in to the content as it used to, - * but rather serves as only a view of it. - */ -public class ComponentDependencyContentProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider { - - final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR); - - private HashMap<IVirtualComponent, String> runtimePaths; - private ArrayList<ComponentResourceProxy> resourceMappings; - public ComponentDependencyContentProvider() { - super(); - } - - public void setRuntimePaths(HashMap<IVirtualComponent, String> paths) { - this.runtimePaths = paths; - } - - public void setResourceMappings(ArrayList<ComponentResourceProxy> mappings) { - this.resourceMappings = mappings; - } - - public Object[] getElements(Object inputElement) { - Object[] empty = new Object[0]; - if( !(inputElement instanceof IWorkspaceRoot)) - return empty; - ArrayList<Object> list = new ArrayList<Object>(); - list.addAll(resourceMappings); - list.addAll(runtimePaths.keySet()); - return list.toArray(); - } - - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - public String getColumnText(Object element, int columnIndex) { - if( element instanceof ComponentResourceProxy) { - if( columnIndex == 0 ) - return ((ComponentResourceProxy)element).runtimePath.toString(); - else if( columnIndex == 1 ) - return ((ComponentResourceProxy)element).source.toString(); - } - if (element instanceof IVirtualComponent) { - IVirtualComponent comp = (IVirtualComponent)element; - if (columnIndex == 0) { - if( runtimePaths == null || runtimePaths.get(element) == null) { - return new Path(PATH_SEPARATOR).toString(); - } - return runtimePaths.get(element); - } else if (columnIndex == 1) { - if( comp.isBinary() && comp instanceof VirtualArchiveComponent) { - IPath p = ((VirtualArchiveComponent)comp).getWorkspaceRelativePath(); - if( p == null ) - p = new Path(((VirtualArchiveComponent)comp).getUnderlyingDiskFile().getAbsolutePath()); - return p.toString(); - } - return comp.getProject().getName(); - } - } else if (element instanceof IProject){ - if (columnIndex == 0) { - if( runtimePaths == null || runtimePaths.get(element) == null) { - return new Path(PATH_SEPARATOR).toString(); - } - return runtimePaths.get(element); - } else { - return ((IProject)element).getName(); - } - } - return null; - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,108 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin; - -public class DependencyPageExtensionManager { - private static DependencyPageExtensionManager manager = null; - public static DependencyPageExtensionManager getManager() { - if( manager == null ) - manager = new DependencyPageExtensionManager(); - return manager; - } - - private HashMap<String, IDependencyPageProvider> providers = null; - - public IDependencyPageProvider getProvider(IFacetedProject project) { - if( providers == null ) - loadProviders(); - Iterator<IDependencyPageProvider> i = providers.values().iterator(); - IDependencyPageProvider temp; - while(i.hasNext()) { - temp = i.next(); - if( temp.canHandle(project)) - return temp; - } - return null; - } - - private void loadProviders() { - HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>(); - IExtensionRegistry registry = Platform.getExtensionRegistry(); - IConfigurationElement[] cf = registry.getConfigurationElementsFor( - WTPOveridePlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$ - for( int i = 0; i < cf.length; i++ ) { - try { - temp.put(cf[i].getAttribute("id"), //$NON-NLS-1$ - (IDependencyPageProvider)cf[i].createExecutableExtension("class")); //$NON-NLS-1$ - } catch( CoreException ce ) {} - } - providers = temp; - } - - public WizardFragment loadReferenceWizardFragment(String id) { - IExtensionRegistry registry = Platform.getExtensionRegistry(); - IConfigurationElement[] cf = registry.getConfigurationElementsFor( - WTPOveridePlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ - for( int i = 0; i < cf.length; i++ ) { - if( cf[i].getAttribute("id").equals(id)) - try { - return (WizardFragment)cf[i].createExecutableExtension("class"); - } catch( CoreException ce) {} - } - return null; - } - - public ReferenceExtension[] getReferenceExtensions() { - IExtensionRegistry registry = Platform.getExtensionRegistry(); - IConfigurationElement[] cf = registry.getConfigurationElementsFor( - WTPOveridePlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ - ArrayList<ReferenceExtension> list = new ArrayList<ReferenceExtension>(); - for( int i = 0; i < cf.length; i++ ) { - list.add(new ReferenceExtension(cf[i])); - } - return (ReferenceExtension[]) list - .toArray(new ReferenceExtension[list.size()]); - } - - public class ReferenceExtension { - private IConfigurationElement element; - private String id, name, imageLoc; - private Image image; - public ReferenceExtension(IConfigurationElement element) { - this.element = element; - this.id = element.getAttribute("id"); - this.name = element.getAttribute("name"); - this.imageLoc = element.getAttribute("icon"); - } - public String getId() { return this.id;} - public String getName() { return this.name; } - public Image getImage() { - if( image == null ) { - if( imageLoc != null && element.getContributor().getName() != null) { - ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(element.getContributor().getName(), imageLoc); - image = desc.createImage(); - } - } - return image; - } - public void disposeImage() { - if( image != null ) { - image.dispose(); - image = null; - } - } - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,51 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; - -public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment { - public Composite createComposite(Composite parent, IWizardHandle handle) { - Composite c = super.createComposite(parent, handle); - handle.setTitle("Add an External Jar Reference"); - handle.setDescription("Here you can reference a filesystem Jar\n" - + "This is not a suggested use-case, but is here for backwards compatability."); - return c; - } - - protected void buttonPressed() { - selected = BuildPathDialogAccess - .chooseExternalJAREntries(browse.getShell()); - viewer.refresh(); - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); - if (selected != null && selected.length > 0) { - ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); - ArrayList<String> paths = new ArrayList<String>(); - for (int i = 0; i < selected.length; i++) { - // IPath fullPath = project.getFile(selected[i]).getFullPath(); - String type = VirtualArchiveComponent.LIBARCHIVETYPE - + IPath.SEPARATOR; - IVirtualComponent archive = ComponentCore - .createArchiveComponent(rootComponent.getProject(), - type + selected[i].toString()); - compList.add(archive); - paths.add(selected[i].lastSegment()); - } - IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); - String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); - getTaskModel().putObject(NewReferenceWizard.COMPONENT, components); - getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2); - } - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IDependencyPageProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IDependencyPageProvider.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IDependencyPageProvider.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,10 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; - -public interface IDependencyPageProvider { - public boolean canHandle(IFacetedProject project); - public IModuleDependenciesControl[] createPages(IFacetedProject project, ModuleAssemblyRootPage parent); - public Composite createRootControl(IModuleDependenciesControl[] pages, Composite parent); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IModuleDependenciesControl.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IModuleDependenciesControl.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IModuleDependenciesControl.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,42 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import org.eclipse.swt.widgets.Composite; - -public interface IModuleDependenciesControl { - /** - * Creates the Composite associated with this control. - * @param parent Parent Composite. - * @return Composite for the control. - */ - Composite createContents(Composite parent); - - /** - * Called when the property page's <code>performOk()</code> method is called. - * @return - */ - boolean performOk(); - - /** - * Called when the property page's <code>performDefaults()</code> method is called. - * @return - */ - void performDefaults(); - - /** - * Called when the property page's <code>performCancel()</code> method is called. - * @return - */ - boolean performCancel(); - - /** - * Called when the property page's <code>setVisible()</code> method is called. - * @return - */ - void setVisible(boolean visible); - - /** - * Called when the property page's <code>dispose()</code> method is called. - * @return - */ - void dispose(); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,149 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; -import org.eclipse.wst.server.ui.wizard.WizardFragment; - -public class JarReferenceWizardFragment extends WizardFragment { - protected LabelProvider labelProvider = null; - protected ITreeContentProvider contentProvider = null; - protected TreeViewer viewer; - protected Button browse; - protected IPath[] paths; - protected IWizardHandle handle; - protected IPath[] selected = new IPath[]{}; - public boolean hasComposite() { - return true; - } - - public Composite createComposite(Composite parent, IWizardHandle handle) { - this.handle = handle; - handle.setTitle("Add a Jar Reference"); - handle.setDescription("Here you can reference a workspace Jar\n" - + "This is not a suggested use-case, but is here for backwards compatability."); - - Composite c = new Composite(parent, SWT.NONE); - c.setLayout(new FormLayout()); - viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); - viewer.setContentProvider(getContentProvider()); - viewer.setLabelProvider(getLabelProvider()); - viewer.setInput(ResourcesPlugin.getWorkspace()); - - browse = new Button(c, SWT.NONE); - browse.setText("Browse..."); - FormData fd = new FormData(); - fd.left = new FormAttachment(0, 5); - fd.bottom = new FormAttachment(100, -5); - browse.setLayoutData(fd); - - fd = new FormData(); - fd.left = new FormAttachment(0, 5); - fd.top = new FormAttachment(0, 5); - fd.right = new FormAttachment(100, -5); - fd.bottom = new FormAttachment(browse, -5); - viewer.getTree().setLayoutData(fd); - - browse.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - buttonPressed(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - }); - return c; - } - - protected void buttonPressed() { - IProject project = (IProject)getTaskModel().getObject(NewReferenceWizard.PROJECT); - selected = BuildPathDialogAccess.chooseJAREntries( - browse.getShell(), - project.getLocation(), new IPath[0]); - viewer.refresh(); - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); - if (selected != null && selected.length > 0) { - ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); - ArrayList<String> paths = new ArrayList<String>(); - for (int i = 0; i < selected.length; i++) { - // IPath fullPath = project.getFile(selected[i]).getFullPath(); - String type = VirtualArchiveComponent.LIBARCHIVETYPE - + IPath.SEPARATOR; - IVirtualComponent archive = ComponentCore - .createArchiveComponent(rootComponent.getProject(), - type + selected[i].makeRelative().toString()); - compList.add(archive); - paths.add(selected[i].lastSegment()); - } - IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); - String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); - getTaskModel().putObject(NewReferenceWizard.COMPONENT, components); - getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2); - } - } - - protected LabelProvider getLabelProvider() { - if (labelProvider == null) { - labelProvider = new LabelProvider() { - public Image getImage(Object element) { - return null; - } - - public String getText(Object element) { - return element == null ? "" : element.toString();//$NON-NLS-1$ - } - }; - } - return labelProvider; - } - - protected ITreeContentProvider getContentProvider() { - if (contentProvider == null) { - contentProvider = new ITreeContentProvider() { - public Object[] getElements(Object inputElement) { - return selected == null ? new Object[]{} : selected; - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public void dispose() { - } - public boolean hasChildren(Object element) { - return false; - } - public Object getParent(Object element) { - return null; - } - public Object[] getChildren(Object parentElement) { - return null; - } - }; - } - return contentProvider; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,175 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are 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: - * IBM Corporation - initial implementation as prop page heirarchy - * rfrost(a)bea.com - conversion to single property page impl - *******************************************************************************/ - -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -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.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; - -/** - * Primary project property page for Module dependencies; - */ -public class ModuleAssemblyRootPage extends PropertyPage { - - private IProject project; - private IModuleDependenciesControl[] controls = new IModuleDependenciesControl[0]; - - public ModuleAssemblyRootPage() { - super(); - } - - private Composite getFacetErrorComposite(final Composite parent) { - final String errorCheckingFacet = "Error Checking Project Facets"; - setErrorMessage(errorCheckingFacet); - return getErrorComposite(parent, errorCheckingFacet); - } - private Composite getVirtCompErrorComposite(final Composite parent) { - final String errorCheckingFacet = "The given project is not a virtual component project"; - setErrorMessage(errorCheckingFacet); - return getErrorComposite(parent, errorCheckingFacet); - } - - - private Composite getErrorComposite(final Composite parent, final String error) { - final Composite composite = new Composite(parent, SWT.NONE); - final GridLayout layout = new GridLayout(); - layout.marginWidth = 0; - layout.marginWidth = 0; - composite.setLayout(layout); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - final Label label= new Label(composite, SWT.NONE); - label.setText(error); - return composite; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.IPreferencePage#performOk() - */ - public boolean performOk() { - for (int i = 0; i < controls.length; i++) { - if (controls[i] != null) { - if (!controls[i].performOk()) { - return false; - } - } - } - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ - public void performDefaults() { - for (int i = 0; i < controls.length; i++) { - if (controls[i] != null) { - controls[i].performDefaults(); - } - } - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.IPreferencePage#performCancel() - */ - public boolean performCancel() { - for (int i = 0; i < controls.length; i++) { - if (controls[i] != null) { - if (!controls[i].performCancel()) { - return false; - } - } - } - return super.performCancel(); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean) - */ - public void setVisible(boolean visible) { - super.setVisible(visible); - for (int i = 0; i < controls.length; i++) { - if (controls[i] != null) { - controls[i].setVisible(visible); - } - } - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#dispose() - */ - public void dispose() { - super.dispose(); - for (int i = 0; i < controls.length; i++) { - if(controls[i] != null){ - controls[i].dispose(); - } - } - } - - protected static void createDescriptionComposite(final Composite parent, final String description) { - Composite descriptionComp = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - descriptionComp.setLayout(layout); - descriptionComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fillDescription(descriptionComp, description); - } - - private static void fillDescription(Composite c, String s) { - GridData data = new GridData(GridData.FILL_HORIZONTAL); - data.widthHint = 250; - Text text = new Text(c, SWT.READ_ONLY | SWT.WRAP); - text.setLayoutData(data); - text.setText(s); - } - - protected Control createContents(Composite parent) { - - // Need to find out what type of project we are handling - project = (IProject) getElement().getAdapter(IResource.class); - if( project != null ) { - try { - IFacetedProject facetedProject = ProjectFacetsManager.create(project); - IDependencyPageProvider provider = null; - if( facetedProject == null ) - return getFacetErrorComposite(parent); - - provider = DependencyPageExtensionManager.getManager().getProvider(facetedProject); - if( provider != null ) { - controls = provider.createPages(facetedProject, this); - return provider.createRootControl(controls, parent); - } - - if( ComponentCore.createComponent(project) == null ) - return getVirtCompErrorComposite(parent); - - AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this); - controls = new IModuleDependenciesControl[1]; - controls[0] = page; - return page.createContents(parent); - } catch( CoreException ce ) { - } - } - return getFacetErrorComposite(parent); - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,148 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; -import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension; - -public class NewReferenceRootWizardFragment extends WizardFragment { - protected Map<String, WizardFragment> fragmentMap = - new HashMap<String, WizardFragment>(); - private IWizardHandle wizard; - private TreeViewer viewer; - public boolean hasComposite() { - return true; - } - - public Composite createComposite(Composite parent, IWizardHandle wizard) { - this.wizard = wizard; - wizard.setTitle("Select a reference type"); - wizard.setDescription("Here you can select one of many types of references to add"); - Composite c = new Composite(parent, SWT.NONE); - c.setLayout(new FillLayout()); - viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); - viewer.setLabelProvider(getLabelProvider()); - viewer.setContentProvider(getContentProvider()); - viewer.setInput(ResourcesPlugin.getWorkspace()); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - viewerSelectionChanged(); - } - }); - return c; - } - - protected void viewerSelectionChanged() { - wizard.update(); - } - - protected WizardFragment getWizardFragment(String extensionPointID) { - try { - WizardFragment fragment = fragmentMap.get(extensionPointID); - if (fragment != null) - return fragment; - } catch (Exception e) { - // ignore - } - - WizardFragment fragment = DependencyPageExtensionManager.getManager().loadReferenceWizardFragment(extensionPointID); - if (fragment != null) - fragmentMap.put(extensionPointID, fragment); - return fragment; - } - - public List getChildFragments() { - List<WizardFragment> listImpl = new ArrayList<WizardFragment>(); - createChildFragments(listImpl); - return listImpl; - } - - protected void createChildFragments(List<WizardFragment> list) { - // Instantiate and add the fragment for the current ID - if( viewer != null ) { - IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); - ReferenceExtension selected = (ReferenceExtension)sel.getFirstElement(); - if( selected != null ) { - WizardFragment child = getWizardFragment(selected.getId()); - if( child != null ) - list.add(child); - } - } - } - - public boolean isComplete() { - return true; - } - - - private LabelProvider labelProvider = null; - private ITreeContentProvider contentProvider = null; - protected LabelProvider getLabelProvider() { - if( labelProvider == null ) { - labelProvider = new LabelProvider() { - public Image getImage(Object element) { - if( element instanceof ReferenceExtension) - return ((ReferenceExtension)element).getImage(); - return null; - } - public String getText(Object element) { - if( element instanceof ReferenceExtension) - return ((ReferenceExtension)element).getName(); - return element == null ? "" : element.toString();//$NON-NLS-1$ - } - public void dispose() { - super.dispose(); - if( extensions != null ) { - for( int i = 0; i < extensions.length; i++) { - extensions[i].disposeImage(); - } - } - } - }; - } - return labelProvider; - } - - private ReferenceExtension[] extensions = null; - protected ITreeContentProvider getContentProvider() { - if( contentProvider == null ) { - contentProvider = new ITreeContentProvider() { - public Object[] getElements(Object inputElement) { - if( extensions == null ) - extensions = DependencyPageExtensionManager.getManager().getReferenceExtensions(); - return extensions; - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public void dispose() { - } - public boolean hasChildren(Object element) { - return false; - } - public Object getParent(Object element) { - return null; - } - public Object[] getChildren(Object parentElement) { - return null; - } - }; - } - return contentProvider; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceWizard.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceWizard.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceWizard.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,28 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.List; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbench; -import org.eclipse.wst.server.ui.internal.wizard.TaskWizard; -import org.eclipse.wst.server.ui.wizard.WizardFragment; - -public class NewReferenceWizard extends TaskWizard { - - public static final String COMPONENT = "dependency.component"; - public static final String COMPONENT_PATH = "dependency.component.path"; - public static final String PROJECT = "root.project"; - public static final String ROOT_COMPONENT = "root.component"; - - public NewReferenceWizard() { - super("New Reference Wizard", new WizardFragment() { - protected void createChildFragments(List<WizardFragment> list) { - list.add(new NewReferenceRootWizardFragment()); - } - }); - } - - public void init(IWorkbench newWorkbench, IStructuredSelection newSelection) { - // do nothing - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,144 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; -import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; -import org.eclipse.wst.server.ui.wizard.WizardFragment; - -public class ProjectReferenceWizardFragment extends WizardFragment { - private LabelProvider labelProvider = null; - private ITreeContentProvider contentProvider = null; - private TreeViewer viewer; - private IProject selected; - - public boolean hasComposite() { - return true; - } - - public Composite createComposite(Composite parent, IWizardHandle handle) { - handle.setTitle("Add a Project Reference"); - handle.setDescription("Here you can make a project into a reference.\n" + - "If the project is not already a flexible project, it will be converted into one."); - - Composite c = new Composite(parent, SWT.NONE); - c.setLayout(new FillLayout()); - viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); - viewer.setContentProvider(getContentProvider()); - viewer.setLabelProvider(getLabelProvider()); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - selChanged(); - } - }); - viewer.setInput(ResourcesPlugin.getWorkspace()); - return c; - } - - private void selChanged() { - if( viewer != null ) { - IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); - if( sel != null ) - selected = (IProject)sel.getFirstElement(); - } - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - if( !ModuleCoreNature.isFlexibleProject(selected)) { - try { - IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider()); - migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, selected.getName()); - migrationdm.getDefaultOperation().execute(new NullProgressMonitor(), null); - } catch( ExecutionException ee) { - // TODO something - } - } - IVirtualComponent comp = ComponentCore.createComponent(selected); - String path = selected.getName(); - String extension = ".jar"; - path += extension; - - getTaskModel().putObject(NewReferenceWizard.COMPONENT, comp); - getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, path); - } - - - protected LabelProvider getLabelProvider() { - if( labelProvider == null ) { - labelProvider = new LabelProvider() { - public Image getImage(Object element) { - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_PROJECT); - } - public String getText(Object element) { - if( element instanceof IProject ) - return ((IProject)element).getName(); - return element == null ? "" : element.toString();//$NON-NLS-1$ - } - }; - } - return labelProvider; - } - - protected ITreeContentProvider getContentProvider() { - if( contentProvider == null ) { - contentProvider = new ITreeContentProvider() { - public Object[] getElements(Object inputElement) { - IProject root = (IProject)getTaskModel().getObject(NewReferenceWizard.PROJECT); - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - ArrayList<IProject> list = new ArrayList<IProject>(Arrays.asList(projects)); - Iterator<IProject> i = list.iterator(); - IProject p; - while(i.hasNext()) { - p = i.next(); - if( !p.isOpen()) - i.remove(); - else if( p.equals(root)) - i.remove(); - } - return (IProject[]) list.toArray(new IProject[list.size()]); - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public void dispose() { - } - public boolean hasChildren(Object element) { - return false; - } - public Object getParent(Object element) { - return null; - } - public Object[] getChildren(Object parentElement) { - return null; - } - }; - } - return contentProvider; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java 2009-08-20 01:38:06 UTC (rev 17171) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,56 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage; - -import java.util.ArrayList; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; - -public class VariableReferenceWizardFragment extends JarReferenceWizardFragment { - public Composite createComposite(Composite parent, IWizardHandle handle) { - Composite c = super.createComposite(parent, handle); - handle.setTitle("Add a Variable Reference"); - handle.setDescription("Here you can reference a variable which maps to a single jar.\n" - + "This is not a suggested use-case, but is here for backwards compatability."); - return c; - } - - protected void buttonPressed() { - selected = BuildPathDialogAccess.chooseVariableEntries( - browse.getShell(), new Path[0]); - viewer.refresh(); - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); - if (selected != null && selected.length > 0) { - ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); - ArrayList<String> paths = new ArrayList<String>(); - for (int i = 0; i < selected.length; i++) { - IPath resolvedPath = JavaCore.getResolvedVariablePath(selected[i]); - java.io.File file = new java.io.File(resolvedPath.toOSString()); - if (file.isFile() && file.exists()) { - String type = VirtualArchiveComponent.VARARCHIVETYPE - + IPath.SEPARATOR; - IVirtualComponent archive = ComponentCore - .createArchiveComponent(rootComponent.getProject(), - type + selected[i].toString()); - compList.add(archive); - paths.add(resolvedPath.lastSegment()); - } - } - IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); - String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); - getTaskModel().putObject(NewReferenceWizard.COMPONENT, components); - getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2); - } - } -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.wtp.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.wtp.override.ui.messages"; //$NON-NLS-1$ + public static String AddModuleDependenciesPropertiesPage_AddProjectButton; + public static String AddModuleDependenciesPropertiesPage_DeployPathColumn; + public static String AddModuleDependenciesPropertiesPage_RemoveSelectedButton; + public static String AddModuleDependenciesPropertiesPage_SelectAProjectTitle; + public static String AddModuleDependenciesPropertiesPage_SourceColumn; + public static String J2EEDependenciesPage_Description; + public static String J2EEDependenciesPage_ErrorCheckingFacets; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/WTPOveridePlugin.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,87 @@ +package org.jboss.ide.eclipse.as.wtp.ui; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class WTPOveridePlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.ui"; //$NON-NLS-1$ + + // The shared instance + private static WTPOveridePlugin plugin; + + /** + * The constructor + */ + public WTPOveridePlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + 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 WTPOveridePlugin getDefault() { + return plugin; + } + + public static void log(Exception e) { + log(e.getMessage(), e); + } + + public static void log(String message, Exception e) { + IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, e); + getDefault().getLog().log(status); + } + public static IStatus createStatus(int severity, int aCode, + String aMessage, Throwable exception) { + return new Status(severity, PLUGIN_ID, aCode, + aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$ + } + public static IStatus createErrorStatus(int aCode, String aMessage, + Throwable exception) { + return createStatus(IStatus.ERROR, aCode, aMessage, exception); + } + + public static IStatus createStatus(int severity, String message, Throwable exception) { + return new Status(severity, PLUGIN_ID, message, exception); + } + + public static IStatus createStatus(int severity, String message) { + return createStatus(severity, message, null); + } + public static void logError(Throwable exception) { + Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception)); + } + + public static void logError(CoreException exception) { + Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() ); + } + +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,7 @@ +AddModuleDependenciesPropertiesPage_AddProjectButton=Add Project... +AddModuleDependenciesPropertiesPage_DeployPathColumn=Deploy Path +AddModuleDependenciesPropertiesPage_RemoveSelectedButton=Remove selected... +AddModuleDependenciesPropertiesPage_SelectAProjectTitle=Select a Project +AddModuleDependenciesPropertiesPage_SourceColumn=Source +J2EEDependenciesPage_Description=ModuleDependency Page Description +J2EEDependenciesPage_ErrorCheckingFacets=Error Checking Project Facets Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddFolderDialog.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddFolderDialog.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddFolderDialog.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddFolderDialog.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,133 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +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.jface.dialogs.TitleAreaDialog; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; + +public class AddFolderDialog extends TitleAreaDialog { + private IProject project; + private TreeViewer viewer; + private IContainer selected = null; + public AddFolderDialog(Shell parentShell, IProject project) { + super(parentShell); + this.project = project; + } + + protected void configureShell(Shell shell) { + super.configureShell(shell); + shell.setText("Add Folder"); + shell.setBounds(shell.getLocation().x, shell.getLocation().y, 400,300); + } + + protected Control createDialogArea(Composite parent) { + Composite c = (Composite)super.createDialogArea(parent); + this.viewer = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); + viewer.setContentProvider(getContentProvider()); + viewer.setLabelProvider(getLabelProvider()); + viewer.addFilter(getFilter()); + viewer.setInput(project); + viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); + viewer.addSelectionChangedListener(getListener()); + return c; + } + + protected ISelectionChangedListener getListener() { + return new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); + Object first = sel.getFirstElement(); + if( first instanceof IContainer) + selected = (IContainer)first; + } + }; + } + + public IContainer getSelected() { + return selected; + } + + protected ViewerFilter getFilter() { + return new ViewerFilter() { + public boolean select(Viewer viewer, Object parentElement, + Object element) { + return element instanceof IContainer; + } + }; + } + + protected ITreeContentProvider getContentProvider() { + return new ITreeContentProvider() { + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + + public void dispose() { + } + + public Object[] getElements(Object inputElement) { + try { + return project.members(); + } catch( CoreException ce ) { + return new Object[]{}; + } + } + + public boolean hasChildren(Object element) { + if( element instanceof IContainer) { + try { + return ((IContainer)element).members().length > 0; + } catch( CoreException ce ) { + } + } + return false; + } + + public Object getParent(Object element) { + if( element instanceof IResource) + return ((IResource)element).getParent(); + return null; + } + + public Object[] getChildren(Object parentElement) { + if( parentElement instanceof IContainer) { + try { + return ((IContainer)parentElement).members(); + } catch( CoreException ce ) { + } + } + return new Object[]{}; + } + }; + } + + protected LabelProvider getLabelProvider() { + return new LabelProvider() { + public Image getImage(Object element) { + return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER); + } + public String getText(Object element) { + if( element instanceof IResource) + return ((IResource)element).getName(); + return element.toString(); + } + }; + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java (from rev 17170, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,908 @@ +/******************************************************************************* + * Copyright (c) 2005, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial API and implementation + * David Schneider, david.schneider(a)unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences + * Stefan Dimov, stefan.dimov(a)sap.com - bugs 207826, 222651 + *******************************************************************************/ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.ICellModifier; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TableLayout; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties; +import org.eclipse.wst.common.componentcore.internal.ComponentResource; +import org.eclipse.wst.common.componentcore.internal.StructureEdit; +import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent; +import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider; +import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.jboss.ide.eclipse.as.wtp.ui.Messages; +import org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin; + +public class AddModuleDependenciesPropertiesPage implements Listener, + IModuleDependenciesControl { + + private static final String DEPLOY_PATH_PROPERTY = new Integer(0).toString(); + private static final String SOURCE_PROPERTY = new Integer(1).toString(); + + + protected final String PATH_SEPARATOR = ComponentDependencyContentProvider.PATH_SEPARATOR; + private boolean hasInitialized = false; + protected final IProject project; + protected final ModuleAssemblyRootPage propPage; + protected IVirtualComponent rootComponent = null; + protected Text componentNameText; + protected Label availableModules; + protected TableViewer availableComponentsViewer; + protected Button addMappingButton, addReferenceButton, removeButton; + protected Composite buttonColumn; + protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS; + protected Listener tableListener; + protected Listener labelListener; + + // Mappings that existed when the page was opened (or last saved) + protected HashMap<IVirtualComponent, String> oldComponentToRuntimePath = new HashMap<IVirtualComponent, String>(); + + // Mappings that are current + protected HashMap<IVirtualComponent, String> objectToRuntimePath = new HashMap<IVirtualComponent, String>(); + + // A single list of wb-resource mappings. If there's any change, + // all old will be removed and new ones added + protected ArrayList<ComponentResourceProxy> resourceMappings = new ArrayList<ComponentResourceProxy>(); + + // keeps track if a change has occurred in wb-resource mappings + protected boolean resourceMappingsChanged = false; + + /** + * Constructor for AddModulestoEARPropertiesControl. + */ + public AddModuleDependenciesPropertiesPage(final IProject project, + final ModuleAssemblyRootPage page) { + this.project = project; + this.propPage = page; + rootComponent = ComponentCore.createComponent(project); + } + + /* + * UI Creation Methods + */ + + public Composite createContents(final Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.marginWidth = 0; + layout.marginWidth = 0; + composite.setLayout(layout); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + ModuleAssemblyRootPage.createDescriptionComposite(composite, + "TODO Change this: Create and change packaging structure for this project "); + createListGroup(composite); + refresh(); + Dialog.applyDialogFont(parent); + return composite; + } + + protected void createListGroup(Composite parent) { + Composite listGroup = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + layout.marginWidth = 0; + layout.marginHeight = 0; + listGroup.setLayout(layout); + GridData gData = new GridData(GridData.FILL_BOTH); + gData.horizontalIndent = 5; + listGroup.setLayoutData(gData); + + availableModules = new Label(listGroup, SWT.NONE); + gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.VERTICAL_ALIGN_FILL); + availableModules.setText("Module Assembly"); //$NON-NLS-1$ + availableModules.setLayoutData(gData); + createTableComposite(listGroup); + } + + protected void createTableComposite(Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + GridData gData = new GridData(GridData.FILL_BOTH); + composite.setLayoutData(gData); + fillComposite(composite); + } + + public void fillComposite(Composite parent) { + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + layout.marginHeight = 0; + parent.setLayout(layout); + parent.setLayoutData(new GridData(GridData.FILL_BOTH)); + createTable(parent); + createButtonColumn(parent); + } + + protected void createButtonColumn(Composite parent) { + buttonColumn = createButtonColumnComposite(parent); + GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END); + buttonColumn.setLayoutData(data); + createPushButtons(); + } + + protected void createPushButtons() { + addMappingButton = createPushButton("Add Folder..."); + addReferenceButton = createPushButton("Add Reference..."); + removeButton = createPushButton("Remove selected"); + } + + protected Button createPushButton(String label) { + Button aButton = new Button(buttonColumn, SWT.PUSH); + aButton.setText(label); + aButton.addListener(SWT.Selection, this); + aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + return aButton; + } + + public Composite createButtonColumnComposite(Composite parent) { + Composite aButtonColumn = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + layout.marginHeight = 0; + layout.marginWidth = 0; + aButtonColumn.setLayout(layout); + GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.VERTICAL_ALIGN_BEGINNING); + aButtonColumn.setLayoutData(data); + return aButtonColumn; + } + + public Group createGroup(Composite parent) { + return new Group(parent, SWT.NULL); + } + + protected void createTable(Composite parent) { + if (rootComponent != null) { + availableComponentsViewer = createAvailableComponentsViewer(parent); + GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.FILL_VERTICAL); + availableComponentsViewer.getTable().setLayoutData(gd); + + ComponentDependencyContentProvider provider = createProvider(); + provider.setRuntimePaths(objectToRuntimePath); + provider.setResourceMappings(resourceMappings); + availableComponentsViewer.setContentProvider(provider); + availableComponentsViewer.setLabelProvider(provider); + addTableListeners(); + } + } + + /** + * Subclasses should over-ride this and extend the class + */ + protected ComponentDependencyContentProvider createProvider() { + return new ComponentDependencyContentProvider(); + } + + /* + * Listeners of various events + */ + + protected void addTableListeners() { + addHoverHelpListeners(); + addDoubleClickListener(); + addSelectionListener(); + } + + protected void addHoverHelpListeners() { + final Table table = availableComponentsViewer.getTable(); + createLabelListener(table); + createTableListener(table); + table.addListener(SWT.Dispose, tableListener); + table.addListener(SWT.KeyDown, tableListener); + table.addListener(SWT.MouseMove, tableListener); + table.addListener(SWT.MouseHover, tableListener); + } + + protected void createLabelListener(final Table table) { + labelListener = new Listener() { + public void handleEvent(Event event) { + Label label = (Label) event.widget; + Shell shell = label.getShell(); + switch (event.type) { + case SWT.MouseDown: + Event e = new Event(); + e.item = (TableItem) label.getData("_TABLEITEM"); //$NON-NLS-1$ + table.setSelection(new TableItem[] { (TableItem) e.item }); + table.notifyListeners(SWT.Selection, e); + shell.dispose(); + table.setFocus(); + break; + case SWT.MouseExit: + shell.dispose(); + break; + } + } + }; + } + + protected void createTableListener(final Table table) { + tableListener = new Listener() { + Shell tip = null; + Label label = null; + + public void handleEvent(Event event) { + switch (event.type) { + case SWT.Dispose: + case SWT.KeyDown: + case SWT.MouseMove: { + if (tip == null) + break; + tip.dispose(); + tip = null; + label = null; + break; + } + case SWT.MouseHover: { + TableItem item = table.getItem(new Point(event.x, event.y)); + if (item != null && item.getData() != null && !canEdit(item.getData())) { + if (tip != null && !tip.isDisposed()) + tip.dispose(); + tip = new Shell(PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(), + SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); + tip.setBackground(Display.getDefault().getSystemColor( + SWT.COLOR_INFO_BACKGROUND)); + FillLayout layout = new FillLayout(); + layout.marginWidth = 2; + tip.setLayout(layout); + label = new Label(tip, SWT.WRAP); + label.setForeground(Display.getDefault() + .getSystemColor(SWT.COLOR_INFO_FOREGROUND)); + label.setBackground(Display.getDefault() + .getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + label.setData("_TABLEITEM", item); //$NON-NLS-1$ + label.setText(J2EEUIMessages + .getResourceString(J2EEUIMessages.HOVER_HELP_FOR_DISABLED_LIBS)); + label.addListener(SWT.MouseExit, labelListener); + label.addListener(SWT.MouseDown, labelListener); + Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Rectangle rect = item.getBounds(0); + Point pt = table.toDisplay(rect.x, rect.y); + tip.setBounds(pt.x, pt.y - size.y, size.x, size.y); + tip.setVisible(true); + } + } + } + } + }; + } + + protected boolean canEdit(Object data) { + if( data == null ) return false; + if( !(data instanceof VirtualArchiveComponent)) return true; + + VirtualArchiveComponent d2 = (VirtualArchiveComponent)data; + boolean sameProject = d2.getWorkspaceRelativePath() != null + && d2.getWorkspaceRelativePath().segment(0) + .equals(rootComponent.getProject().getName()); + return !(sameProject && isPhysicallyAdded(d2)); + } + + protected void addDoubleClickListener() { + availableComponentsViewer.setColumnProperties(new String[] { + DEPLOY_PATH_PROPERTY, SOURCE_PROPERTY }); + + CellEditor[] editors = new CellEditor[] { + new TextCellEditor(availableComponentsViewer.getTable()), + new TextCellEditor()}; + availableComponentsViewer.setCellEditors(editors); + availableComponentsViewer + .setCellModifier(new RuntimePathCellModifier()); + } + + protected void addSelectionListener() { + availableComponentsViewer.addSelectionChangedListener( + new ISelectionChangedListener(){ + public void selectionChanged(SelectionChangedEvent event) { + viewerSelectionChanged(); + } + }); + } + + protected void viewerSelectionChanged() { + removeButton.setEnabled(getSelectedObject() != null && canEdit(getSelectedObject())); + } + + protected Object getSelectedObject() { + IStructuredSelection sel = (IStructuredSelection)availableComponentsViewer.getSelection(); + return sel.getFirstElement(); + } + + private class RuntimePathCellModifier implements ICellModifier { + + public boolean canModify(Object element, String property) { + if( property.equals(DEPLOY_PATH_PROPERTY)) { + if (element instanceof VirtualArchiveComponent) { + try { + return canEdit(element); + } catch (IllegalArgumentException iae) { + } + } + return true; + } + return false; + } + + public Object getValue(Object element, String property) { + Object data = element; //((TableItem)element).getData(); + if( data instanceof IVirtualComponent ) { + return objectToRuntimePath.get(element) == null ? new Path("/") //$NON-NLS-1$ + .toString() : objectToRuntimePath.get(element); + } else if( data instanceof ComponentResourceProxy) { + return ((ComponentResourceProxy)data).runtimePath.toString(); + } + return new Path("/"); + } + + public void modify(Object element, String property, Object value) { + if (property.equals(DEPLOY_PATH_PROPERTY)) { + TableItem item = (TableItem) element; + if( item.getData() instanceof IVirtualComponent) { + objectToRuntimePath.put((IVirtualComponent)item.getData(), (String) value); + } else if( item.getData() instanceof ComponentResourceProxy) { + ComponentResourceProxy c = ((ComponentResourceProxy)item.getData()); + c.runtimePath = new Path((String)value); + resourceMappingsChanged = true; + } + refresh(); + } + } + + } + + public void handleEvent(Event event) { + if( event.widget == addMappingButton) + handleAddMappingButton(); + else if( event.widget == addReferenceButton) + handleAddReferenceButton(); + else if( event.widget == removeButton ) + handleRemoveSelectedButton(); + } + + protected void handleAddMappingButton() { + AddFolderDialog afd = new AddFolderDialog(addMappingButton.getShell(), project); + if( afd.open() == Window.OK) { + IContainer c = afd.getSelected(); + if( c != null ) { + IPath p = c.getProjectRelativePath(); + ComponentResourceProxy proxy = new ComponentResourceProxy(p, new Path("/")); + resourceMappings.add(proxy); + refresh(); + } + } + } + + protected void handleAddReferenceButton() { + NewReferenceWizard wizard = new NewReferenceWizard(); + // fill the task model + wizard.getTaskModel().putObject(NewReferenceWizard.PROJECT, project); + wizard.getTaskModel().putObject(NewReferenceWizard.ROOT_COMPONENT, rootComponent); + + WizardDialog wd = new WizardDialog(addReferenceButton.getShell(), wizard); + if( wd.open() != Window.CANCEL) { + Object c1 = wizard.getTaskModel().getObject(NewReferenceWizard.COMPONENT); + Object p1 = wizard.getTaskModel().getObject(NewReferenceWizard.COMPONENT_PATH); + IVirtualComponent[] compArr = c1 instanceof IVirtualComponent ? + new IVirtualComponent[] { (IVirtualComponent)c1 } : + (IVirtualComponent[])c1; + String[] pathArr = p1 instanceof String ? + new String[] { (String)p1 } : + (String[])p1; + for( int i = 0; i < compArr.length; i++ ) { + objectToRuntimePath.put(compArr[i], pathArr[i]); + } + refresh(); + } + } + + protected void handleRemoveSelectedButton() { + ISelection sel = availableComponentsViewer.getSelection(); + if( sel instanceof IStructuredSelection ) { + Object o = ((IStructuredSelection)sel).getFirstElement(); + if( o instanceof IVirtualComponent) + objectToRuntimePath.remove(o); + else if( o instanceof ComponentResourceProxy) + resourceMappings.remove(o); + refresh(); + } + } + + public TableViewer createAvailableComponentsViewer(Composite parent) { + int flags = SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI; + + Table table = new Table(parent, flags); + availableComponentsViewer = new TableViewer(table); + + // set up table layout + TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout(); + tableLayout.addColumnData(new ColumnWeightData(400, true)); + tableLayout.addColumnData(new ColumnWeightData(500, true)); + table.setLayout(tableLayout); + table.setHeaderVisible(true); + table.setLinesVisible(true); + availableComponentsViewer.setSorter(null); + + TableColumn bndColumn = new TableColumn(table, SWT.NONE, 0); + bndColumn.setText(Messages.AddModuleDependenciesPropertiesPage_DeployPathColumn); + bndColumn.setResizable(true); + + TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1); + projectColumn.setText(Messages.AddModuleDependenciesPropertiesPage_SourceColumn); + projectColumn.setResizable(true); + + tableLayout.layout(table, true); + return availableComponentsViewer; + + } + + protected boolean isPhysicallyAdded(VirtualArchiveComponent component) { + try { + component.getProjectRelativePath(); + return true; + } catch (IllegalArgumentException e) { + return false; + } + } + + /** + * This should only be called on changes, such as adding a project + * reference, adding a lib reference etc. + * + * It will reset the input, manually re-add missing elements, and do other + * tasks + */ + public void refresh() { + resetTableUI(); + if (!hasInitialized) { + initialize(); + resetTableUI(); + } + + } + + protected void resetTableUI() { + IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot(); + availableComponentsViewer.setInput(input); + GridData data = new GridData(GridData.FILL_BOTH); + int numlines = Math.min(10, availableComponentsViewer.getTable() + .getItemCount()); + data.heightHint = availableComponentsViewer.getTable().getItemHeight() + * numlines; + availableComponentsViewer.getTable().setLayoutData(data); + GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.VERTICAL_ALIGN_BEGINNING); + buttonColumn.setLayoutData(btndata); + } + + protected void initialize() { + IVirtualReference[] refs = rootComponent.getReferences(); + IVirtualComponent comp; + for( int i = 0; i < refs.length; i++ ) { + comp = refs[i].getReferencedComponent(); + String val = refs[i].getRuntimePath().append(refs[i].getArchiveName()).toString(); + objectToRuntimePath.put(comp, val); + oldComponentToRuntimePath.put((IVirtualComponent) comp, val); + } + + ComponentResource[] allMappings = findAllMappings(); + for( int i = 0; i < allMappings.length; i++ ) { + resourceMappings.add(new ComponentResourceProxy( + allMappings[i].getSourcePath(), allMappings[i].getRuntimePath() + )); + } + hasInitialized = true; + } + + protected ComponentResource[] findAllMappings() { + StructureEdit structureEdit = null; + try { + structureEdit = StructureEdit.getStructureEditForRead(project); + WorkbenchComponent component = structureEdit.getComponent(); + Object[] arr = component.getResources().toArray(); + ComponentResource[] result = new ComponentResource[arr.length]; + for( int i = 0; i < arr.length; i++ ) + result[i] = (ComponentResource)arr[i]; + return result; + } catch(Exception e) { + } finally { + structureEdit.dispose(); + } + return new ComponentResource[]{}; + } + + public class ComponentResourceProxy { + public IPath source, runtimePath; + public ComponentResourceProxy(IPath source, IPath runtimePath) { + this.source = source; + this.runtimePath = runtimePath; + } + } + + /* + * Clean-up methods are below. These include performCancel, performDefaults, + * performOK, and any other methods that are called *only* by this one. + */ + public void setVisible(boolean visible) { + } + + public void performDefaults() { + } + + public boolean performCancel() { + return true; + } + + public void dispose() { + Table table = null; + if (availableComponentsViewer != null) { + table = availableComponentsViewer.getTable(); + } + if (table == null || tableListener == null) + return; + table.removeListener(SWT.Dispose, tableListener); + table.removeListener(SWT.KeyDown, tableListener); + table.removeListener(SWT.MouseMove, tableListener); + table.removeListener(SWT.MouseHover, tableListener); + } + + + + /* + * This is where the OK work goes. Lots of it. Watch your head. + * xiao xin + */ + protected boolean preHandleChanges(IProgressMonitor monitor) { + return true; + } + + protected boolean postHandleChanges(IProgressMonitor monitor) { + return true; + } + + public boolean performOk() { + boolean result = true; + result &= saveResourceChanges(); + result &= saveReferenceChanges(); + return result; + } + + protected boolean saveResourceChanges() { + removeAllResourceMappings(); + addNewResourceMappings(); + return true; + } + protected boolean addNewResourceMappings() { + ComponentResourceProxy[] proxies = (ComponentResourceProxy[]) resourceMappings.toArray(new ComponentResourceProxy[resourceMappings.size()]); + IVirtualFolder rootFolder = rootComponent.getRootFolder(); + for( int i = 0; i < proxies.length; i++ ) { + try { + rootFolder.getFolder(proxies[i].runtimePath).createLink(proxies[i].source, 0, null); + } catch( CoreException ce ) { + } + } + resourceMappingsChanged = false; + return true; + } + + protected boolean removeAllResourceMappings() { + StructureEdit moduleCore = null; + try { + moduleCore = StructureEdit.getStructureEditForWrite(project); + moduleCore.getComponent().getResources().clear(); + } + finally { + if (moduleCore != null) { + moduleCore.saveIfNecessary(new NullProgressMonitor()); + moduleCore.dispose(); + } + } + return true; + } + + protected boolean saveReferenceChanges() { + // Fill our delta lists + ArrayList<IVirtualComponent> added = new ArrayList<IVirtualComponent>(); + ArrayList<IVirtualComponent> removed = new ArrayList<IVirtualComponent>(); + ArrayList<IVirtualComponent> changed = new ArrayList<IVirtualComponent>(); + + Iterator<IVirtualComponent> j = oldComponentToRuntimePath.keySet().iterator(); + Object key, val; + while (j.hasNext()) { + key = j.next(); + val = oldComponentToRuntimePath.get(key); + if( !objectToRuntimePath.containsKey(key)) + removed.add((IVirtualComponent)key); + else if (!val.equals(objectToRuntimePath.get(key))) + changed.add((IVirtualComponent)key); + } + + j = objectToRuntimePath.keySet().iterator(); + while (j.hasNext()) { + key = j.next(); + if (!oldComponentToRuntimePath.containsKey(key)) + added.add((IVirtualComponent)key); + } + + NullProgressMonitor monitor = new NullProgressMonitor(); + boolean subResult = preHandleChanges(monitor); + if( !subResult ) + return false; + + handleDeltas(removed, changed, added); + subResult &= postHandleChanges(monitor); + + // Now update the variables + oldComponentToRuntimePath.clear(); + ArrayList<IVirtualComponent> keys = new ArrayList<IVirtualComponent>(); + keys.addAll(objectToRuntimePath.keySet()); + Iterator<IVirtualComponent> i = keys.iterator(); + while(i.hasNext()) { + IVirtualComponent vc = i.next(); + String path = objectToRuntimePath.get(vc); + oldComponentToRuntimePath.put(vc, path); + } + return subResult; + } + + // Subclass can override if it has a good way to handle changed elements + protected void handleDeltas(ArrayList<IVirtualComponent> removed, + ArrayList<IVirtualComponent> changed, ArrayList<IVirtualComponent> added) { + ArrayList<IVirtualComponent> removed2 = new ArrayList<IVirtualComponent>(); + ArrayList<IVirtualComponent> added2 = new ArrayList<IVirtualComponent>(); + removed2.addAll(removed); + removed2.addAll(changed); + added2.addAll(added); + added2.addAll(changed); + + // meld the changed into the added / removed for less efficiency ;) + // basically we lack "change" operations and only have add / remove + handleRemoved(removed2); + handleAdded(added2); + } + protected void handleRemoved(ArrayList<IVirtualComponent> removed) { + // If it's removed it should *only* be a virtual component already + Iterator<IVirtualComponent> i = removed.iterator(); + IVirtualComponent component; + while(i.hasNext()) { + try { + component = i.next(); + IDataModelOperation operation = getRemoveComponentOperation(component); + operation.execute(null, null); + } catch( ExecutionException e) { + WTPOveridePlugin.logError(e); + } + } + } + + protected IDataModelOperation getRemoveComponentOperation(IVirtualComponent component) { + String path, archiveName; + path = new Path(oldComponentToRuntimePath.get(component)).removeLastSegments(1).toString(); + archiveName = new Path(oldComponentToRuntimePath.get(component)).lastSegment(); + + IDataModelProvider provider = getRemoveReferenceDataModelProvider(component); + IDataModel model = DataModelFactory.createDataModel(provider); + model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, rootComponent); + List<IVirtualComponent> modHandlesList = (List<IVirtualComponent>) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); + modHandlesList.add(component); + model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList); + model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path); + Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>(); + uriMap.put(component, archiveName); + model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap); + return model.getDefaultOperation(); + } + + protected IDataModelProvider getRemoveReferenceDataModelProvider(IVirtualComponent component) { + return new RemoveReferenceComponentsDataModelProvider(); + } + + + protected void handleChanged(ArrayList<IVirtualComponent> changed) { + Iterator<IVirtualComponent> i = changed.iterator(); + IVirtualComponent component; + IVirtualReference ref; + IPath p; + while(i.hasNext()) { + component = i.next(); + ref = rootComponent.getReference(component.getName()); + p = new Path(objectToRuntimePath.get(component)); + ref.setRuntimePath(p); + } + } + + protected void handleAdded(ArrayList<IVirtualComponent> added) { + final ArrayList<IVirtualComponent> components = new ArrayList<IVirtualComponent>(); + Iterator<IVirtualComponent> i = added.iterator(); + IVirtualComponent o; + while(i.hasNext()) { + o = i.next(); + components.add((IVirtualComponent)o); + } + + IWorkspaceRunnable runnable = new IWorkspaceRunnable(){ + public void run(IProgressMonitor monitor) throws CoreException{ + addComponents(components); + } + }; + try { + ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor()); + } catch( CoreException e ) { + WTPOveridePlugin.logError(e); + } + } + + protected void addComponents(ArrayList<IVirtualComponent> components) throws CoreException { + Iterator<IVirtualComponent> i = components.iterator(); + while(i.hasNext()) { + addOneComponent(i.next()); + } + } + + protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) { + return new CreateReferenceComponentsDataModelProvider(); + } + + protected void addOneComponent(IVirtualComponent component) throws CoreException { + String path, archiveName; + path = new Path(objectToRuntimePath.get(component)).removeLastSegments(1).toString(); + archiveName = new Path(objectToRuntimePath.get(component)).lastSegment(); + + IDataModelProvider provider = getAddReferenceDataModelProvider(component); + IDataModel dm = DataModelFactory.createDataModel(provider); + + dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, rootComponent); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Arrays.asList(component)); + + //[Bug 238264] the uri map needs to be manually set correctly + Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>(); + uriMap.put(component, archiveName); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path); + + IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); + if (stat != OK_STATUS) + throw new CoreException(stat); + try { + dm.getDefaultOperation().execute(new NullProgressMonitor(), null); + } catch (ExecutionException e) { + WTPOveridePlugin.logError(e); + } + } + /** + * Method returns the name of the given IVirtualComponent being sure the correct extension + * is on the end of the name, this is important for internal projects. Added for [Bug 241509] + * + * Note (rs) : I do not believe this ever gets called with a binary virtComp + * + * @param virtComp the IVirtualComponent to get the name of with the correct extension + * @return the name of the given IVirtualComponent with the correct extension + */ + protected String getVirtualComponentNameWithExtension(IVirtualComponent virtComp) { + String virtCompURIMapName = this.getURIMappingName(virtComp); + String extension = ".jar"; + virtCompURIMapName += extension; + return virtCompURIMapName; + } + + /** + * [Bug 238264] + * determines a unique URI mapping name for a given component + * this is in case two components have the same name. + * + * @return returns a valid (none duplicate) uri mapping name for the given component\ + */ + private String getURIMappingName(IVirtualComponent archive) { + + //get the default uri map name for the given archive + IPath componentPath = Path.fromOSString(archive.getName()); + String uriMapName = componentPath.lastSegment().replace(' ', '_'); + + + //check to be sure this uri mapping is not already in use by another reference + boolean dupeArchiveName; + String refedCompName; + int lastDotIndex; + String increment; + IVirtualReference [] existingRefs = rootComponent.getReferences(); + for(int i=0;i<existingRefs.length;i++){ + refedCompName = existingRefs[i].getReferencedComponent().getName(); + + //if uri mapping names of the refed component and the given archive are the same + // find a new uri map name for the given archive + if(existingRefs[i].getArchiveName().equals(uriMapName)){ + dupeArchiveName = true; + //find a new uriMapName for the given component + for(int j=1; dupeArchiveName; j++){ + lastDotIndex = uriMapName.lastIndexOf('.'); + increment = "_"+j; //$NON-NLS-1$ + + //create the new potential name + if(lastDotIndex != -1){ + uriMapName = uriMapName.substring(0, lastDotIndex) + increment + uriMapName.substring(lastDotIndex); + } else { + uriMapName = uriMapName.substring(0)+increment; + } + + //determine if the new potential name is valid + for(int k=0; k<existingRefs.length; k++) { + dupeArchiveName = existingRefs[k].getArchiveName().equals(uriMapName); + if(dupeArchiveName) { + break; + } + } + } + } + } + + return uriMapName; + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ComponentDependencyContentProvider.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,110 @@ +/******************************************************************************* + * Copyright (c) 2005, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial API and implementation + * Stefan Dimov, stefan.dimov(a)sap.com - bug 207826 + *******************************************************************************/ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.HashMap; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.graphics.Image; +import org.eclipse.wst.common.componentcore.internal.ComponentResource; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy; + + +/* + * The only valid elements this content provider (should) provide + * are IProject or IVirtualComponent objects. The runtime paths portion is + * shared with the preference page itself where they can both modify the data. + * + * This provider no longer "meddles" in to the content as it used to, + * but rather serves as only a view of it. + */ +public class ComponentDependencyContentProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider { + + final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR); + + private HashMap<IVirtualComponent, String> runtimePaths; + private ArrayList<ComponentResourceProxy> resourceMappings; + public ComponentDependencyContentProvider() { + super(); + } + + public void setRuntimePaths(HashMap<IVirtualComponent, String> paths) { + this.runtimePaths = paths; + } + + public void setResourceMappings(ArrayList<ComponentResourceProxy> mappings) { + this.resourceMappings = mappings; + } + + public Object[] getElements(Object inputElement) { + Object[] empty = new Object[0]; + if( !(inputElement instanceof IWorkspaceRoot)) + return empty; + ArrayList<Object> list = new ArrayList<Object>(); + list.addAll(resourceMappings); + list.addAll(runtimePaths.keySet()); + return list.toArray(); + } + + public Image getColumnImage(Object element, int columnIndex) { + return null; + } + + public String getColumnText(Object element, int columnIndex) { + if( element instanceof ComponentResourceProxy) { + if( columnIndex == 0 ) + return ((ComponentResourceProxy)element).runtimePath.toString(); + else if( columnIndex == 1 ) + return ((ComponentResourceProxy)element).source.toString(); + } + if (element instanceof IVirtualComponent) { + IVirtualComponent comp = (IVirtualComponent)element; + if (columnIndex == 0) { + if( runtimePaths == null || runtimePaths.get(element) == null) { + return new Path(PATH_SEPARATOR).toString(); + } + return runtimePaths.get(element); + } else if (columnIndex == 1) { + if( comp.isBinary() && comp instanceof VirtualArchiveComponent) { + IPath p = ((VirtualArchiveComponent)comp).getWorkspaceRelativePath(); + if( p == null ) + p = new Path(((VirtualArchiveComponent)comp).getUnderlyingDiskFile().getAbsolutePath()); + return p.toString(); + } + return comp.getProject().getName(); + } + } else if (element instanceof IProject){ + if (columnIndex == 0) { + if( runtimePaths == null || runtimePaths.get(element) == null) { + return new Path(PATH_SEPARATOR).toString(); + } + return runtimePaths.get(element); + } else { + return ((IProject)element).getName(); + } + } + return null; + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,108 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin; + +public class DependencyPageExtensionManager { + private static DependencyPageExtensionManager manager = null; + public static DependencyPageExtensionManager getManager() { + if( manager == null ) + manager = new DependencyPageExtensionManager(); + return manager; + } + + private HashMap<String, IDependencyPageProvider> providers = null; + + public IDependencyPageProvider getProvider(IFacetedProject project) { + if( providers == null ) + loadProviders(); + Iterator<IDependencyPageProvider> i = providers.values().iterator(); + IDependencyPageProvider temp; + while(i.hasNext()) { + temp = i.next(); + if( temp.canHandle(project)) + return temp; + } + return null; + } + + private void loadProviders() { + HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>(); + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IConfigurationElement[] cf = registry.getConfigurationElementsFor( + WTPOveridePlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$ + for( int i = 0; i < cf.length; i++ ) { + try { + temp.put(cf[i].getAttribute("id"), //$NON-NLS-1$ + (IDependencyPageProvider)cf[i].createExecutableExtension("class")); //$NON-NLS-1$ + } catch( CoreException ce ) {} + } + providers = temp; + } + + public WizardFragment loadReferenceWizardFragment(String id) { + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IConfigurationElement[] cf = registry.getConfigurationElementsFor( + WTPOveridePlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ + for( int i = 0; i < cf.length; i++ ) { + if( cf[i].getAttribute("id").equals(id)) + try { + return (WizardFragment)cf[i].createExecutableExtension("class"); + } catch( CoreException ce) {} + } + return null; + } + + public ReferenceExtension[] getReferenceExtensions() { + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IConfigurationElement[] cf = registry.getConfigurationElementsFor( + WTPOveridePlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ + ArrayList<ReferenceExtension> list = new ArrayList<ReferenceExtension>(); + for( int i = 0; i < cf.length; i++ ) { + list.add(new ReferenceExtension(cf[i])); + } + return (ReferenceExtension[]) list + .toArray(new ReferenceExtension[list.size()]); + } + + public class ReferenceExtension { + private IConfigurationElement element; + private String id, name, imageLoc; + private Image image; + public ReferenceExtension(IConfigurationElement element) { + this.element = element; + this.id = element.getAttribute("id"); + this.name = element.getAttribute("name"); + this.imageLoc = element.getAttribute("icon"); + } + public String getId() { return this.id;} + public String getName() { return this.name; } + public Image getImage() { + if( image == null ) { + if( imageLoc != null && element.getContributor().getName() != null) { + ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(element.getContributor().getName(), imageLoc); + image = desc.createImage(); + } + } + return image; + } + public void disposeImage() { + if( image != null ) { + image.dispose(); + image = null; + } + } + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExternalJarReferenceWizardFragment.java (from rev 17170, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExternalJarReferenceWizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,51 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; + +public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment { + public Composite createComposite(Composite parent, IWizardHandle handle) { + Composite c = super.createComposite(parent, handle); + handle.setTitle("Add an External Jar Reference"); + handle.setDescription("Here you can reference a filesystem Jar\n" + + "This is not a suggested use-case, but is here for backwards compatability."); + return c; + } + + protected void buttonPressed() { + selected = BuildPathDialogAccess + .chooseExternalJAREntries(browse.getShell()); + viewer.refresh(); + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); + if (selected != null && selected.length > 0) { + ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); + ArrayList<String> paths = new ArrayList<String>(); + for (int i = 0; i < selected.length; i++) { + // IPath fullPath = project.getFile(selected[i]).getFullPath(); + String type = VirtualArchiveComponent.LIBARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive = ComponentCore + .createArchiveComponent(rootComponent.getProject(), + type + selected[i].toString()); + compList.add(archive); + paths.add(selected[i].lastSegment()); + } + IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); + String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); + getTaskModel().putObject(NewReferenceWizard.COMPONENT, components); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2); + } + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IDependencyPageProvider.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IDependencyPageProvider.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IDependencyPageProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IDependencyPageProvider.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,10 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; + +public interface IDependencyPageProvider { + public boolean canHandle(IFacetedProject project); + public IModuleDependenciesControl[] createPages(IFacetedProject project, ModuleAssemblyRootPage parent); + public Composite createRootControl(IModuleDependenciesControl[] pages, Composite parent); +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IModuleDependenciesControl.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/IModuleDependenciesControl.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IModuleDependenciesControl.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/IModuleDependenciesControl.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,42 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import org.eclipse.swt.widgets.Composite; + +public interface IModuleDependenciesControl { + /** + * Creates the Composite associated with this control. + * @param parent Parent Composite. + * @return Composite for the control. + */ + Composite createContents(Composite parent); + + /** + * Called when the property page's <code>performOk()</code> method is called. + * @return + */ + boolean performOk(); + + /** + * Called when the property page's <code>performDefaults()</code> method is called. + * @return + */ + void performDefaults(); + + /** + * Called when the property page's <code>performCancel()</code> method is called. + * @return + */ + boolean performCancel(); + + /** + * Called when the property page's <code>setVisible()</code> method is called. + * @return + */ + void setVisible(boolean visible); + + /** + * Called when the property page's <code>dispose()</code> method is called. + * @return + */ + void dispose(); +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/JarReferenceWizardFragment.java (from rev 17170, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/JarReferenceWizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/JarReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,149 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; + +public class JarReferenceWizardFragment extends WizardFragment { + protected LabelProvider labelProvider = null; + protected ITreeContentProvider contentProvider = null; + protected TreeViewer viewer; + protected Button browse; + protected IPath[] paths; + protected IWizardHandle handle; + protected IPath[] selected = new IPath[]{}; + public boolean hasComposite() { + return true; + } + + public Composite createComposite(Composite parent, IWizardHandle handle) { + this.handle = handle; + handle.setTitle("Add a Jar Reference"); + handle.setDescription("Here you can reference a workspace Jar\n" + + "This is not a suggested use-case, but is here for backwards compatability."); + + Composite c = new Composite(parent, SWT.NONE); + c.setLayout(new FormLayout()); + viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); + viewer.setContentProvider(getContentProvider()); + viewer.setLabelProvider(getLabelProvider()); + viewer.setInput(ResourcesPlugin.getWorkspace()); + + browse = new Button(c, SWT.NONE); + browse.setText("Browse..."); + FormData fd = new FormData(); + fd.left = new FormAttachment(0, 5); + fd.bottom = new FormAttachment(100, -5); + browse.setLayoutData(fd); + + fd = new FormData(); + fd.left = new FormAttachment(0, 5); + fd.top = new FormAttachment(0, 5); + fd.right = new FormAttachment(100, -5); + fd.bottom = new FormAttachment(browse, -5); + viewer.getTree().setLayoutData(fd); + + browse.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + buttonPressed(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + return c; + } + + protected void buttonPressed() { + IProject project = (IProject)getTaskModel().getObject(NewReferenceWizard.PROJECT); + selected = BuildPathDialogAccess.chooseJAREntries( + browse.getShell(), + project.getLocation(), new IPath[0]); + viewer.refresh(); + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); + if (selected != null && selected.length > 0) { + ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); + ArrayList<String> paths = new ArrayList<String>(); + for (int i = 0; i < selected.length; i++) { + // IPath fullPath = project.getFile(selected[i]).getFullPath(); + String type = VirtualArchiveComponent.LIBARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive = ComponentCore + .createArchiveComponent(rootComponent.getProject(), + type + selected[i].makeRelative().toString()); + compList.add(archive); + paths.add(selected[i].lastSegment()); + } + IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); + String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); + getTaskModel().putObject(NewReferenceWizard.COMPONENT, components); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2); + } + } + + protected LabelProvider getLabelProvider() { + if (labelProvider == null) { + labelProvider = new LabelProvider() { + public Image getImage(Object element) { + return null; + } + + public String getText(Object element) { + return element == null ? "" : element.toString();//$NON-NLS-1$ + } + }; + } + return labelProvider; + } + + protected ITreeContentProvider getContentProvider() { + if (contentProvider == null) { + contentProvider = new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + return selected == null ? new Object[]{} : selected; + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + return contentProvider; + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ModuleAssemblyRootPage.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ModuleAssemblyRootPage.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ModuleAssemblyRootPage.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ModuleAssemblyRootPage.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,175 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial implementation as prop page heirarchy + * rfrost(a)bea.com - conversion to single property page impl + *******************************************************************************/ + +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +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.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.dialogs.PropertyPage; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; + +/** + * Primary project property page for Module dependencies; + */ +public class ModuleAssemblyRootPage extends PropertyPage { + + private IProject project; + private IModuleDependenciesControl[] controls = new IModuleDependenciesControl[0]; + + public ModuleAssemblyRootPage() { + super(); + } + + private Composite getFacetErrorComposite(final Composite parent) { + final String errorCheckingFacet = "Error Checking Project Facets"; + setErrorMessage(errorCheckingFacet); + return getErrorComposite(parent, errorCheckingFacet); + } + private Composite getVirtCompErrorComposite(final Composite parent) { + final String errorCheckingFacet = "The given project is not a virtual component project"; + setErrorMessage(errorCheckingFacet); + return getErrorComposite(parent, errorCheckingFacet); + } + + + private Composite getErrorComposite(final Composite parent, final String error) { + final Composite composite = new Composite(parent, SWT.NONE); + final GridLayout layout = new GridLayout(); + layout.marginWidth = 0; + layout.marginWidth = 0; + composite.setLayout(layout); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + final Label label= new Label(composite, SWT.NONE); + label.setText(error); + return composite; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.preference.IPreferencePage#performOk() + */ + public boolean performOk() { + for (int i = 0; i < controls.length; i++) { + if (controls[i] != null) { + if (!controls[i].performOk()) { + return false; + } + } + } + return true; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.preference.PreferencePage#performDefaults() + */ + public void performDefaults() { + for (int i = 0; i < controls.length; i++) { + if (controls[i] != null) { + controls[i].performDefaults(); + } + } + } + + /* (non-Javadoc) + * @see org.eclipse.jface.preference.IPreferencePage#performCancel() + */ + public boolean performCancel() { + for (int i = 0; i < controls.length; i++) { + if (controls[i] != null) { + if (!controls[i].performCancel()) { + return false; + } + } + } + return super.performCancel(); + } + + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean) + */ + public void setVisible(boolean visible) { + super.setVisible(visible); + for (int i = 0; i < controls.length; i++) { + if (controls[i] != null) { + controls[i].setVisible(visible); + } + } + } + + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.IDialogPage#dispose() + */ + public void dispose() { + super.dispose(); + for (int i = 0; i < controls.length; i++) { + if(controls[i] != null){ + controls[i].dispose(); + } + } + } + + protected static void createDescriptionComposite(final Composite parent, final String description) { + Composite descriptionComp = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + descriptionComp.setLayout(layout); + descriptionComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + fillDescription(descriptionComp, description); + } + + private static void fillDescription(Composite c, String s) { + GridData data = new GridData(GridData.FILL_HORIZONTAL); + data.widthHint = 250; + Text text = new Text(c, SWT.READ_ONLY | SWT.WRAP); + text.setLayoutData(data); + text.setText(s); + } + + protected Control createContents(Composite parent) { + + // Need to find out what type of project we are handling + project = (IProject) getElement().getAdapter(IResource.class); + if( project != null ) { + try { + IFacetedProject facetedProject = ProjectFacetsManager.create(project); + IDependencyPageProvider provider = null; + if( facetedProject == null ) + return getFacetErrorComposite(parent); + + provider = DependencyPageExtensionManager.getManager().getProvider(facetedProject); + if( provider != null ) { + controls = provider.createPages(facetedProject, this); + return provider.createRootControl(controls, parent); + } + + if( ComponentCore.createComponent(project) == null ) + return getVirtCompErrorComposite(parent); + + AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this); + controls = new IModuleDependenciesControl[1]; + controls[0] = page; + return page.createContents(parent); + } catch( CoreException ce ) { + } + } + return getFacetErrorComposite(parent); + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,148 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension; + +public class NewReferenceRootWizardFragment extends WizardFragment { + protected Map<String, WizardFragment> fragmentMap = + new HashMap<String, WizardFragment>(); + private IWizardHandle wizard; + private TreeViewer viewer; + public boolean hasComposite() { + return true; + } + + public Composite createComposite(Composite parent, IWizardHandle wizard) { + this.wizard = wizard; + wizard.setTitle("Select a reference type"); + wizard.setDescription("Here you can select one of many types of references to add"); + Composite c = new Composite(parent, SWT.NONE); + c.setLayout(new FillLayout()); + viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); + viewer.setLabelProvider(getLabelProvider()); + viewer.setContentProvider(getContentProvider()); + viewer.setInput(ResourcesPlugin.getWorkspace()); + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + viewerSelectionChanged(); + } + }); + return c; + } + + protected void viewerSelectionChanged() { + wizard.update(); + } + + protected WizardFragment getWizardFragment(String extensionPointID) { + try { + WizardFragment fragment = fragmentMap.get(extensionPointID); + if (fragment != null) + return fragment; + } catch (Exception e) { + // ignore + } + + WizardFragment fragment = DependencyPageExtensionManager.getManager().loadReferenceWizardFragment(extensionPointID); + if (fragment != null) + fragmentMap.put(extensionPointID, fragment); + return fragment; + } + + public List getChildFragments() { + List<WizardFragment> listImpl = new ArrayList<WizardFragment>(); + createChildFragments(listImpl); + return listImpl; + } + + protected void createChildFragments(List<WizardFragment> list) { + // Instantiate and add the fragment for the current ID + if( viewer != null ) { + IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); + ReferenceExtension selected = (ReferenceExtension)sel.getFirstElement(); + if( selected != null ) { + WizardFragment child = getWizardFragment(selected.getId()); + if( child != null ) + list.add(child); + } + } + } + + public boolean isComplete() { + return true; + } + + + private LabelProvider labelProvider = null; + private ITreeContentProvider contentProvider = null; + protected LabelProvider getLabelProvider() { + if( labelProvider == null ) { + labelProvider = new LabelProvider() { + public Image getImage(Object element) { + if( element instanceof ReferenceExtension) + return ((ReferenceExtension)element).getImage(); + return null; + } + public String getText(Object element) { + if( element instanceof ReferenceExtension) + return ((ReferenceExtension)element).getName(); + return element == null ? "" : element.toString();//$NON-NLS-1$ + } + public void dispose() { + super.dispose(); + if( extensions != null ) { + for( int i = 0; i < extensions.length; i++) { + extensions[i].disposeImage(); + } + } + } + }; + } + return labelProvider; + } + + private ReferenceExtension[] extensions = null; + protected ITreeContentProvider getContentProvider() { + if( contentProvider == null ) { + contentProvider = new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + if( extensions == null ) + extensions = DependencyPageExtensionManager.getManager().getReferenceExtensions(); + return extensions; + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + return contentProvider; + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceWizard.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,28 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.List; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IWorkbench; +import org.eclipse.wst.server.ui.internal.wizard.TaskWizard; +import org.eclipse.wst.server.ui.wizard.WizardFragment; + +public class NewReferenceWizard extends TaskWizard { + + public static final String COMPONENT = "dependency.component"; + public static final String COMPONENT_PATH = "dependency.component.path"; + public static final String PROJECT = "root.project"; + public static final String ROOT_COMPONENT = "root.component"; + + public NewReferenceWizard() { + super("New Reference Wizard", new WizardFragment() { + protected void createChildFragments(List<WizardFragment> list) { + list.add(new NewReferenceRootWizardFragment()); + } + }); + } + + public void init(IWorkbench newWorkbench, IStructuredSelection newSelection) { + // do nothing + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ProjectReferenceWizardFragment.java (from rev 17170, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ProjectReferenceWizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/ProjectReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,144 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; +import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; + +public class ProjectReferenceWizardFragment extends WizardFragment { + private LabelProvider labelProvider = null; + private ITreeContentProvider contentProvider = null; + private TreeViewer viewer; + private IProject selected; + + public boolean hasComposite() { + return true; + } + + public Composite createComposite(Composite parent, IWizardHandle handle) { + handle.setTitle("Add a Project Reference"); + handle.setDescription("Here you can make a project into a reference.\n" + + "If the project is not already a flexible project, it will be converted into one."); + + Composite c = new Composite(parent, SWT.NONE); + c.setLayout(new FillLayout()); + viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); + viewer.setContentProvider(getContentProvider()); + viewer.setLabelProvider(getLabelProvider()); + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + selChanged(); + } + }); + viewer.setInput(ResourcesPlugin.getWorkspace()); + return c; + } + + private void selChanged() { + if( viewer != null ) { + IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); + if( sel != null ) + selected = (IProject)sel.getFirstElement(); + } + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + if( !ModuleCoreNature.isFlexibleProject(selected)) { + try { + IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider()); + migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, selected.getName()); + migrationdm.getDefaultOperation().execute(new NullProgressMonitor(), null); + } catch( ExecutionException ee) { + // TODO something + } + } + IVirtualComponent comp = ComponentCore.createComponent(selected); + String path = selected.getName(); + String extension = ".jar"; + path += extension; + + getTaskModel().putObject(NewReferenceWizard.COMPONENT, comp); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, path); + } + + + protected LabelProvider getLabelProvider() { + if( labelProvider == null ) { + labelProvider = new LabelProvider() { + public Image getImage(Object element) { + return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_PROJECT); + } + public String getText(Object element) { + if( element instanceof IProject ) + return ((IProject)element).getName(); + return element == null ? "" : element.toString();//$NON-NLS-1$ + } + }; + } + return labelProvider; + } + + protected ITreeContentProvider getContentProvider() { + if( contentProvider == null ) { + contentProvider = new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + IProject root = (IProject)getTaskModel().getObject(NewReferenceWizard.PROJECT); + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + ArrayList<IProject> list = new ArrayList<IProject>(Arrays.asList(projects)); + Iterator<IProject> i = list.iterator(); + IProject p; + while(i.hasNext()) { + p = i.next(); + if( !p.isOpen()) + i.remove(); + else if( p.equals(root)) + i.remove(); + } + return (IProject[]) list.toArray(new IProject[list.size()]); + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + return contentProvider; + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/VariableReferenceWizardFragment.java (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/VariableReferenceWizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/VariableReferenceWizardFragment.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -0,0 +1,56 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; + +public class VariableReferenceWizardFragment extends JarReferenceWizardFragment { + public Composite createComposite(Composite parent, IWizardHandle handle) { + Composite c = super.createComposite(parent, handle); + handle.setTitle("Add a Variable Reference"); + handle.setDescription("Here you can reference a variable which maps to a single jar.\n" + + "This is not a suggested use-case, but is here for backwards compatability."); + return c; + } + + protected void buttonPressed() { + selected = BuildPathDialogAccess.chooseVariableEntries( + browse.getShell(), new Path[0]); + viewer.refresh(); + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT); + if (selected != null && selected.length > 0) { + ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); + ArrayList<String> paths = new ArrayList<String>(); + for (int i = 0; i < selected.length; i++) { + IPath resolvedPath = JavaCore.getResolvedVariablePath(selected[i]); + java.io.File file = new java.io.File(resolvedPath.toOSString()); + if (file.isFile() && file.exists()) { + String type = VirtualArchiveComponent.VARARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive = ComponentCore + .createArchiveComponent(rootComponent.getProject(), + type + selected[i].toString()); + compList.add(archive); + paths.add(resolvedPath.lastSegment()); + } + } + IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); + String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); + getTaskModel().putObject(NewReferenceWizard.COMPONENT, components); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2); + } + } +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl (from rev 17169, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2009-08-20 00:29:38 UTC (rev 17169) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.impl; +package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl; import java.util.ArrayList; @@ -14,8 +14,8 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.AddModuleDependenciesPropertiesPage; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ModuleAssemblyRootPage; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.AddModuleDependenciesPropertiesPage; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage; public class EarModuleDependenciesPropertyPage extends AddModuleDependenciesPropertiesPage { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2009-08-20 00:29:38 UTC (rev 17169) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2009-08-20 01:40:26 UTC (rev 17172) @@ -1,11 +1,11 @@ -package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.impl; +package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl; import org.eclipse.swt.widgets.Composite; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.IDependencyPageProvider; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.IModuleDependenciesControl; -import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ModuleAssemblyRootPage; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IDependencyPageProvider; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IModuleDependenciesControl; +import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage; public class EarModuleDependencyPageProvider implements IDependencyPageProvider {

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17171 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui: META-INF and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-19 21:38:06 -0400 (Wed, 19 Aug 2009) New Revision: 17171 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/.project trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml Log: in steps: renaming ui to as.wtp.ui Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/.project =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/.project 2009-08-20 01:36:34 UTC (rev 17170) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/.project 2009-08-20 01:38:06 UTC (rev 17171) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.ide.eclipse.as.wtp.override.ui</name> + <name>org.jboss.ide.eclipse.as.wtp.ui</name> <comment></comment> <projects> </projects> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 01:36:34 UTC (rev 17170) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 01:38:06 UTC (rev 17171) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WTP UI Overrides -Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.override.ui;singleton:=true +Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.ui;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin Require-Bundle: org.eclipse.ui, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-08-20 01:36:34 UTC (rev 17170) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-08-20 01:38:06 UTC (rev 17171) @@ -23,14 +23,14 @@ </page> </extension> <extension - point="org.jboss.ide.eclipse.as.wtp.override.ui.moduleDependencyPropertyPage"> + point="org.jboss.ide.eclipse.as.wtp.ui.moduleDependencyPropertyPage"> <dependencyPage class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.impl.EarModuleDependencyPageProvider" id="org.jboss.ide.eclipse.as.wtp.override.ui.earDependencyPage"> </dependencyPage> </extension> <extension - point="org.jboss.ide.eclipse.as.wtp.override.ui.referenceWizardFragment"> + point="org.jboss.ide.eclipse.as.wtp.ui.referenceWizardFragment"> <referenceFragment class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ProjectReferenceWizardFragment" icon="icons/prj_obj.gif"

16 years, 4 months

1
0
0 / 0

← Newer
1
...
20
21
22
23
24
25
26
...
47
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2009