Author: Grid.Qian Date: 2009-12-02 02:41:35 -0500 (Wed, 02 Dec 2009) New Revision: 18966 Added: trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore Removed: trunk/bpel/plugins/org.eclipse.bpel.common.model/.cvsignore trunk/bpel/plugins/org.eclipse.bpel.common.ui/.cvsignore trunk/bpel/plugins/org.eclipse.bpel.model/.cvsignore trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java trunk/bpel/plugins/org.eclipse.bpel.ui/.classpath trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF Log: JBIDE-5349: sync the bpel codes from eclipse bpel codes base Deleted: trunk/bpel/plugins/org.eclipse.bpel.common.model/.cvsignore =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.model/.cvsignore 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/.cvsignore 2009-12-02 07:41:35 UTC (rev 18966) @@ -1 +0,0 @@ -bin Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2009-12-02 07:41:35 UTC (rev 18966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Extension Model (Incubation) Bundle-SymbolicName: org.eclipse.bpel.common.model; singleton:=true -Bundle-Version: 0.4.0.qualifier +Bundle-Version: 0.5.0 Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", @@ -57,4 +57,5 @@ org.eclipse.emf.ecore.xmi.util", org.eclipse.bpel.names Bundle-Vendor: eclipse.org -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ClassPath: bin +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Deleted: trunk/bpel/plugins/org.eclipse.bpel.common.ui/.cvsignore =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/.cvsignore 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/.cvsignore 2009-12-02 07:41:35 UTC (rev 18966) @@ -1 +0,0 @@ -bin Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009-12-02 07:41:35 UTC (rev 18966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Common UI (Incubation) Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true -Bundle-Version: 0.4.0.qualifier +Bundle-Version: 0.5.0 Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", @@ -11,8 +11,8 @@ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.gef;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore.change;bundle-version="[2.4.0,3.0.0)", - org.eclipse.bpel.model;bundle-version="0.4.0" -Bundle-ActivationPolicy: lazy + org.eclipse.bpel.model;bundle-version="0.5.0" +Eclipse-LazyStart: true Export-Package: org.eclipse.bpel.common.ui, org.eclipse.bpel.common.ui.assist, org.eclipse.bpel.common.ui.calendar, @@ -29,5 +29,6 @@ org.eclipse.bpel.common.ui.markers, org.eclipse.bpel.common.ui.palette, org.eclipse.bpel.common.ui.tray -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: eclipse.org +Bundle-ClassPath: bin Deleted: trunk/bpel/plugins/org.eclipse.bpel.model/.cvsignore =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/.cvsignore 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.model/.cvsignore 2009-12-02 07:41:35 UTC (rev 18966) @@ -1 +0,0 @@ -bin Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-12-02 07:41:35 UTC (rev 18966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: BPEL Model (Incubation) Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true -Bundle-Version: 0.4.0.qualifier +Bundle-Version: 0.5.0 Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation Bundle-Vendor: eclipse.org Bundle-Localization: plugin @@ -12,8 +12,8 @@ org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", org.apache.xerces;bundle-version="[2.9.0,3.0.0)", - org.eclipse.bpel.common.model;bundle-version="0.4.0", - javax.wsdl;bundle-version="[1.5.0,1.6.0)" + javax.wsdl;bundle-version="[1.5.0,1.6.0)", + org.eclipse.bpel.common.model;bundle-version="0.5.0" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpel.model, org.eclipse.bpel.model.adapters, @@ -29,4 +29,5 @@ org.eclipse.bpel.model.resource, org.eclipse.bpel.model.terms, org.eclipse.bpel.model.util -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ClassPath: bin Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -27,6 +27,7 @@ import org.apache.xerces.dom.AttrImpl; import org.apache.xerces.dom.DocumentImpl; import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl; +import org.eclipse.bpel.model.BPELPackage; import org.eclipse.bpel.model.Correlation; import org.eclipse.bpel.model.CorrelationSet; import org.eclipse.bpel.model.CorrelationSets; @@ -272,15 +273,17 @@ * the reference object. * @return the process object, or null */ - - static public Process getProcess(EObject eObj) { - EObject context = eObj; - - while (context != null) { - if (context instanceof Process) { - return (Process) context; + public static Process getProcess(Object object) { + if (object instanceof EObject) { + // check if *this* is already the process object + if (object instanceof Process) + return (Process)object; + EObject cont = ((EObject)object).eContainer(); + while (cont != null) { + if (cont.eClass() == BPELPackage.eINSTANCE.getProcess()) + return (Process)cont; + cont = cont.eContainer(); } - context = context.eContainer(); } return null; } Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -57,12 +57,15 @@ import org.eclipse.bpel.model.OnAlarm; import org.eclipse.bpel.model.OnEvent; import org.eclipse.bpel.model.OnMessage; +import org.eclipse.bpel.model.PartnerActivity; import org.eclipse.bpel.model.PartnerLink; import org.eclipse.bpel.model.PartnerLinks; import org.eclipse.bpel.model.Pick; import org.eclipse.bpel.model.Process; import org.eclipse.bpel.model.Query; +import org.eclipse.bpel.model.Receive; import org.eclipse.bpel.model.RepeatUntil; +import org.eclipse.bpel.model.Reply; import org.eclipse.bpel.model.Scope; import org.eclipse.bpel.model.Sequence; import org.eclipse.bpel.model.ServiceRef; @@ -71,6 +74,7 @@ import org.eclipse.bpel.model.Target; import org.eclipse.bpel.model.Targets; import org.eclipse.bpel.model.TerminationHandler; +import org.eclipse.bpel.model.Throw; import org.eclipse.bpel.model.To; import org.eclipse.bpel.model.ToPart; import org.eclipse.bpel.model.ToParts; @@ -84,6 +88,7 @@ import org.eclipse.bpel.model.impl.PartnerLinksImpl; import org.eclipse.bpel.model.impl.VariablesImpl; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; import org.eclipse.wst.wsdl.WSDLElement; import org.w3c.dom.CDATASection; @@ -300,6 +305,183 @@ return null; } + + private static void updateLinkNameReferences(Link link, String name) { + if(link.getSources() != null && !link.getSources().isEmpty()) { + ((Source)link.getSources().get(0)).getElement().setAttribute(BPELConstants.AT_LINK_NAME, name); + } + if(link.getTargets() != null && !link.getTargets().isEmpty()) { + ((Target)link.getTargets().get(0)).getElement().setAttribute(BPELConstants.AT_LINK_NAME, name); + } + } + + private static void updateMessageExchangeNameReferences(MessageExchange messExchange, String name) { + Process process = BPELUtils.getProcess(messExchange); + TreeIterator iter = process.eAllContents(); + //TODO make more efficient for Scope!!! + while(iter.hasNext()) { + Object object = iter.next(); + // receive + if(object instanceof Receive) { + Receive receive = (Receive) object; + if(messExchange.equals(receive.getMessageExchange())) { + receive.getElement().setAttribute(BPELConstants.AT_MESSAGE_EXCHANGE, name); + } + // reply + } else if(object instanceof Reply) { + Reply reply = (Reply) object; + if(messExchange.equals(reply.getMessageExchange())) { + reply.getElement().setAttribute(BPELConstants.AT_MESSAGE_EXCHANGE, name); + } + // onMessage + } else if(object instanceof OnMessage) { + OnMessage onMessage = (OnMessage)object; + if(messExchange.equals(onMessage.getMessageExchange())) { + onMessage.getElement().setAttribute(BPELConstants.AT_MESSAGE_EXCHANGE, name); + } + // onEvent + } else if(object instanceof OnEvent) { + OnEvent onEvent = (OnEvent)object; + if(messExchange.equals(onEvent.getMessageExchange())) { + onEvent.getElement().setAttribute(BPELConstants.AT_MESSAGE_EXCHANGE, name); + } + } + // scope + } + } + + private static void updateCorrelationSetNameReferences(CorrelationSet corrSet, String name) { + // difference correlation and correlationsets? + Process process = BPELUtils.getProcess(corrSet); + TreeIterator iter = process.eAllContents(); + while(iter.hasNext()) { + Object object = iter.next(); + // receive, reply, invoke + if(object instanceof PartnerActivity) { + PartnerActivity partnerAct = (PartnerActivity) object; + partnerAct.getCorrelations(); + // TODO + } + // scope + // correlation + + // onMessage + else if(object instanceof OnMessage) { + OnMessage onMessage = (OnMessage)object; + onMessage.getCorrelations(); + // TODO + // onEvent + } else if(object instanceof OnEvent) { + OnEvent onEvent = (OnEvent)object; + Correlations correlations = onEvent.getCorrelations(); + // TODO + } + // TODO onEvent.getcorrelationssets does what? + } + } + + private static void updatePartnerLinkNameReferences(PartnerLink partnerLink, String name) { + // TODO + } + + private static void updateVariableNameReferences(Variable variable, String name) { + Process process = BPELUtils.getProcess(variable); + TreeIterator iter = process.eAllContents(); + while(iter.hasNext()) { + Object object = iter.next(); + + // TODO refactor the code if possible + // from + if(object instanceof From) { + From from = (From) object; + if(variable.equals(from.getVariable())) { + from.getElement().setAttribute(BPELConstants.AT_VARIABLE, name); + } + // to + } else if (object instanceof To) { + To to = (To) object; + if(variable.equals(to.getVariable())) { + to.getElement().setAttribute(BPELConstants.AT_VARIABLE, name); + } + // receive + } else if(object instanceof Receive) { + Receive receive = (Receive)object; + if(variable.equals(receive.getVariable())) { + receive.getElement().setAttribute(BPELConstants.AT_VARIABLE, name); + } + // reply + } else if (object instanceof Reply) { + Reply reply = (Reply)object; + if(variable.equals(reply.getVariable())) { + reply.getElement().setAttribute(BPELConstants.AT_VARIABLE, name); + } + // invoke + } else if (object instanceof Invoke) { + Invoke invoke = (Invoke)object; + // fromparts + if(invoke.getFromParts() != null) { + FromParts fromParts = invoke.getFromParts(); + EList<FromPart> list = fromParts.getChildren(); + for (FromPart fromPart : list) { + if(variable.equals(fromPart.getToVariable())) { + fromPart.getElement().setAttribute(BPELConstants.AT_TO_VARIABLE, name); + } + } + } + // toparts + if(invoke.getToParts() != null) { + ToParts toParts = invoke.getToParts(); + EList<ToPart> list = toParts.getChildren(); + for (ToPart toPart : list) { + if(variable.equals(toPart.getFromVariable())) { + toPart.getElement().setAttribute(BPELConstants.AT_FROM_VARIABLE, name); + } + } + } + // inputvariable + if(variable.equals(invoke.getInputVariable())) { + invoke.getElement().setAttribute(BPELConstants.AT_INPUT_VARIABLE, name); + } + // outputvariable + if(variable.equals(invoke.getOutputVariable())) { + invoke.getElement().setAttribute(BPELConstants.AT_OUTPUT_VARIABLE, name); + } + // throw + } else if(object instanceof Throw) { + Throw _throw = (Throw) object; + if(variable.equals(_throw.getFaultVariable())) { + _throw.getElement().setAttribute(BPELConstants.AT_FAULT_VARIABLE, name); + } + // catch + } else if (object instanceof Catch) { + Catch _catch = (Catch) object; + if(variable.equals(_catch.getFaultVariable())) { + _catch.getElement().setAttribute(BPELConstants.AT_FAULT_VARIABLE, name); + } + // validate: has list to reference real variable: nothing to implement + + // onMessage + } else if (object instanceof OnMessage) { + OnMessage onMessage = (OnMessage) object; + if(variable.equals(onMessage)) { + onMessage.getElement().setAttribute(BPELConstants.AT_VARIABLE, name); + } + // onEvent + } else if (object instanceof OnEvent) { + OnEvent onEvent = (OnEvent) object; + if(variable.equals(onEvent.getVariable())) { + onEvent.getElement().setAttribute(BPELConstants.AT_VARIABLE, name); + } + } + // forEach nothing to do: defines its own new variable, does not use existing one + // --> what if it uses existing one... this is not forbidden by UI + + // initialize variables from other variables? + // XPATH, Expressions, etc.? + // TODO TEST with local variables. make faster for local variables + } + } + public static void replaceAttribute(WSDLElement element, String attributeName, String attributeValue) { boolean oldUpdatingDom = isUpdatingDom(element); @@ -321,11 +503,45 @@ if (isEqual(parseElement.getAttribute(attributeName), attributeValue)) { return; } + if (attributeValue != null && !attributeValue.equals("")) { parseElement.setAttribute(attributeName, attributeValue); } else { parseElement.removeAttribute(attributeName); } + + // HACK!!! + // This is very hacky, but works and could show the way to another solution + if("name".equals(attributeName)) { + // link + if(element instanceof Link) { + updateLinkNameReferences((Link)element, attributeValue); + } + + // variable + if(element instanceof Variable) { + updateVariableNameReferences((Variable)element, attributeValue); + } + + // message exchange + else if(element instanceof MessageExchange) { + updateMessageExchangeNameReferences((MessageExchange)element, attributeValue); + } + + // correlation set + else if(element instanceof CorrelationSet) { + updateCorrelationSetNameReferences((CorrelationSet)element, attributeValue); + } + + // partner link + else if(element instanceof PartnerLink) { + updatePartnerLinkNameReferences((PartnerLink)element, attributeValue); + } + + // partner link type: equivalent, but not with BPEL but WSDL + // property: correlation set + property alias --> WSDL + } + } finally { setUpdatingDom(element, oldUpdatingDom); } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/.classpath =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/.classpath 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/.classpath 2009-12-02 07:41:35 UTC (rev 18966) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> Deleted: trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore 2009-12-02 07:41:35 UTC (rev 18966) @@ -1 +0,0 @@ -bin Added: trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore 2009-12-02 07:41:35 UTC (rev 18966) @@ -0,0 +1 @@ +bin Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/.cvsignore ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2009-12-02 07:41:35 UTC (rev 18966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: BPEL Editor (Incubation) Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true -Bundle-Version: 0.4.0.qualifier +Bundle-Version: 0.5.0 Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin @@ -15,13 +15,13 @@ org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)", org.eclipse.gef;bundle-version="[3.4.0,4.0.0)", org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - org.eclipse.bpel.common.ui;bundle-version="0.4.0", + org.eclipse.bpel.common.ui;bundle-version="0.5.0", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", - org.eclipse.bpel.common.ui;bundle-version="0.4.0", - org.eclipse.bpel.common.model;bundle-version="0.4.0", - org.eclipse.bpel.model;bundle-version="0.4.0", + org.eclipse.bpel.common.ui;bundle-version="0.5.0", + org.eclipse.bpel.common.model;bundle-version="0.5.0", + org.eclipse.bpel.model;bundle-version="0.5.0", org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)", - org.eclipse.bpel.wsil.model;bundle-version="0.4.0", + org.eclipse.bpel.wsil.model;bundle-version="0.5.0", org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)", javax.wsdl;bundle-version="[1.5.0,1.6.0)", @@ -66,4 +66,4 @@ org.eclipse.bpel.ui.util.marker, org.eclipse.bpel.ui.wizards Bundle-ClassPath: bin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -12,7 +12,10 @@ package org.eclipse.bpel.ui; +import java.io.File; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -28,6 +31,7 @@ import org.eclipse.bpel.model.PartnerLink; import org.eclipse.bpel.model.Process; import org.eclipse.bpel.model.Variable; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.adapters.AdapterNotification; import org.eclipse.bpel.ui.editparts.ProcessTrayEditPart; import org.eclipse.bpel.ui.editparts.util.OutlineTreePartFactory; @@ -40,6 +44,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarkerDelta; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; @@ -47,7 +52,10 @@ import org.eclipse.core.resources.IWorkspace; 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.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.draw2d.LightweightSystem; import org.eclipse.draw2d.Viewport; import org.eclipse.draw2d.parts.ScrollableThumbnail; @@ -71,6 +79,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.viewers.IPostSelectionProvider; import org.eclipse.jface.viewers.ISelection; @@ -94,6 +103,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.ide.FileStoreEditorInput; import org.eclipse.ui.ide.IGotoMarker; import org.eclipse.ui.internal.views.properties.tabbed.view.TabDescriptor; import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyViewer; @@ -115,9 +125,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -public class BPELMultipageEditorPart extends MultiPageEditorPart - implements IEditModelListener, - IGotoMarker/*, CommandStackListener*/ { +public class BPELMultipageEditorPart extends MultiPageEditorPart +implements IEditModelListener, +IGotoMarker/*, CommandStackListener*/ { class OutlinePage extends ContentOutlinePage { private PageBook pageBook; @@ -142,59 +152,59 @@ getViewer().setEditDomain(getEditDomain()); getViewer().setEditPartFactory(new OutlineTreePartFactory()); - fDesignViewer.registerViewer(getViewer()); + BPELMultipageEditorPart.this.fDesignViewer.registerViewer(getViewer()); //FIXME should we add the same for src tab? - ContextMenuProvider provider = new ProcessContextMenuProvider(getDesignEditor(), fDesignViewer.getActionRegistry()); + ContextMenuProvider provider = new ProcessContextMenuProvider(getDesignEditor(), BPELMultipageEditorPart.this.fDesignViewer.getActionRegistry()); getViewer().setContextMenu(provider); getSite().registerContextMenu("org.eclipse.bpel.outline.contextmenu", //$NON-NLS-1$ - provider, - getSite().getSelectionProvider()); - getViewer().setKeyHandler(fDesignViewer.getKeyHandler()); + provider, + getSite().getSelectionProvider()); + getViewer().setKeyHandler(BPELMultipageEditorPart.this.fDesignViewer.getKeyHandler()); // TODO: Drag and drop support goes here // getViewer().addDropTargetListener(new BPELTemplateTransferDropTargetListener(getViewer())); IToolBarManager tbm = getSite().getActionBars().getToolBarManager(); - showOutlineAction = new Action() { + this.showOutlineAction = new Action() { @Override public void run() { showPage(ID_OUTLINE); } - - @Override + + @Override public String getToolTipText() { - return Messages.OutlinePage_showOutlineView; - } + return Messages.OutlinePage_showOutlineView; + } }; - showOutlineAction.setImageDescriptor(BPELUIPlugin.INSTANCE.getImageDescriptor(IBPELUIConstants.ICON_OUTLINE_16)); - tbm.add(showOutlineAction); - showOverviewAction = new Action() { + this.showOutlineAction.setImageDescriptor(BPELUIPlugin.INSTANCE.getImageDescriptor(IBPELUIConstants.ICON_OUTLINE_16)); + tbm.add(this.showOutlineAction); + this.showOverviewAction = new Action() { @Override public void run() { showPage(ID_OVERVIEW); } - - @Override + + @Override public String getToolTipText() { - return Messages.OutlinePage_showOverviewView; - } + return Messages.OutlinePage_showOverviewView; + } }; - showOverviewAction.setImageDescriptor(BPELUIPlugin.INSTANCE.getImageDescriptor(IBPELUIConstants.ICON_OVERVIEW_16)); - tbm.add(showOverviewAction); + this.showOverviewAction.setImageDescriptor(BPELUIPlugin.INSTANCE.getImageDescriptor(IBPELUIConstants.ICON_OVERVIEW_16)); + tbm.add(this.showOverviewAction); showPage(ID_OUTLINE); } @Override public Control getControl() { - return pageBook; + return this.pageBook; } @Override public void createControl(Composite parent) { - pageBook = new PageBook(parent, SWT.NONE); - outline = getViewer().createControl(pageBook); - overview = new Canvas(pageBook, SWT.NONE); - pageBook.showPage(outline); + this.pageBook = new PageBook(parent, SWT.NONE); + this.outline = getViewer().createControl(this.pageBook); + this.overview = new Canvas(this.pageBook, SWT.NONE); + this.pageBook.showPage(this.outline); configureOutlineViewer(); // TODO: Add to the adapting selection provider //getSelectionSynchronizer().addViewer(getViewer()); @@ -203,29 +213,29 @@ } private void initializeOverview() { - LightweightSystem lws = new LightweightSystem(overview); - RootEditPart rep = fDesignViewer.getGraphicalViewer().getRootEditPart(); + LightweightSystem lws = new LightweightSystem(this.overview); + RootEditPart rep = BPELMultipageEditorPart.this.fDesignViewer.getGraphicalViewer().getRootEditPart(); if (rep instanceof GraphicalBPELRootEditPart) { GraphicalBPELRootEditPart root = (GraphicalBPELRootEditPart)rep; - thumbnail = new ScrollableThumbnail((Viewport)root.getFigure()); - thumbnail.setSource(root.getLayer(LayerConstants.PRINTABLE_LAYERS)); - lws.setContents(thumbnail); + this.thumbnail = new ScrollableThumbnail((Viewport)root.getFigure()); + this.thumbnail.setSource(root.getLayer(LayerConstants.PRINTABLE_LAYERS)); + lws.setContents(this.thumbnail); } } private void showPage(int id) { if (id == ID_OUTLINE) { - showOutlineAction.setChecked(true); - showOverviewAction.setChecked(false); - pageBook.showPage(outline); - if (thumbnail != null) - thumbnail.setVisible(false); + this.showOutlineAction.setChecked(true); + this.showOverviewAction.setChecked(false); + this.pageBook.showPage(this.outline); + if (this.thumbnail != null) + this.thumbnail.setVisible(false); } else if (id == ID_OVERVIEW) { initializeOverview(); - showOutlineAction.setChecked(false); - showOverviewAction.setChecked(true); - pageBook.showPage(overview); - thumbnail.setVisible(true); + this.showOutlineAction.setChecked(false); + this.showOverviewAction.setChecked(true); + this.pageBook.showPage(this.overview); + this.thumbnail.setVisible(true); } } @@ -233,12 +243,12 @@ public void dispose() { super.dispose(); } - + @Override public void init(IPageSite pageSite) { super.init(pageSite); - //should ActionRegistry be here too? - ActionRegistry registry = fDesignViewer.getActionRegistry(); + //should ActionRegistry be here too? + ActionRegistry registry = BPELMultipageEditorPart.this.fDesignViewer.getActionRegistry(); IActionBars bars = pageSite.getActionBars(); String id = ActionFactory.UNDO.getId(); bars.setGlobalActionHandler(id, registry.getAction(id)); @@ -261,37 +271,37 @@ for (Iterator<Object> i = ((IStructuredSelection) selection).iterator(); i.hasNext();) { Object domNode = i.next(); if (domNode instanceof Element) { - Object facade = BPELEditorUtil.getInstance().findModelObjectForElement(process, (Element)domNode); + Object facade = BPELEditorUtil.getInstance().findModelObjectForElement(BPELMultipageEditorPart.this.process, (Element)domNode); if (facade != null) { selections.add(facade); } } } - + if (!selections.isEmpty()) { StructuredSelection bpelSelection = new StructuredSelection(selections); - fDesignViewer.getAdaptingSelectionProvider().setSelection(bpelSelection); + BPELMultipageEditorPart.this.fDesignViewer.getAdaptingSelectionProvider().setSelection(bpelSelection); } } } } } - + protected class DesignViewerSelectionListener implements ISelectionChangedListener { public void selectionChanged(SelectionChangedEvent event) { //force selection update if only source page is not active if (getActivePage() != SOURCE_PAGE_INDEX) { try { - ISelection sel = fDesignViewer.getSelection(); + ISelection sel = BPELMultipageEditorPart.this.fDesignViewer.getSelection(); Object selectedNode = ((IStructuredSelection)sel).getFirstElement(); Element selectedNodeElement = null; - + if (selectedNode instanceof StartNode) { selectedNodeElement = ((StartNode)selectedNode).getProcess().getElement(); } else if (selectedNode instanceof ExtensibleElement) { selectedNodeElement = ((ExtensibleElement)selectedNode).getElement(); - } - + } + if (selectedNodeElement != null) { if (selectedNodeElement instanceof IDOMNode && ((IDOMNode)selectedNodeElement).getModel().isModelStateChanging()) { return; @@ -305,45 +315,45 @@ } } } - + private Process process; - + private DefaultEditDomain editDomain; - + protected ModelListenerAdapter modelListenerAdapter; - + private Resource extensionsResource; - + private ExtensionMap extensionMap; - + protected StructuredTextEditor fTextEditor = null; protected BPELEditor fDesignViewer = null; protected int currentPage = -1; - + protected TextEditorSelectionListener textEditorSelectionListener; protected DesignViewerSelectionListener designViewerSelectionListener; - + // reacts to changes on the BPEL file (e.g. move, rename) private IFileChangeListener fileChangeListener; - + // refactoring listeners protected IResourceChangeListener postBuildRefactoringListener; BPELModelReconcileAdapter bpelModelReconcileAdapter; - + private OutlinePage outlinePage; protected BPELTabbedPropertySheetPage currentPropertySheetPage; - + protected ActionRegistry actionRegistry; - + private static int DESIGN_PAGE_INDEX = 0; private static int SOURCE_PAGE_INDEX = 1; - private Map<Long, EObject>fMarkers2EObject = new HashMap<Long, EObject>(); - private Notification fMarkersStale = new NotificationImpl( + private final Map<Long, EObject>fMarkers2EObject = new HashMap<Long, EObject>(); + private final Notification fMarkersStale = new NotificationImpl( AdapterNotification.NOTIFICATION_MARKERS_STALE, null, null); - + public BPELMultipageEditorPart() { super(); setEditDomain(new BPELEditDomain(this)); @@ -360,22 +370,22 @@ /* * Connect selection from the Design page to the selection provider of * the Source page so that selection in the Design page will drive - * selection in the Source page. + * selection in the Source page. */ - designViewerSelectionListener = new DesignViewerSelectionListener(); - fDesignViewer.getAdaptingSelectionProvider().addSelectionChangedListener(designViewerSelectionListener); - + this.designViewerSelectionListener = new DesignViewerSelectionListener(); + this.fDesignViewer.getAdaptingSelectionProvider().addSelectionChangedListener(this.designViewerSelectionListener); + /* * Connect selection from the Source page to the selection provider of * the Design page so that selection in the Source page will drive - * selection in the Design page. + * selection in the Design page. */ - textEditorSelectionListener = new TextEditorSelectionListener(); + this.textEditorSelectionListener = new TextEditorSelectionListener(); ISelectionProvider provider = getTextEditor().getSelectionProvider(); if (provider instanceof IPostSelectionProvider) { - ((IPostSelectionProvider) provider).addPostSelectionChangedListener(textEditorSelectionListener); + ((IPostSelectionProvider) provider).addPostSelectionChangedListener(this.textEditorSelectionListener); } else { - provider.addSelectionChangedListener(textEditorSelectionListener); + provider.addSelectionChangedListener(this.textEditorSelectionListener); } } @@ -384,32 +394,40 @@ * Creates the design page of the multi-page editor. */ protected void createDesignPage() { - fDesignViewer = new BPELEditor(getEditDomain(), this); + this.fDesignViewer = new BPELEditor(getEditDomain(), this); + // Bug #209341 - starting patch + if( getFileInput() == null ) { + MessageDialog.openError( + getSite().getShell(), + "Error while opening the file", + "The file could be opened, no input could be retrieved." ); + return; + } + // End of patch loadModel(); - try - { - addPage(0, fDesignViewer, getEditorInput()); + { + addPage(0, this.fDesignViewer, getEditorInput()); //FIXME I18N setPageText(0, "Design"); - } catch (PartInitException e) { - ErrorDialog.openError(getSite().getShell(), "Error creating Design page", null, e.getStatus()); //$NON-NLS-1$ - } + } catch (PartInitException e) { + ErrorDialog.openError(getSite().getShell(), "Error creating Design page", null, e.getStatus()); //$NON-NLS-1$ + } } /** * Creates the source page of the multi-page editor. */ protected void createSourcePage() throws PartInitException { - fTextEditor = new StructuredTextEditor(); + this.fTextEditor = new StructuredTextEditor(); try - { - addPage(0, fTextEditor, getEditorInput()); - //FIXME I18N - setPageText(0, "Source"); - } catch (PartInitException e) { - ErrorDialog.openError(getSite().getShell(), "Error creating Source page", null, e.getStatus()); //$NON-NLS-1$ - } + { + addPage(0, this.fTextEditor, getEditorInput()); + //FIXME I18N + setPageText(0, "Source"); + } catch (PartInitException e) { + ErrorDialog.openError(getSite().getShell(), "Error creating Source page", null, e.getStatus()); //$NON-NLS-1$ + } } /** @@ -421,21 +439,21 @@ // source page must be created before design page createSourcePage(); createDesignPage(); - firePropertyChange(PROP_TITLE); + firePropertyChange(PROP_TITLE); connectDesignPage(); initializeFileChangeListener(); - initializeRefactoringListener(); + initializeRefactoringListener(); } catch (PartInitException e) { //Logger.logException(e); throw new RuntimeException(e); - } - + } + if (BPELUIPlugin.INSTANCE.getDefaultPage().equals(IBPELUIConstants.SOURCE_PAGE)) { setActivePage(SOURCE_PAGE_INDEX); } else { setActivePage(DESIGN_PAGE_INDEX); } - + //updateTitle(); } @@ -445,28 +463,30 @@ /*if (outlinePage != null && outlinePage.getViewer() != null) { outlinePage.getViewer().setContents(null); }*/ - if (currentPage == SOURCE_PAGE_INDEX) { + if (this.currentPage == SOURCE_PAGE_INDEX) { BPELUIPlugin.INSTANCE.setDefaultPage(IBPELUIConstants.SOURCE_PAGE); } else { BPELUIPlugin.INSTANCE.setDefaultPage(IBPELUIConstants.DESIGN_PAGE); } - outlinePage = null; - process = null; - - if (fileChangeListener != null) { - BPELUIPlugin.INSTANCE.getResourceChangeListener().removeListener(fileChangeListener); + this.outlinePage = null; + this.process = null; + + if (this.fileChangeListener != null) { + BPELUIPlugin.INSTANCE.getResourceChangeListener().removeListener(this.fileChangeListener); } - if (postBuildRefactoringListener != null) { + if (this.postBuildRefactoringListener != null) { IWorkspace workspace = ResourcesPlugin.getWorkspace(); - workspace.removeResourceChangeListener(postBuildRefactoringListener); + workspace.removeResourceChangeListener(this.postBuildRefactoringListener); } - IStructuredModel model = fTextEditor.getModel(); - model.releaseFromEdit(); - fDesignViewer.dispose(); - fTextEditor.dispose(); + IStructuredModel model = this.fTextEditor.getModel(); + if (model != null) { + model.releaseFromEdit(); + this.fDesignViewer.dispose(); + this.fTextEditor.dispose(); + } super.dispose(); } @@ -538,14 +558,14 @@ public void doSave(IProgressMonitor progressMonitor) { // We use fTextEditor to save, because fDesignViewer.doSave() removes comments on save // Save bpel only - fDesignViewer.getCommandFramework().applyCurrentChange(); - fTextEditor.doSave(progressMonitor); + this.fDesignViewer.getCommandFramework().applyCurrentChange(); + this.fTextEditor.doSave(progressMonitor); // Reset sync stamp and modified flag after save - fDesignViewer.getEditModelClient().getPrimaryResourceInfo().resetSynchronizeStamp(); - fDesignViewer.getEditModelClient().getPrimaryResourceInfo().getResource().setModified(false); + this.fDesignViewer.getEditModelClient().getPrimaryResourceInfo().resetSynchronizeStamp(); + this.fDesignViewer.getEditModelClient().getPrimaryResourceInfo().getResource().setModified(false); // Save extensions - fDesignViewer.doSave(progressMonitor); - getCommandStack().markSaveLocation(); + this.fDesignViewer.doSave(progressMonitor); + getCommandStack().markSaveLocation(); } /* @@ -557,49 +577,49 @@ public void doSaveAs() { //saveAs is not allowed; do nothing } - + protected BPELTabbedPropertySheetPage createBPELTabbedPropertySheetPage() { //FIXME should the BPELTabbedPropertySheetPage has BPELMultiPageEditorPart as the 2nd argument? return new BPELTabbedPropertySheetPage(new ITabbedPropertySheetPageContributor() { - public String getContributorId() { - // same as the palette one - //return fDesignViewer.getPaletteAdditionsContributorId(); - return IBPELUIConstants.BPEL_EDITOR_ID; - } - }, fDesignViewer); + public String getContributorId() { + // same as the palette one + //return fDesignViewer.getPaletteAdditionsContributorId(); + return IBPELUIConstants.BPEL_EDITOR_ID; + } + }, this.fDesignViewer); } - + protected ActionRegistry getActionRegistry() { - if (actionRegistry == null) - actionRegistry = new ActionRegistry(); - return actionRegistry; + if (this.actionRegistry == null) + this.actionRegistry = new ActionRegistry(); + return this.actionRegistry; } - + @Override public Object getAdapter(Class type) { if (type == Process.class) { - return process; + return this.process; } - + if (type == BPELEditModelClient.class) { - return process; + return this.process; } //FIXME should we kill it? if (type == ModelListenerAdapter.class) { - return modelListenerAdapter; + return this.modelListenerAdapter; } //FIXME should we kill it? if (type == Resource.class) { - return extensionsResource; + return this.extensionsResource; } //FIXME should we kill it? if (type == ExtensionMap.class) { - return extensionMap; + return this.extensionMap; } //FIXME should we kill it? @@ -608,25 +628,25 @@ } if (type == IContentOutlinePage.class) { - if (outlinePage == null) { - outlinePage = new OutlinePage(new TreeViewer()); + if (this.outlinePage == null) { + this.outlinePage = new OutlinePage(new TreeViewer()); } - return outlinePage; + return this.outlinePage; } if (type == IPropertySheetPage.class) { // We can't cache this object because the properties framework needs a new instance - // every time it calls this method. - currentPropertySheetPage = createBPELTabbedPropertySheetPage(); - return currentPropertySheetPage; + // every time it calls this method. + this.currentPropertySheetPage = createBPELTabbedPropertySheetPage(); + return this.currentPropertySheetPage; } if (type == ActionRegistry.class) { return getActionRegistry(); } - + return super.getAdapter(type); - } + } public CommandStack getCommandStack() { return getEditDomain().getCommandStack(); @@ -640,13 +660,13 @@ return pageIndex; } - + /** * Returns the design viewer * @return the design viewer */ protected BPELEditor getDesignEditor() { - return fDesignViewer; + return this.fDesignViewer; } /** @@ -654,15 +674,70 @@ * @return the edit domain */ protected DefaultEditDomain getEditDomain() { - return editDomain; + return this.editDomain; } + // Bug #209341 - patch + // By Vincent Zurczak - EBM WebSourcing + private IFile openFile; + private static String filePrefix = new SimpleDateFormat( "yyyyMMF_" ).format( new GregorianCalendar().getTime()); + + /** + * + * @return + */ protected IFile getFileInput() { - return ((IFileEditorInput) getEditorInput()).getFile(); + + if( this.openFile == null ) { + try { + // Case where the file is in the workspace + if( getEditorInput() instanceof IFileEditorInput ) + this.openFile = ((IFileEditorInput) getEditorInput()).getFile(); + + // Outside the workspace + // Since everything relies on IFiles, we create a temporary file in the workspace + // linking to the file outside the workspace + else if( getEditorInput() instanceof FileStoreEditorInput ) { + File f = new File(((FileStoreEditorInput) getEditorInput()).getURI()); + IPath path = new Path( f.getAbsolutePath()); + + // Create a temporary project + IProgressMonitor monitor = new NullProgressMonitor(); + IProject tempProject = ResourcesPlugin.getWorkspace().getRoot().getProject( ".temp" ); + if( ! tempProject.exists()) + tempProject.create( monitor ); + + if( ! tempProject.isOpen()) + tempProject.open( monitor ); + + // Remove old temporary files + // The file prefix is designed so that natural comparison order is enough + for( IResource res : tempProject.members()) { + if( res.getName().substring( 0, 7 ).compareTo( filePrefix ) < 0 ) { + try { + res.delete( false, monitor ); + } catch( Exception e ) { + e.printStackTrace(); + } + } + } + + // Create a temporary file + this.openFile = tempProject.getFile( filePrefix + path.lastSegment()); + this.openFile.createLink( path, IResource.NONE, monitor ); + } + + } catch( CoreException e ) { + e.printStackTrace(); + } + } + + return this.openFile; } + // End of patch public Process getProcess() { - return process; + return this.process; } /** @@ -670,42 +745,42 @@ * @return the design viewer */ protected StructuredTextEditor getSourceViewer() { - return fTextEditor; + return this.fTextEditor; } StructuredTextEditor getTextEditor() { - return fTextEditor; + return this.fTextEditor; } - + public void gotoMarker(IMarker marker) { - + // One such mechanism is to use the href of the model object // generated by the validator or whatever ... - + String href = null; try { href = (String) marker.getAttribute( "address.model" ); } catch (CoreException ex) { BPELUIPlugin.log(ex); - } - + } + // lookup by object href in the model. EObject modelObject = null; - + if (href != null) { try { - modelObject = fDesignViewer.getResource().getEObject( href ); + modelObject = this.fDesignViewer.getResource().getEObject( href ); } catch (Throwable t) { BPELUIPlugin.log(t); } } - - gotoText(marker); - + + gotoText(marker); + if (modelObject == null) { return; } - + gotoMarker ( marker, modelObject ); } @@ -721,17 +796,17 @@ charStart = charStart == null ? 0 : charStart; charEnd = charEnd == null ? charStart : charEnd; try { - fTextEditor.setHighlightRange(charStart, charEnd - charStart, true); + this.fTextEditor.setHighlightRange(charStart, charEnd - charStart, true); } catch (Throwable t) { BPELUIPlugin.log(t); } } - + void gotoMarker ( IMarker marker, EObject modelObject ) { - + // TODO: is this bogus now that we have AdaptingSelectionProvider? - - + + // The closest parent which has an edit part in the graph view. // // The following do not have viewers in the graph view: @@ -739,60 +814,60 @@ // If it's any of those, then we have to reveal the closest container // and then select the model object and show the properties. - GraphicalViewer graphViewer = fDesignViewer.getGraphicalViewer(); + GraphicalViewer graphViewer = this.fDesignViewer.getGraphicalViewer(); EObject refObj = null; - + EditPart editPart = null; if ( modelObject instanceof Variable || - modelObject instanceof PartnerLink || - modelObject instanceof CorrelationSet || - modelObject instanceof MessageExchange) { - + modelObject instanceof PartnerLink || + modelObject instanceof CorrelationSet || + modelObject instanceof MessageExchange) { + refObj = ModelHelper.getContainingScope(modelObject); editPart = (EditPart)graphViewer.getEditPartRegistry().get(refObj); if (editPart != null) { graphViewer.reveal(editPart); - } - fDesignViewer.selectModelObject(modelObject); - + } + this.fDesignViewer.selectModelObject(modelObject); + } else if (modelObject instanceof Activity) { - + // activity objects are on the graphical viewer refObj = modelObject; editPart = (EditPart)graphViewer.getEditPartRegistry().get(refObj); - + if (editPart != null) { graphViewer.reveal(editPart); } - - fDesignViewer.selectModelObject(modelObject); - - + + this.fDesignViewer.selectModelObject(modelObject); + + } else { - + refObj = modelObject; while (refObj != null && !(refObj instanceof Activity) ) { refObj = refObj.eContainer(); } - + // select process by default. if (refObj == null) { - refObj = ModelHelper.getProcess( modelObject ) ; + refObj = BPELUtils.getProcess( modelObject ) ; } - + modelObject = refObj; - + editPart = (EditPart)graphViewer.getEditPartRegistry().get(modelObject); - + if (editPart != null) { graphViewer.reveal(editPart); } - - fDesignViewer.selectModelObject(modelObject); + + this.fDesignViewer.selectModelObject(modelObject); } - + // If possible, try to display the marker in a property section. - BPELTabbedPropertySheetPage propertySheetPage = currentPropertySheetPage; + BPELTabbedPropertySheetPage propertySheetPage = this.currentPropertySheetPage; if (propertySheetPage == null) { return; // if currentPropertySheetPage is null it means that the properties @@ -802,9 +877,9 @@ // TODO: this doesn't work //propertySheetPage = createBPELTabbedPropertySheetPage(); } - + TabbedPropertyViewer viewer = propertySheetPage.getTabbedPropertyViewer(); - + int j = 0; while (true) { // while we don't get an exception... TabDescriptor descriptor = null; @@ -813,19 +888,19 @@ } catch (IndexOutOfBoundsException iobe) { break; } - + if (descriptor == null) { break; // no more descriptors } - + TabContents tab = descriptor.createTab(); ISection[] sections = tab.getSections(); for (int i = 0; i < sections.length; i++) { - + if (BPELPropertySection.class.isInstance( sections[i]) == false) { continue; } - + BPELPropertySection section = (BPELPropertySection)sections[i]; // HACK: we have to fake the initialization of this section in order to @@ -834,22 +909,22 @@ section.setInput(this, new StructuredSelection(modelObject)); if (section.isValidMarker (marker) ) { - + // the first section that handles this kind of marker wins showPropertiesView(); // get real viewer, Tab and ISection objects since we are probably using fake ones - viewer = currentPropertySheetPage.getTabbedPropertyViewer(); + viewer = this.currentPropertySheetPage.getTabbedPropertyViewer(); viewer.setSelection(new StructuredSelection(descriptor)); - tab = currentPropertySheetPage.getCurrentTab(); + tab = this.currentPropertySheetPage.getCurrentTab(); section = (BPELPropertySection)tab.getSectionAtIndex(i); section.gotoMarker(marker); return; // ignore other sections and tabs - + } - } + } } } - + /* * (non-Javadoc) * @@ -860,15 +935,15 @@ public void init(IEditorSite site, IEditorInput input) throws PartInitException { try { super.init(site, input); -// getCommandStack().addCommandStackListener(this); + // getCommandStack().addCommandStackListener(this); } catch (Exception e) { e.printStackTrace(); } setPartName(input.getName()); } - + protected void initializeFileChangeListener() { - fileChangeListener = new IFileChangeListener() { + this.fileChangeListener = new IFileChangeListener() { public void deleted(IFile file) { IFile current = ((IFileEditorInput)getEditorInput()).getFile(); if (current.equals(file)) { @@ -919,16 +994,16 @@ // } } }; - BPELUIPlugin.INSTANCE.getResourceChangeListener().addListener(fileChangeListener); + BPELUIPlugin.INSTANCE.getResourceChangeListener().addListener(this.fileChangeListener); } - + /** * Installs the refactoring listener */ protected void initializeRefactoringListener() { final IWorkspace workspace = ResourcesPlugin.getWorkspace(); - postBuildRefactoringListener = new IResourceChangeListener() { + this.postBuildRefactoringListener = new IResourceChangeListener() { public void resourceChanged(IResourceChangeEvent event) { IFile newFile = ((FileEditorInput)getEditorInput()).getFile(); final IResourceDelta bpelFileDelta = event.getDelta().findMember(newFile.getFullPath()); @@ -942,7 +1017,7 @@ } } }; - workspace.addResourceChangeListener(postBuildRefactoringListener, IResourceChangeEvent.POST_BUILD); + workspace.addResourceChangeListener(this.postBuildRefactoringListener, IResourceChangeEvent.POST_BUILD); } /* @@ -957,9 +1032,9 @@ protected void loadModel() { Document structuredDocument = null; - + try { - IDocument doc = fTextEditor.getDocumentProvider().getDocument(getEditorInput()); + IDocument doc = this.fTextEditor.getDocumentProvider().getDocument(getEditorInput()); if (doc instanceof IStructuredDocument) { IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(doc); if (model == null) { @@ -971,35 +1046,39 @@ } } catch (Exception e) { e.printStackTrace(); - } - - HashMap<String, Document> loadOptions = null; + } + + HashMap<String, Document> loadOptions = null; if (structuredDocument != null) { loadOptions = new HashMap<String, Document> (1); loadOptions.put("DOMDocument", structuredDocument); } - - //FIXME WSDLEditor has gef command stack; in order to have gef command stack we need to add design page first - BPELEditModelClient editModelClient = new BPELEditModelClient(this, ((IFileEditorInput) getEditorInput()).getFile(), this, loadOptions); - fDesignViewer.setEditModelClient(editModelClient); + + //FIXME WSDLEditor has gef command stack; in order to have gef command stack we need to add design page first + + // Bug # 209341 - starting patch + // By Vincent Zurczak + IFile fileToOpen = getFileInput(); + BPELEditModelClient editModelClient = new BPELEditModelClient(this, fileToOpen, this, loadOptions); + this.fDesignViewer.setEditModelClient(editModelClient); getEditDomain().setCommandStack(editModelClient.getCommandStack()); Resource bpelResource = editModelClient.getPrimaryResourceInfo().getResource(); - IFile file = getFileInput(); BPELReader reader = new BPELReader(); - reader.read(bpelResource, file, fDesignViewer.getResourceSet()); - process = reader.getProcess(); - - bpelModelReconcileAdapter = new BPELModelReconcileAdapter (structuredDocument, process, bpelResource, fDesignViewer); - - if (getEditDomain() != null) { - ((BPELEditDomain)getEditDomain()).setProcess(getProcess()); - } - extensionsResource = reader.getExtensionsResource(); - extensionMap = reader.getExtensionMap(); + reader.read(bpelResource, fileToOpen, this.fDesignViewer.getResourceSet()); + // End of patch - modelListenerAdapter = new ModelListenerAdapter(); - modelListenerAdapter.setExtensionMap(extensionMap); + this.process = reader.getProcess(); + this.bpelModelReconcileAdapter = new BPELModelReconcileAdapter (structuredDocument, this.process, bpelResource, this.fDesignViewer); + + if (getEditDomain() != null) { + ((BPELEditDomain)getEditDomain()).setProcess(getProcess()); + } + this.extensionsResource = reader.getExtensionsResource(); + this.extensionMap = reader.getExtensionMap(); + + this.modelListenerAdapter = new ModelListenerAdapter(); + this.modelListenerAdapter.setExtensionMap(this.extensionMap); } public void modelDeleted(ResourceInfo resourceInfo) { @@ -1007,42 +1086,42 @@ getSite().getPage().closeEditor(this, false); } } - + public void modelDirtyStateChanged(ResourceInfo resourceInfo) { firePropertyChange(PROP_DIRTY); } - + public void modelLocationChanged(ResourceInfo resourceInfo, IFile movedToFile) { // TODO! //updateInputFile(movedToFile.getFullPath()); } public void modelReloaded(ResourceInfo resourceInfo) { - Resource bpelResource = fDesignViewer.getEditModelClient().getPrimaryResourceInfo().getResource(); + Resource bpelResource = this.fDesignViewer.getEditModelClient().getPrimaryResourceInfo().getResource(); IFile file = getFileInput(); BPELReader reader = new BPELReader(); - reader.read(bpelResource, file, fDesignViewer.getResourceSet()); - - process = reader.getProcess(); - if (getEditDomain() != null) { - ((BPELEditDomain)getEditDomain()).setProcess(getProcess()); - } - extensionMap = reader.getExtensionMap(); - - modelListenerAdapter.setExtensionMap(fDesignViewer.getExtensionMap()); - - fDesignViewer.getGraphicalViewer().setContents(getProcess()); + reader.read(bpelResource, file, this.fDesignViewer.getResourceSet()); + this.process = reader.getProcess(); + if (getEditDomain() != null) { + ((BPELEditDomain)getEditDomain()).setProcess(getProcess()); + } + this.extensionMap = reader.getExtensionMap(); + + this.modelListenerAdapter.setExtensionMap(this.fDesignViewer.getExtensionMap()); + + this.fDesignViewer.getGraphicalViewer().setContents(getProcess()); + // The ProcessTrayEditPart tries to remove its selection listener on deactivate. // In this case, it will fail because the edit part can't find the editor because // the process no longer belongs to a resource. Help it out and remove the // listener manually. - ProcessTrayEditPart processTrayEditPart = (ProcessTrayEditPart)fDesignViewer.getTrayViewer().getContents(); - fDesignViewer.getGraphicalViewer().removeSelectionChangedListener(processTrayEditPart.getSelectionChangedListener()); - - fDesignViewer.getTrayViewer().setContents(getProcess()); - + ProcessTrayEditPart processTrayEditPart = (ProcessTrayEditPart)this.fDesignViewer.getTrayViewer().getContents(); + this.fDesignViewer.getGraphicalViewer().removeSelectionChangedListener(processTrayEditPart.getSelectionChangedListener()); + + this.fDesignViewer.getTrayViewer().setContents(getProcess()); + //Bugzilla 294501 - When markers are added on the BPEL file, the meta-model //objects are notified about the marker change. But the display of the markers //on the diagram fails because of several invalid thread access exceptions. @@ -1055,28 +1134,28 @@ }); } - + protected void updateMarkersHard () { - - for(EObject obj : fMarkers2EObject.values()) { - obj.eNotify(fMarkersStale); + + for(EObject obj : this.fMarkers2EObject.values()) { + obj.eNotify(this.fMarkersStale); } - - fMarkers2EObject.clear(); - + + this.fMarkers2EObject.clear(); + IMarker[] markers = null; IFile file = getFileInput(); Resource resource = getProcess().eResource(); - + try { - markers = file.findMarkers(null, true, IResource.DEPTH_ZERO); + markers = file.findMarkers(null, true, IResource.DEPTH_ZERO); } catch (CoreException ex) { BPELUIPlugin.log(ex); return; } - + for (IMarker m : markers) { - + String href = null; EObject target = null; try { @@ -1085,24 +1164,24 @@ continue; } target = resource.getEObject(href); - } catch (CoreException ex) { + } catch (CoreException ex) { continue; } - + if (target == null) { continue; } - - fMarkers2EObject.put(m.getId(), target); - target.eNotify( new NotificationImpl (AdapterNotification.NOTIFICATION_MARKER_ADDED , null, m )); + + this.fMarkers2EObject.put(m.getId(), target); + target.eNotify( new NotificationImpl (AdapterNotification.NOTIFICATION_MARKER_ADDED , null, m )); } - + } @Override protected void pageChange(int newPageIndex) { - currentPage = newPageIndex; + this.currentPage = newPageIndex; super.pageChange(newPageIndex); } @@ -1124,7 +1203,7 @@ BPELUIPlugin.log(e); } } - + /** * The editor part name should be the same as the one appearing in the logical view. */ @@ -1133,46 +1212,46 @@ } public void modelMarkersChanged ( ResourceInfo resourceInfo , IMarkerDelta [] markerDelta ) { - + Resource resource = resourceInfo.getResource(); - + for ( IMarkerDelta delta : markerDelta ) { - + String href = (String) delta.getAttribute( "address.model" ); //$NON-NLS-1$ if (href == null) { continue; } - + EObject target = null; - + switch (delta.getKind()) { case IResourceDelta.ADDED : target = resource.getEObject(href); if (target != null) { - fMarkers2EObject.put(delta.getId(),target); + this.fMarkers2EObject.put(delta.getId(),target); target.eNotify( new NotificationImpl(AdapterNotification.NOTIFICATION_MARKER_ADDED,null,delta.getMarker() )); } break; case IResourceDelta.CHANGED : - target = fMarkers2EObject.remove(delta.getId()); + target = this.fMarkers2EObject.remove(delta.getId()); if (target != null) { target.eNotify( new NotificationImpl(AdapterNotification.NOTIFICATION_MARKER_CHANGED,delta.getMarker(),null)); } break; case IResourceDelta.REMOVED : - target = fMarkers2EObject.remove(delta.getId()); + target = this.fMarkers2EObject.remove(delta.getId()); if (target != null) { target.eNotify( new NotificationImpl(AdapterNotification.NOTIFICATION_MARKER_DELETED,delta.getMarker(),null)); } - break; + break; } - + } } @Override public boolean isDirty() { - return fTextEditor.isDirty() || fDesignViewer.isDirty(); + return this.fTextEditor.isDirty(); } @Override Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -15,10 +15,10 @@ import java.util.HashMap; import java.util.List; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.editparts.ProcessEditPart; import org.eclipse.bpel.ui.util.BPELUtil; import org.eclipse.bpel.ui.util.IModelVisitor; -import org.eclipse.bpel.ui.util.ModelHelper; import org.eclipse.draw2d.FigureCanvas; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.Viewport; @@ -95,7 +95,7 @@ if (selectionList.size() > 1){ indexVisit = 0; orderMap = new HashMap<Object, Integer>(); - BPELUtil.visitModelDepthFirst(ModelHelper.getProcess(editpart.getModel()), new numeratorVisitor()); + BPELUtil.visitModelDepthFirst(BPELUtils.getProcess(editpart.getModel()), new numeratorVisitor()); Comparator cmp = new OrderedSelectionComparator(); Collections.sort(selectionList, cmp); StructuredSelection newSel = new StructuredSelection(selectionList); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -24,6 +24,7 @@ import org.eclipse.bpel.model.PartnerLink; import org.eclipse.bpel.model.Process; import org.eclipse.bpel.model.partnerlinktype.PartnerLinkType; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.BPELEditor; import org.eclipse.bpel.ui.Messages; import org.eclipse.bpel.ui.adapters.IContainer; @@ -114,7 +115,7 @@ @Override public Resource[] getResources() { if (resourcesToModify == null) { - Process process = ModelHelper.getProcess(fParent); + Process process = BPELUtils.getProcess(fParent); if (process == null) return EMPTY_RESOURCE_ARRAY; BPELEditor bpelEditor = ModelHelper.getBPELEditor(process); @@ -164,7 +165,7 @@ throw new IllegalStateException(); } - Process process = ModelHelper.getProcess(fParent); + Process process = BPELUtils.getProcess(fParent); if (process == null) return; BPELEditor bpelEditor = ModelHelper.getBPELEditor(process); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -12,6 +12,7 @@ import java.util.List; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.util.ModelHelper; import org.eclipse.emf.ecore.EObject; @@ -38,7 +39,7 @@ */ @Override protected List getList() { - return ModelHelper.getProcess( target ).getImports(); + return BPELUtils.getProcess( target ).getImports(); } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -23,6 +23,7 @@ import org.eclipse.bpel.model.Sources; import org.eclipse.bpel.model.Target; import org.eclipse.bpel.model.Targets; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.commands.util.AutoUndoCommand; import org.eclipse.bpel.ui.util.FlowLinkUtil; import org.eclipse.bpel.ui.util.ModelHelper; @@ -47,7 +48,7 @@ this.activities = new ArrayList(activityCollection.size()); this.activities.addAll(activityCollection); if (!activityCollection.isEmpty()) { - addModelRoot(ModelHelper.getProcess(activityCollection.iterator().next())); + addModelRoot(BPELUtils.getProcess(activityCollection.iterator().next())); } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -212,7 +212,7 @@ } // define the prefix - BPELUtils.setPrefix( ModelHelper.getProcess(modelObject), targetNamespace, dialog.getPrefix()); + BPELUtils.setPrefix( BPELUtils.getProcess(modelObject), targetNamespace, dialog.getPrefix()); return true; } @@ -295,7 +295,7 @@ } } - AddImportCommand cmd = new AddImportCommand(ModelHelper + AddImportCommand cmd = new AddImportCommand(BPELUtils .getProcess(modelObject), obj); if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) { Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -26,6 +26,7 @@ import org.eclipse.bpel.model.partnerlinktype.PartnerLinkType; import org.eclipse.bpel.model.partnerlinktype.PartnerlinktypeFactory; import org.eclipse.bpel.model.partnerlinktype.Role; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.Messages; import org.eclipse.bpel.ui.commands.CompoundCommand; import org.eclipse.bpel.ui.commands.InsertInContainerCommand; @@ -131,7 +132,7 @@ @Override protected void handleNewButtonPushed() { PartnerLink partner = BPELFactory.eINSTANCE.createPartnerLink(); - Process process = ModelHelper.getProcess(modelObject); + Process process = BPELUtils.getProcess(modelObject); String newName = filterText.getText(); newName = BPELUtil.generateUniqueModelName(process, newName, partner); NameDialog nameDialog = new NameDialog(getShell(), Messages.PartnerLinkSelectorDialog_5, Messages.PartnerLinkSelectorDialog_6, Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -238,7 +238,7 @@ } // define the prefix - BPELUtils.setPrefix(ModelHelper.getProcess(modelObject), targetNamespace, dialog.getPrefix()); + BPELUtils.setPrefix(BPELUtils.getProcess(modelObject), targetNamespace, dialog.getPrefix()); return true; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -16,6 +16,7 @@ import org.eclipse.bpel.model.CorrelationSet; import org.eclipse.bpel.model.Process; import org.eclipse.bpel.model.messageproperties.Property; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.BPELEditor; import org.eclipse.bpel.ui.Messages; import org.eclipse.bpel.ui.properties.PropertiesLabelProvider; @@ -80,7 +81,7 @@ * Finds all available properties from this process and the artifacts WSDL. */ protected void refreshProperties() { - Process process = ModelHelper.getProcess(correlationSet); + Process process = BPELUtils.getProcess(correlationSet); Set properties = ModelHelper.getAvailableProperties(process); // remove properties from the current correlation set @@ -103,7 +104,7 @@ @Override protected void handleNewButtonPushed() { - Process process = ModelHelper.getProcess(correlationSet); + Process process = BPELUtils.getProcess(correlationSet); BPELEditor bpelEditor = ModelHelper.getBPELEditor(process); String newName = filterText.getText(); EditMessagePropertyDialog dialog = new EditMessagePropertyDialog(getShell(), null, newName, bpelEditor, wf); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -284,7 +284,7 @@ } // define the prefix - BPELUtils.setPrefix( ModelHelper.getProcess(modelObject), targetNamespace, dialog.getPrefix()); + BPELUtils.setPrefix( BPELUtils.getProcess(modelObject), targetNamespace, dialog.getPrefix()); return true; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -19,6 +19,7 @@ import org.eclipse.bpel.model.BPELFactory; import org.eclipse.bpel.model.Process; import org.eclipse.bpel.model.Variable; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.Messages; import org.eclipse.bpel.ui.commands.CompoundCommand; import org.eclipse.bpel.ui.commands.InsertInContainerCommand; @@ -151,7 +152,7 @@ @Override protected void handleNewButtonPushed() { Variable variable = BPELFactory.eINSTANCE.createVariable(); - Process process = ModelHelper.getProcess(modelObject); + Process process = BPELUtils.getProcess(modelObject); String newName = filterText.getText(); newName = BPELUtil.generateUniqueModelName(process, newName, variable); NameDialog nameDialog = new NameDialog(getShell(), Messages.VariableSelectorDialog_New_Variable_4, Messages.VariableSelectorDialog_Variable_Name_5, Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -24,6 +24,7 @@ import org.eclipse.bpel.model.Source; import org.eclipse.bpel.model.Target; import org.eclipse.bpel.model.Variable; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.BPELLinkCreationFactory; import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; @@ -93,7 +94,7 @@ Target target = BPELFactory.eINSTANCE.createTarget(); link.getSources().add(source); link.getTargets().add(target); - Process process = ModelHelper.getProcess(activity); + Process process = BPELUtils.getProcess(activity); AddLinkCommand command = new AddLinkCommand(createSetNameCommand(link, process), process); command.setLink(link); command.setSource(activity); @@ -218,7 +219,7 @@ protected Command getReconnectTargetCommand(ReconnectRequest request) { Activity activity = getActivity(); Link link = (Link)request.getConnectionEditPart().getModel(); - Process process = ModelHelper.getProcess(activity); + Process process = BPELUtils.getProcess(activity); AddLinkCommand cmd = new AddLinkCommand(createSetNameCommand(link, process), process); cmd.setLink(link); @@ -235,7 +236,7 @@ protected Command getReconnectSourceCommand(ReconnectRequest request) { Activity activity = getActivity(); Link link = (Link)request.getConnectionEditPart().getModel(); - Process process = ModelHelper.getProcess(activity); + Process process = BPELUtils.getProcess(activity); AddLinkCommand cmd = new AddLinkCommand(createSetNameCommand(link, process), process); cmd.setLink(link); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -47,6 +47,7 @@ import org.eclipse.bpel.model.While; import org.eclipse.bpel.model.partnerlinktype.Role; import org.eclipse.bpel.model.util.BPELConstants; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.IBPELUIConstants; import org.eclipse.bpel.ui.IHelpContextIds; import org.eclipse.bpel.ui.Messages; @@ -835,7 +836,7 @@ faultNameQNames = new Vector<QName>(); if (getInput() == null) throw new IllegalStateException(); - Process p = ModelHelper.getProcess(getInput()); + Process p = BPELUtils.getProcess(getInput()); // get FaultNames from activities getFaultNames(p.getActivity()); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -17,6 +17,7 @@ import org.eclipse.bpel.common.ui.flatui.FlatFormData; import org.eclipse.bpel.model.Import; import org.eclipse.bpel.model.Process; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.IBPELUIConstants; import org.eclipse.bpel.ui.IHelpContextIds; import org.eclipse.bpel.ui.Messages; @@ -26,7 +27,6 @@ import org.eclipse.bpel.ui.details.providers.ImportContentProvider; import org.eclipse.bpel.ui.dialogs.SchemaImportDialog; import org.eclipse.bpel.ui.util.BPELUtil; -import org.eclipse.bpel.ui.util.ModelHelper; import org.eclipse.bpel.ui.util.MultiObjectAdapter; import org.eclipse.bpel.ui.util.NamespaceUtils; import org.eclipse.bpel.ui.util.TableCursor; @@ -79,9 +79,9 @@ } /** - * Override the super-class because the input is Process not Import + * Bug 290085 - Override the super-class because the input is Process not Import * If use super-class's directly, when change the import attributes - * the properties section do not change. + * the properties section do not change. Grid Qian */ @Override protected void addAllAdapters() { @@ -179,8 +179,8 @@ importLabel.setLayoutData(data); // create table - importTable = fWidgetFactory.createTable(parent, SWT.FULL_SELECTION - | SWT.V_SCROLL | SWT.READ_ONLY); + importTable = fWidgetFactory.createTable(parent, SWT.FULL_SELECTION | SWT.V_SCROLL + | SWT.READ_ONLY); data = new FlatFormData(); data.left = new FlatFormAttachment(0, IDetailsAreaConstants.HSPACE); @@ -194,7 +194,7 @@ // set up table importTable.setLinesVisible(true); importTable.setHeaderVisible(true); - + tableProvider = new ColumnTableProvider(); tableProvider.add(new LocationColumn()); tableProvider.add(new NamespaceColumn()); @@ -230,7 +230,7 @@ @Override public String getProperty() { return "Namespace"; //$NON-NLS-1$ - } + } @Override public int getInitialWeight() { @@ -288,15 +288,18 @@ return (s == null) ? "" : s; //$NON-NLS-1$ } } + + @Override - protected void basicSetInput(EObject newInput) { + protected void basicSetInput(EObject newInput) { super.basicSetInput(newInput); - + if (getInput() != null) { importViewer.setInput(getInput()); } } + @Override protected void createClient(Composite parent) { @@ -321,29 +324,30 @@ } } - void removeImport() { - + void removeImport () { + ISelection selection = importViewer.getSelection(); if (selection.isEmpty()) { - return; + return ; } IStructuredSelection ssel = null; - if ((selection instanceof IStructuredSelection) == false) { + if ( (selection instanceof IStructuredSelection) == false) { return; } - - ssel = (IStructuredSelection) selection; + + ssel = (IStructuredSelection) selection; Object obj = ssel.getFirstElement(); - - RemoveImportCommand cmd = new RemoveImportCommand(ModelHelper - .getProcess(getInput()), obj, + + RemoveImportCommand cmd = new RemoveImportCommand ( + BPELUtils.getProcess( getInput() ), + obj, IBPELUIConstants.CMD_REMOVE_IMPORT); - + if (cmd.canDoExecute()) { - getCommandFramework().execute(cmd); + getCommandFramework().execute( cmd ); } } - + void browseAndImportWSDL() { SchemaImportDialog dialog = new SchemaImportDialog(importLabel @@ -357,7 +361,7 @@ return; } - AddImportCommand cmd = new AddImportCommand(ModelHelper + AddImportCommand cmd = new AddImportCommand(BPELUtils .getProcess(getInput()), result[0]); if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) { getCommandFramework().execute(cmd); @@ -377,26 +381,31 @@ return; } - AddImportCommand cmd = new AddImportCommand(ModelHelper + AddImportCommand cmd = new AddImportCommand(BPELUtils .getProcess(getInput()), result[0]); if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) { getCommandFramework().execute(cmd); } } + + @Override public void gotoMarker(IMarker marker) { // TODO Auto-generated method stub super.gotoMarker(marker); } - + /** * */ + @Override public boolean isValidMarker(IMarker marker) { return super.isValidMarker(marker); } + + } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -30,6 +30,7 @@ import org.eclipse.bpel.model.Variables; import org.eclipse.bpel.model.partnerlinktype.PartnerLinkType; import org.eclipse.bpel.model.partnerlinktype.Role; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IHelpContextIds; import org.eclipse.bpel.ui.Messages; @@ -311,7 +312,7 @@ return Messages.InvokeImplSection_0; } public void run() { - createPartnerLink ( ModelHelper.getProcess( getInput () ) , null ); + createPartnerLink ( BPELUtils.getProcess( getInput () ) , null ); } }; Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -30,6 +30,7 @@ import org.eclipse.bpel.model.ToPart; import org.eclipse.bpel.model.ToParts; import org.eclipse.bpel.model.Variable; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.IBPELUIConstants; import org.eclipse.bpel.ui.Messages; import org.eclipse.bpel.ui.commands.AddFromPartCommand; @@ -281,7 +282,7 @@ } public void run() { - createVariable(ModelHelper.getProcess(getInput()), null, + createVariable(BPELUtils.getProcess(getInput()), null, isInvoke() ? ModelHelper.OUTGOING : ModelHelper.INCOMING); } @@ -445,7 +446,7 @@ } public void run() { - createVariable(ModelHelper.getProcess(getInput()), null, + createVariable(BPELUtils.getProcess(getInput()), null, isInvoke() ? ModelHelper.INCOMING : ModelHelper.OUTGOING); } @@ -671,7 +672,7 @@ } public void run() { - createVariableForPartMapping(ModelHelper.getProcess(model), + createVariableForPartMapping(BPELUtils.getProcess(model), model, part, isFromParts); } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -19,6 +19,7 @@ import org.eclipse.bpel.common.ui.flatui.FlatFormData; import org.eclipse.bpel.model.BPELFactory; import org.eclipse.bpel.model.MessageExchange; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; import org.eclipse.bpel.ui.IHelpContextIds; @@ -133,7 +134,7 @@ return Messages.MessageExchangeImplSection_Create_Global; } public void run() { - createMessageExchange ( ModelHelper.getProcess( getInput () ) , null ); + createMessageExchange ( BPELUtils.getProcess( getInput () ) , null ); } }; Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java 2009-12-02 07:41:35 UTC (rev 18966) @@ -69,6 +69,7 @@ import org.eclipse.bpel.model.partnerlinktype.PartnerlinktypeFactory; import org.eclipse.bpel.model.partnerlinktype.PartnerlinktypePackage; import org.eclipse.bpel.model.partnerlinktype.Role; +import org.eclipse.bpel.model.util.BPELUtils; import org.eclipse.bpel.model.util.ImportResolver; import org.eclipse.bpel.model.util.ImportResolverRegistry; import org.eclipse.bpel.ui.BPELEditor; @@ -1201,23 +1202,23 @@ return null; } - /** - * Returns the root process for any model object - **/ - public static Process getProcess(Object object) { - if (object instanceof EObject) { - // check if *this* is already the process object - if (object instanceof Process) - return (Process)object; - EObject cont = ((EObject)object).eContainer(); - while (cont != null) { - if (cont.eClass() == BPELPackage.eINSTANCE.getProcess()) - return (Process)cont; - cont = cont.eContainer(); - } - } - return null; - } +// /** +// * Returns the root process for any model object +// **/ +// public static Process getProcess(Object object) { +// if (object instanceof EObject) { +// // check if *this* is already the process object +// if (object instanceof Process) +// return (Process)object; +// EObject cont = ((EObject)object).eContainer(); +// while (cont != null) { +// if (cont.eClass() == BPELPackage.eINSTANCE.getProcess()) +// return (Process)cont; +// cont = cont.eContainer(); +// } +// } +// return null; +// } /** * Checks to see if an object is contained by a specified parent @@ -1248,8 +1249,10 @@ public static void setLocation(Activity activity, Point pos) { ActivityExtension extension = (ActivityExtension)getExtension(activity); - extension.setX(pos.x); - extension.setY(pos.y); + if (extension != null) { + extension.setX(pos.x); + extension.setY(pos.y); + } } public static Point getLocation(Activity activity) { @@ -1425,7 +1428,7 @@ * Given a model object returns whether the process is supposed to be spec-compliant. */ public static boolean isSpecCompliant(EObject model) { - return ((ProcessExtension)getExtension(getProcess(model))).isSpecCompliant(); + return ((ProcessExtension)getExtension(BPELUtils.getProcess(model))).isSpecCompliant(); } public static boolean isReferencePartnerLink(PartnerLink partner) { @@ -1518,7 +1521,7 @@ ArrayList al = new ArrayList(8); // Try the BPEL imports if any exist. - Process process = getProcess(context); + Process process = BPELUtils.getProcess(context); if (process == null) { return al; } @@ -1556,7 +1559,7 @@ ArrayList<Definition> al = new ArrayList<Definition>(8); // Try the BPEL imports if any exist. - Process process = getProcess( context ); + Process process = BPELUtils.getProcess( context ); if (process == null) { return al; } @@ -1594,7 +1597,7 @@ */ public static boolean containsImport (Object modelObject, Import imp) { - Process process = getProcess(modelObject); + Process process = BPELUtils.getProcess(modelObject); if (process == null) { return false; } Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2009-12-02 07:03:21 UTC (rev 18965) +++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2009-12-02 07:41:35 UTC (rev 18966) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: WSIL Model (Incubation) Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true -Bundle-Version: 0.4.0.qualifier +Bundle-Version: 0.5.0 Bundle-ClassPath: bin Bundle-Vendor: eclispe.org Bundle-Localization: plugin @@ -26,5 +26,5 @@ org.eclipse.bpel.wsil.model.inspection" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6