Author: bbrodt Date: 2010-05-20 12:30:19 -0400 (Thu, 20 May 2010) New Revision: 22216 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java Log: https://jira.jboss.org/browse/JBIDE-6006 https://jira.jboss.org/browse/JBIDE-6093 Had to roll my own BPEL Content Describer class - XMLRootElementContentDescriber2 has some...strange behavior Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-20 16:30:19 UTC (rev 22216) @@ -333,10 +333,16 @@ if (type.getId().equals(BPEL_CONTENT_TYPE)) return true; } + + // https://jira.jboss.org/browse/JBIDE-6006 + // this causes all kinds of nasty stack traces - see https://jira.jboss.org/browse/JBIDE-6093 + // since this version of the ODE deployment editor is part of the same feature as the BPEL editor + // plugin, we'll go on the assumption that they will always be installed together. You'd have to + // something pretty dangerous to install one without the other. // maybe the eclipse BPEL editor is not installed? // fall back to using '.bpel' file extension - if ("bpel".equals(((IFile)res).getFileExtension())) - return true; + //if ("bpel".equals(((IFile)res).getFileExtension())) + // return true; } } catch(Exception ex) Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-05-20 16:30:19 UTC (rev 22216) @@ -66,3 +66,4 @@ org.eclipse.bpel.ui.util.marker, org.eclipse.bpel.ui.wizards Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.eclipse.bpel.validator Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2010-05-20 16:30:19 UTC (rev 22216) @@ -657,11 +657,9 @@ name="BPEL Editor File" file-extensions="bpel,bpel2,xml" priority="normal"> + <!-- problems with XMLRootElementContentDescriber2 - had to roll my own --> <describer - class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2"> - <parameter - name="element" - value="{http://docs.oasis-open.org/wsbpel/2.0/process/executable}pro... + class="org.eclipse.bpel.ui.BPELContentDescriber"> </describer> </content-type> </extension> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java 2010-05-20 16:30:19 UTC (rev 22216) @@ -21,6 +21,7 @@ import org.eclipse.bpel.model.CorrelationSet; import org.eclipse.bpel.model.messageproperties.Property; import org.eclipse.bpel.ui.util.BPELUtil; +import org.eclipse.bpel.validator.Builder; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -51,13 +52,9 @@ public boolean visit(final IResourceDelta delta) throws CoreException { IResource target = delta.getResource(); - if (target.getType() == IResource.FILE) { - String ext = target.getFileExtension(); - if (ext != null) { - if (ext.equals(IBPELUIConstants.EXTENSION_BPEL)) { - handleBPEL(delta); - } - } + // https://jira.jboss.org/browse/JBIDE-6006 + if (Builder.isBPELFile(target)) { + handleBPEL(delta); } return true; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java 2010-05-20 16:30:19 UTC (rev 22216) @@ -17,7 +17,9 @@ public interface IBPELUIConstants { // File extensions - @Deprecated // use content type instead of bpel file extensions + // https://jira.jboss.org/browse/JBIDE-6006 + // @Deprecated // use content type instead of bpel file extensions + // oops! actually not deprecated - we still need this to construct bpel file names public final String EXTENSION_BPEL = "bpel"; //$NON-NLS-1$ public final String EXTENSION_WSDL = "wsdl"; //$NON-NLS-1$ public final String EXTENSION_WSIL = "wsil"; //$NON-NLS-1$