http://dev.eclipse.org/mhonarc/lists/stp-commits/maillist.html stp-commits en-us Fri, 06 Nov 2009 10:50:38 GMT Fri, 06 Nov 2009 10:50:38 GMT http://blogs.law.harvard.edu/tech/rss MHonArc RSS 2.0 RCFile webmaster@eclipse.org (Webmaster) webmaster@eclipse.org (Webmaster) http://www.eclipse.org/eclipse.org-common/themes/Phoenix/images/eclipse_home_header.jpg http://dev.eclipse.org/mhonarc/lists/stp-commits/maillist.html http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02487.html Author: sdrapeau Date: 2009-11-06 05:46:43 -0500 (Fri, 06 Nov 2009) New Revision: 3348 Removed: org.eclipse.stp.sca/tags/3.6M3/babel/sca-1.0.0.map org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.0.map org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.1.map org.ecl... Author: sdrapeau Date: 2009-11-06 05:46:43 -0500 (Fri, 06 Nov 2009) New Revision: 3348 Removed: org.eclipse.stp.sca/tags/3.6M3/babel/sca-1.0.0.map org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.0.map org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.1.map org.eclipse.stp.sca/tags/3.6M3/incubation/ org.eclipse.stp.sca/tags/3.6M3/org.eclipse.stp.sca.diagram.extension.generator.ui/ org.eclipse.stp.sca/tags/3.6M3/org.eclipse.stp.sca.diagram.extension.generator/ org.eclipse.stp.sca/tags/3.6M3/org.eclipse.stp.sca.domainmodel.extension.generator/ Log: Deleted: org.eclipse.stp.sca/tags/3.6M3/babel/sca-1.0.0.map =================================================================== --- org.eclipse.stp.sca/tags/3.6M3/babel/sca-1.0.0.map 2009-11-06 10:42:41 UTC (rev 3347) +++ org.eclipse.stp.sca/tags/3.6M3/babel/sca-1.0.0.map 2009-11-06 10:46:43 UTC (rev 3348) @@ -1,18 +0,0 @@ -#file needed for Babel. It should point to the source of each plugin. -plugin@xxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4RC4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.common -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.editor -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.examples -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.implementation.java -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.implementation.sca -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,tags/3.4,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.samples.restaurant_all Deleted: org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.0.map =================================================================== --- org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.0.map 2009-11-06 10:42:41 UTC (rev 3347) +++ org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.0.map 2009-11-06 10:46:43 UTC (rev 3348) @@ -1,47 +0,0 @@ -#file needed for Babel. It should point to the source of each plugin. -plugin@xxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.common -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.common.jdt -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.extension -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.extension.generator -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.extension.generator.ui -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.frascati -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.jdt -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.tuscany -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.extension.generator -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.frascati -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.frascati.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.frascati.editor -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.tuscany -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.tuscany.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.tuscany.editor -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.editor -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.examples -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.examples.jdt -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.formeditor -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.implementation.java -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.implementation.sca -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.interfacee.java -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.samples.restaurant_all -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.semantic.sawsdl -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.semantic.sawsdl.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.semantic.sawsdl.properties -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.ontology.view -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.ontology.view.jena2 -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.validation -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.validation.frascati -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.xmleditor Deleted: org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.1.map =================================================================== --- org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.1.map 2009-11-06 10:42:41 UTC (rev 3347) +++ org.eclipse.stp.sca/tags/3.6M3/babel/sca-2.0.1.map 2009-11-06 10:46:43 UTC (rev 3348) @@ -1,44 +0,0 @@ -#file needed for Babel. It should point to the source of each plugin. -plugin@xxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.common -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.common.java -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.extension -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.extension.generator -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.extension.generator.ui -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.frascati -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.java -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.diagram.tuscany -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.extension.generator -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.frascati -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.frascati.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.frascati.editor -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.tuscany -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.tuscany.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.domainmodel.tuscany.editor -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.editor -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.examples -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.examples.java -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.formeditor -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.samples.restaurant_all -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.semantic.sawsdl -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.semantic.sawsdl.edit -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.semantic.sawsdl.properties -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.ontology.view -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.ontology.view.jena2 -# -# -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.validation -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.validation.frascati -plugin@xxxxxxxxxxxxxxxxxxxxxxxxxxxxx=SVN,trunk,http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca,,org.eclipse.stp.sca.xmleditor ]]> Fri, 06 Nov 2009 10:46:44 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02487.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02486.html Author: sdrapeau Date: 2009-11-06 05:42:41 -0500 (Fri, 06 Nov 2009) New Revision: 3347 Added: org.eclipse.stp.sca/tags/3.6M3/ Log: Helios M3 tag Author: sdrapeau Date: 2009-11-06 05:42:41 -0500 (Fri, 06 Nov 2009) New Revision: 3347 Added: org.eclipse.stp.sca/tags/3.6M3/ Log: Helios M3 tag ]]> Fri, 06 Nov 2009 10:42:41 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02486.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02485.html Author: vzurczak Date: 2009-11-04 11:53:25 -0500 (Wed, 04 Nov 2009) New Revision: 3346 Added: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.valid... Author: vzurczak Date: 2009-11-04 11:53:25 -0500 (Wed, 04 Nov 2009) New Revision: 3346 Added: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/EValidatorAdapter.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Messages.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Startup.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/OnlyJbiBindings.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/messages.properties Removed: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Context.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/EValidatorAdapter.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Messages.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Startup.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/jbiBinding/ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/messages.properties Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/.project org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/plugin.xml org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/JbiBindingAttributesAndModeValidation.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/JbiBindingInterfaceNotNull.java Log: Added a new constraint on the JBI binding Refactored the plug-in Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/.project =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/.project 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/.project 2009-11-04 16:53:25 UTC (rev 3346) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.stp.sca.validation.frascati</name> + <name>org.eclipse.stp.sca.validation.frascati.frascati</name> <comment></comment> <projects> </projects> Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/plugin.xml =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/plugin.xml 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/plugin.xml 2009-11-04 16:53:25 UTC (rev 3346) @@ -18,73 +18,85 @@ <plugin> <extension point="org.eclipse.ui.startup"> - <startup class="org.eclipse.stp.sca.validation.Startup"/> + <startup class="org.eclipse.stp.sca.validation.frascati.Startup"/> </extension> <!-- Constraint --> <extension point="org.eclipse.emf.validation.constraintProviders"> - <category - id="org.eclipse.stp.sca.category" - mandatory="true" - name="SCA Modeler"> - <![CDATA[SCA Modeler]]> - </category> - <constraintProvider cache="true"> - <package namespaceUri="http://frascati.ow2.org"/> - <constraints categories="org.eclipse.stp.sca.category"> - <constraint - lang="Java" - class="org.eclipse.stp.sca.validation.jbiBinding.JbiBindingInterfaceNotNull" - severity="ERROR" - mode="Batch" - name="JBIInterfaceValidation" - id="org.eclipse.stp.sca.JBIInterfaceValidationID" - statusCode="1"> - <description>The interface name and namespace of a JBI binding can&apos;t be null or empty. - </description> - <message> - {0} - </message> - <target class="JBIBinding"/> - </constraint> - <constraint - class="org.eclipse.stp.sca.validation.jbiBinding.JbiBindingAttributesAndModeValidation" - id="org.eclipse.stp.sca.JBIAttrAndModeValidationID" - lang="Java" - mode="Batch" - name="JBIAttrAndModeValidation" - severity="ERROR" - statusCode="1"> - <description> - The interface name and namespace of a JBI binding can't be null or empty. - </description> - <message> - {0} - </message> - <target - class="JBIBinding"> - </target> - </constraint> - <!-- --> - <!-- --> - <!-- --> - <!-- --> - </constraints> - </constraintProvider> + <constraintProvider + cache="true" + mode="Batch"> + <package + namespaceUri="http://frascati.ow2.org/xmlns/sca/1.1";> + </package> + <constraints + categories="org.eclipse.stp.sca.category"> + <constraint + class="org.eclipse.stp.sca.validation.frascati.jbiBinding.JbiBindingInterfaceNotNull" + id="org.eclipse.stp.sca.JBIInterfaceValidationID" + lang="Java" + mode="Batch" + name="JBI bindings interfaces are not null or empty" + severity="ERROR" + statusCode="1"> + <description> + The interface name and namespace of a JBI binding can't be null or empty. + </description> + <message> + {0} + </message> + <target + class="JBIBinding"> + </target> + </constraint> + <constraint + class="org.eclipse.stp.sca.validation.frascati.jbiBinding.JbiBindingAttributesAndModeValidation" + id="org.eclipse.stp.sca.JBIAttrAndModeValidationID" + lang="Java" + mode="Batch" + name="JBI bindings attributes are coherent" + severity="ERROR" + statusCode="1"> + <description> + The interface name and namespace of a JBI binding can't be null or empty. + </description> + <message> + {0} + </message> + <target + class="JBIBinding"> + </target> + </constraint> + </constraints> + </constraintProvider> + <constraintProvider + cache="true"> + <package + namespaceUri="http://www.osoa.org/xmlns/sca/1.0";> + </package> + <constraints> + <constraint + class="org.eclipse.stp.sca.validation.frascati.jbiBinding.OnlyJbiBindings" + id="org.eclipse.stp.sca.JBIbindingPresenceValidationID" + lang="Java" + mode="Batch" + name="JBI binding somewhere, JBI bindings everywhere" + severity="ERROR" + statusCode="1"> + <message> + {0} + </message> + <target + class="Composite"> + </target> + <description> + In a composite, there must be either no JBI binding, or only JBI bindings. + </description> + </constraint></constraints> + </constraintProvider> </extension> - <extension - point="org.eclipse.emf.validation.constraintBindings"> - <clientContext - default="true" - id="org.eclipse.stp.sca.navigation.context"> - <selector class="org.eclipse.stp.sca.validation.Context"/> - </clientContext> - <binding - context="org.eclipse.stp.sca.navigation.context" - category="org.eclipse.stp.sca.category"/> - </extension> </plugin> Deleted: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Context.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Context.java 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Context.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2007-2008-2009 Obeo - * - * 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: - * Obeo - initial API and implementation - */ - -package org.eclipse.stp.sca.validation; - -import org.eclipse.emf.validation.model.IClientSelector; - -/** - * Context class is used to select the constraints in a particular domain - * according to a particular context. It's chosen to verify the constraints in - * all context. - * - * @author Stephane Drapeau - Obeo - */ -public class Context implements IClientSelector { - - /* - * (non-Javadoc) - * - * @see org.eclipse.emf.validation.model.IClientSelector#selects(java.lang.Object) - */ - public boolean selects(Object object) { - return true; - } - -} Deleted: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/EValidatorAdapter.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/EValidatorAdapter.java 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/EValidatorAdapter.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2007-2008-2009 Obeo - * - * 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: - * Obeo - initial API and implementation - */ -package org.eclipse.stp.sca.validation; - -import java.util.Map; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.emf.common.util.BasicDiagnostic; -import org.eclipse.emf.common.util.DiagnosticChain; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.util.EObjectValidator; -import org.eclipse.emf.validation.model.EvaluationMode; -import org.eclipse.emf.validation.model.IConstraintStatus; -import org.eclipse.emf.validation.service.IBatchValidator; -import org.eclipse.emf.validation.service.ModelValidationService; - -/** - * An adapter that plugs the EMF Model Validation Service API into the - * {@link org.eclipse.emf.ecore.EValidator} API. - * - * @author Stephane Drapeau - Obeo - */ -public class EValidatorAdapter extends EObjectValidator { - - /** - * Model Validation Service interface for batch validation of EMF elements. - */ - private final IBatchValidator batchValidator; - - /** - * Initializes me. - */ - public EValidatorAdapter() { - super(); - - batchValidator = (IBatchValidator) ModelValidationService.getInstance() - .newValidator(EvaluationMode.BATCH); - batchValidator.setIncludeLiveConstraints(true); - batchValidator.setReportSuccesses(false); - } - - @Override - public boolean validate(EObject eObject, DiagnosticChain diagnostics, - Map context) { - return validate(eObject.eClass(), eObject, diagnostics, context); - } - - /** - * Implements validation by delegation to the EMF validation framework. - */ - @Override - public boolean validate(EClass eClass, EObject eObject, - DiagnosticChain diagnostics, Map context) { - // first, do whatever the basic EcoreValidator does - super.validate(eClass, eObject, diagnostics, context); - - IStatus status = Status.OK_STATUS; - - // no point in validating if we can't report results - if (diagnostics != null) { - // if EMF Mode Validation Service already covered the sub-tree, - // which it does for efficient computation and error reporting, - // then don't repeat (the Diagnostician does the recursion - // externally). If there is no context map, then we can't - // help it - if (!hasProcessed(eObject, context)) { - status = batchValidator.validate(eObject, - new NullProgressMonitor()); - - processed(eObject, context, status); - - appendDiagnostics(status, diagnostics); - } - } - - return status.isOK(); - } - - /** - * Direct validation of {@link EDataType}s is not supported by the EMF - * validation framework; they are validated indirectly via the - * {@link EObject}s that hold their values. - */ - @Override - public boolean validate(EDataType eDataType, Object value, - DiagnosticChain diagnostics, Map context) { - return super.validate(eDataType, value, diagnostics, context); - } - - /** - * If we have a context map, record this object's <code>status</code> in - * it so that we will know later that we have processed it and its sub-tree. - * - * @param eObject - * an element that we have validated - * @param context - * the context (may be <code>null</code>) - * @param status - * the element's validation status - */ - private void processed(EObject eObject, Map context, IStatus status) { - if (context != null) { - context.put(eObject, status); - } - } - - /** - * Determines whether we have processed this <code>eObject</code> before, - * by automatic recursion of the EMF Model Validation Service. This is only - * possible if we do, indeed, have a context. - * - * @param eObject - * an element to be validated (we hope not) - * @param context - * the context (may be <code>null</code>) - * @return <code>true</code> if the context is not <code>null</code> and - * the <code>eObject</code> or one of its containers has already - * been validated; <code>false</code>, otherwise - */ - private boolean hasProcessed(EObject eObject, Map context) { - boolean result = false; - - if (context != null) { - // this is O(NlogN) but there's no helping it - while (eObject != null) { - if (context.containsKey(eObject)) { - result = true; - eObject = null; - } else { - eObject = eObject.eContainer(); - } - } - } - - return result; - } - - /** - * Converts a status result from the EMF validation service to diagnostics. - * - * @param status - * the EMF validation service's status result - * @param diagnostics - * a diagnostic chain to accumulate results on - */ - private void appendDiagnostics(IStatus status, DiagnosticChain diagnostics) { - if (status.isMultiStatus()) { - IStatus[] children = status.getChildren(); - - for (int i = 0; i < children.length; i++) { - appendDiagnostics(children[i], diagnostics); - } - } else if (status instanceof IConstraintStatus) { - diagnostics.add(new BasicDiagnostic(status.getSeverity(), status - .getPlugin(), status.getCode(), status.getMessage(), - ((IConstraintStatus) status).getResultLocus().toArray())); - } - } - -} Deleted: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Messages.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Messages.java 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Messages.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -1,38 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2009, EBM WebSourcing - * 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: - * EBM WebSourcing - initial API and implementation - *******************************************************************************/ - -package org.eclipse.stp.sca.validation; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.stp.sca.validation.messages"; //$NON-NLS-1$ - public static String JbiBindingAttributesAndModeValidation_10; - public static String JbiBindingAttributesAndModeValidation_13; - public static String JbiBindingAttributesAndModeValidation_14; - public static String JbiBindingAttributesAndModeValidation_3; - public static String JbiBindingAttributesAndModeValidation_5; - public static String JbiBindingAttributesAndModeValidation_7; - public static String JbiBindingAttributesAndModeValidation_8; - public static String JbiBindingAttributesAndModeValidation_9; - public static String JbiBindingInterfaceNotNull_6; - public static String JbiBindingInterfaceNotNull_7; - - static { - // initialize resource bundle - NLS.initializeMessages( BUNDLE_NAME, Messages.class ); - } - - private Messages() { - // nothing - } -} Deleted: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Startup.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Startup.java 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Startup.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -1,40 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2009, EBM WebSourcing - * 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: - * EBM WebSourcing - initial API and implementation - *******************************************************************************/ - -package org.eclipse.stp.sca.validation; - -import org.eclipse.emf.ecore.EValidator; -import org.eclipse.stp.sca.domainmodel.frascati.FrascatiPackage; -import org.eclipse.ui.IStartup; - -/** - * This class installs an EMF <code>EValidator</code> on the Library package - * when we start up. This validator adapts EMF's <code>EValidator</code> API - * to the EMF Model Validation Service API. - * - * @author Vincent Zurczak - EBM WebSourcing - */ -public class Startup implements IStartup { - - /** - * Constructor. - */ - public Startup() { - super(); - } - - /** - * Install the validator. - */ - public void earlyStartup() { - EValidator.Registry.INSTANCE.put(FrascatiPackage.eINSTANCE, new EValidatorAdapter()); - } -} Copied: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/EValidatorAdapter.java (from rev 3341, org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/EValidatorAdapter.java) =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/EValidatorAdapter.java (rev 0) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/EValidatorAdapter.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2007-2008-2009 Obeo + * + * 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: + * Obeo - initial API and implementation + */ +package org.eclipse.stp.sca.validation.frascati; + +import java.util.Map; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.emf.common.util.BasicDiagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.util.EObjectValidator; +import org.eclipse.emf.validation.model.EvaluationMode; +import org.eclipse.emf.validation.model.IConstraintStatus; +import org.eclipse.emf.validation.service.IBatchValidator; +import org.eclipse.emf.validation.service.ModelValidationService; + +/** + * An adapter that plugs the EMF Model Validation Service API into the + * {@link org.eclipse.emf.ecore.EValidator} API. + * + * @author Stephane Drapeau - Obeo + */ +public class EValidatorAdapter extends EObjectValidator { + + /** + * Model Validation Service interface for batch validation of EMF elements. + */ + private final IBatchValidator batchValidator; + + /** + * Initializes me. + */ + public EValidatorAdapter() { + super(); + + this.batchValidator = (IBatchValidator) ModelValidationService.getInstance() + .newValidator(EvaluationMode.BATCH); + this.batchValidator.setIncludeLiveConstraints(true); + this.batchValidator.setReportSuccesses(false); + } + + @Override + public boolean validate(EObject eObject, DiagnosticChain diagnostics, + Map context) { + return validate(eObject.eClass(), eObject, diagnostics, context); + } + + /** + * Implements validation by delegation to the EMF validation framework. + */ + @SuppressWarnings( "unchecked" ) + @Override + public boolean validate(EClass eClass, EObject eObject, + DiagnosticChain diagnostics, Map context) { + // first, do whatever the basic EcoreValidator does + super.validate(eClass, eObject, diagnostics, context); + + IStatus status = Status.OK_STATUS; + + // no point in validating if we can't report results + if (diagnostics != null) { + // if EMF Mode Validation Service already covered the sub-tree, + // which it does for efficient computation and error reporting, + // then don't repeat (the Diagnostician does the recursion + // externally). If there is no context map, then we can't + // help it + if (!hasProcessed(eObject, context)) { + status = this.batchValidator.validate(eObject, + new NullProgressMonitor()); + + processed(eObject, context, status); + appendDiagnostics(status, diagnostics); + } + } + + return status.isOK(); + } + + /** + * Direct validation of {@link EDataType}s is not supported by the EMF + * validation framework; they are validated indirectly via the + * {@link EObject}s that hold their values. + */ + @SuppressWarnings( "unchecked" ) + @Override + public boolean validate(EDataType eDataType, Object value, + DiagnosticChain diagnostics, Map context) { + return super.validate(eDataType, value, diagnostics, context); + } + + /** + * If we have a context map, record this object's <code>status</code> in + * it so that we will know later that we have processed it and its sub-tree. + * + * @param eObject + * an element that we have validated + * @param context + * the context (may be <code>null</code>) + * @param status + * the element's validation status + */ + private void processed(EObject eObject, Map context, IStatus status) { + if (context != null) { + context.put(eObject, status); + } + } + + /** + * Determines whether we have processed this <code>eObject</code> before, + * by automatic recursion of the EMF Model Validation Service. This is only + * possible if we do, indeed, have a context. + * + * @param eObject + * an element to be validated (we hope not) + * @param context + * the context (may be <code>null</code>) + * @return <code>true</code> if the context is not <code>null</code> and + * the <code>eObject</code> or one of its containers has already + * been validated; <code>false</code>, otherwise + */ + private boolean hasProcessed(EObject eObject, Map context) { + boolean result = false; + + if (context != null) { + // this is O(NlogN) but there's no helping it + while (eObject != null) { + if (context.containsKey(eObject)) { + result = true; + eObject = null; + } else { + eObject = eObject.eContainer(); + } + } + } + + return result; + } + + /** + * Converts a status result from the EMF validation service to diagnostics. + * + * @param status + * the EMF validation service's status result + * @param diagnostics + * a diagnostic chain to accumulate results on + */ + private void appendDiagnostics(IStatus status, DiagnosticChain diagnostics) { + + if( status.isMultiStatus()) { + IStatus[] children = status.getChildren(); + + for( IStatus element : children ) { + appendDiagnostics(element, diagnostics); + } + } else if (status instanceof IConstraintStatus) { + diagnostics.add(new BasicDiagnostic(status.getSeverity(), status + .getPlugin(), status.getCode(), status.getMessage(), + ((IConstraintStatus) status).getResultLocus().toArray())); + } + } + +} Copied: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Messages.java (from rev 3341, org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Messages.java) =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Messages.java (rev 0) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Messages.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -0,0 +1,43 @@ +/****************************************************************************** + * Copyright (c) 2009, EBM WebSourcing + * 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: + * EBM WebSourcing - initial API and implementation + *******************************************************************************/ + +package org.eclipse.stp.sca.validation.frascati; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.eclipse.stp.sca.validation.frascati.messages"; //$NON-NLS-1$ + + public static String JbiBindingAttributesAndModeValidation_10; + public static String JbiBindingAttributesAndModeValidation_13; + public static String JbiBindingAttributesAndModeValidation_14; + public static String JbiBindingAttributesAndModeValidation_3; + public static String JbiBindingAttributesAndModeValidation_5; + public static String JbiBindingAttributesAndModeValidation_7; + public static String JbiBindingAttributesAndModeValidation_8; + public static String JbiBindingAttributesAndModeValidation_9; + + public static String JbiBindingInterfaceNotNull_6; + public static String JbiBindingInterfaceNotNull_7; + + public static String OnlyJbiBindings_0; + public static String OnlyJbiBindings_1; + + static { + // initialize resource bundle + NLS.initializeMessages( BUNDLE_NAME, Messages.class ); + } + + private Messages() { + // nothing + } +} Copied: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Startup.java (from rev 3341, org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/Startup.java) =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Startup.java (rev 0) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/Startup.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -0,0 +1,40 @@ +/****************************************************************************** + * Copyright (c) 2009, EBM WebSourcing + * 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: + * EBM WebSourcing - initial API and implementation + *******************************************************************************/ + +package org.eclipse.stp.sca.validation.frascati; + +import org.eclipse.emf.ecore.EValidator; +import org.eclipse.stp.sca.domainmodel.frascati.FrascatiPackage; +import org.eclipse.ui.IStartup; + +/** + * This class installs an EMF <code>EValidator</code> on the Library package + * when we start up. This validator adapts EMF's <code>EValidator</code> API + * to the EMF Model Validation Service API. + * + * @author Vincent Zurczak - EBM WebSourcing + */ +public class Startup implements IStartup { + + /** + * Constructor. + */ + public Startup() { + super(); + } + + /** + * Install the validator. + */ + public void earlyStartup() { + EValidator.Registry.INSTANCE.put( FrascatiPackage.eINSTANCE, new EValidatorAdapter()); + } +} Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/JbiBindingAttributesAndModeValidation.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/jbiBinding/JbiBindingAttributesAndModeValidation.java 2009-09-21 10:29:28 UTC (rev 3341) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/JbiBindingAttributesAndModeValidation.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -9,18 +9,19 @@ * EBM WebSourcing - initial API and implementation *******************************************************************************/ -package org.eclipse.stp.sca.validation.jbiBinding; +package org.eclipse.stp.sca.validation.frascati.jbiBinding; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.validation.AbstractModelConstraint; import org.eclipse.emf.validation.EMFEventType; import org.eclipse.emf.validation.IValidationContext; +import org.eclipse.osgi.util.NLS; import org.eclipse.stp.sca.BaseReference; import org.eclipse.stp.sca.BaseService; import org.eclipse.stp.sca.Component; import org.eclipse.stp.sca.domainmodel.frascati.JBIBinding; -import org.eclipse.stp.sca.validation.Messages; +import org.eclipse.stp.sca.validation.frascati.Messages; /** * A JBI binding is in provide mode only when associated with an SCA service, and in consume only with a reference. @@ -43,7 +44,7 @@ * @return null if the validation succeeded, the error message otherwise */ private String check( JBIBinding jbiBinding ) { - + String location; EObject container = jbiBinding.eContainer(); String suffix = ""; //$NON-NLS-1$ @@ -51,46 +52,50 @@ suffix = ((Component) container.eContainer()).getName() + "/"; //$NON-NLS-1$ if( container instanceof BaseService ) { - location = Messages.JbiBindingAttributesAndModeValidation_3 + suffix + ((BaseService) container).getName() + "'."; //$NON-NLS-1$ + location = NLS.bind( + Messages.JbiBindingAttributesAndModeValidation_3, + suffix + ((BaseService) container).getName()); return checkInProvide( jbiBinding, location ); } - + else if( container instanceof BaseReference ) { - location = Messages.JbiBindingAttributesAndModeValidation_5 + suffix + ((BaseReference) container).getName() + "'."; //$NON-NLS-1$ + location = NLS.bind( + Messages.JbiBindingAttributesAndModeValidation_5, + suffix + ((BaseReference) container).getName()); return checkInConsume( jbiBinding, location ); - } - + } + return null; } - - + + /** * @param jbiBinding * @param location * @return null if the validation succeeded, the error message otherwise */ private String checkInConsume( JBIBinding jbiBinding, String location ) { - + boolean serviceIsEmpty = isEmpty( jbiBinding.getServiceName()); boolean serviceNsIsEmpty = isEmpty( jbiBinding.getServiceNamespace()); boolean endpointIsEmpty = isEmpty( jbiBinding.getEndpointName()); - + if( serviceIsEmpty && !serviceNsIsEmpty ) return Messages.JbiBindingAttributesAndModeValidation_7 + location; - + if( !serviceIsEmpty && serviceNsIsEmpty ) return Messages.JbiBindingAttributesAndModeValidation_8 + location; - - if( serviceIsEmpty && !endpointIsEmpty ) + + if( serviceIsEmpty && !endpointIsEmpty ) return Messages.JbiBindingAttributesAndModeValidation_9 + location; - - if( !serviceIsEmpty && endpointIsEmpty ) + + if( !serviceIsEmpty && endpointIsEmpty ) return Messages.JbiBindingAttributesAndModeValidation_10 + location; - + return null; } - - + + /** * @param string * @return @@ -98,31 +103,31 @@ private boolean isEmpty( String string ) { return string == null || string.trim().length() == 0; } - - + + /** * @param jbiBinding * @param location * @return null if the validation succeeded, the error message otherwise */ private String checkInProvide( JBIBinding jbiBinding, String location ) { - - if( isEmpty( jbiBinding.getServiceName())) + + if( isEmpty( jbiBinding.getServiceName())) return Messages.JbiBindingAttributesAndModeValidation_7 + location; - - if( isEmpty( jbiBinding.getServiceNamespace())) + + if( isEmpty( jbiBinding.getServiceNamespace())) return Messages.JbiBindingAttributesAndModeValidation_8 + location; - - if( isEmpty( jbiBinding.getEndpointName())) + + if( isEmpty( jbiBinding.getEndpointName())) return Messages.JbiBindingAttributesAndModeValidation_13 + location; - + if( isEmpty( jbiBinding.getWsdl())) return Messages.JbiBindingAttributesAndModeValidation_14 + location; - + return null; } - + /* * (non-Javadoc) * @see org.eclipse.emf.validation.AbstractModelConstraint @@ -130,15 +135,15 @@ */ @Override public IStatus validate( IValidationContext ctx ) { - + EObject objectToCheck = ctx.getTarget(); EMFEventType typeEvenement = ctx.getEventType(); if( typeEvenement == EMFEventType.NULL ) { - + if( objectToCheck instanceof JBIBinding ) { String errorMsg = check((JBIBinding) objectToCheck); if( errorMsg != null ) - return ctx.createFailureStatus( new Object[] { errorMsg }); + return ctx.createFailureStatus( errorMsg ); } } return ctx.createSuccessStatus(); Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/JbiBindingInterfaceNotNull.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/jbiBinding/JbiBindingInterfaceNotNull.java 2009-09-21 10:29:28 UTC (rev 3341) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/JbiBindingInterfaceNotNull.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -9,7 +9,7 @@ * EBM WebSourcing - initial API and implementation *******************************************************************************/ -package org.eclipse.stp.sca.validation.jbiBinding; +package org.eclipse.stp.sca.validation.frascati.jbiBinding; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EObject; @@ -21,10 +21,10 @@ import org.eclipse.stp.sca.BaseService; import org.eclipse.stp.sca.Component; import org.eclipse.stp.sca.domainmodel.frascati.JBIBinding; -import org.eclipse.stp.sca.validation.Messages; +import org.eclipse.stp.sca.validation.frascati.Messages; /** - * This constraint checks if the interface attributes of a JBI binding are not null. + * This constraint checks if the interface attributes of a JBI binding are not null. * @author Vincent Zurczak - EBM WebSourcing */ public class JbiBindingInterfaceNotNull extends AbstractModelConstraint { @@ -34,31 +34,31 @@ * @return null if the validation succeeded, the error message otherwise. */ private String check( JBIBinding jbiBinding ) { - + String location; EObject container = jbiBinding.eContainer(); - + String prefix = ""; //$NON-NLS-1$ if( container.eContainer() instanceof Component ) prefix = ((Component) container.eContainer()).getName() + "/"; //$NON-NLS-1$ - + if( container instanceof BaseService ) - location = NLS.bind( + location = NLS.bind( Messages.JbiBindingAttributesAndModeValidation_3, - new Object[] { prefix, ((BaseService) container).getName()}); - else - location = NLS.bind( + prefix + ((BaseService) container).getName()); + else + location = NLS.bind( Messages.JbiBindingAttributesAndModeValidation_5, - new Object[] { prefix, ((BaseReference) container).getName()}); - + prefix + ((BaseReference) container).getName()); + if( jbiBinding.getInterfaceName() == null - || jbiBinding.getInterfaceName().trim().length() == 0 ) + || jbiBinding.getInterfaceName().trim().length() == 0 ) return Messages.JbiBindingInterfaceNotNull_6 + location; - + if( jbiBinding.getInterfaceNamespace() == null - || jbiBinding.getInterfaceNamespace().trim().length() == 0 ) + || jbiBinding.getInterfaceNamespace().trim().length() == 0 ) return Messages.JbiBindingInterfaceNotNull_7 + location; - + return null; } @@ -69,15 +69,15 @@ */ @Override public IStatus validate( IValidationContext ctx ) { - + EObject objectToCheck = ctx.getTarget(); EMFEventType typeEvenement = ctx.getEventType(); if( typeEvenement == EMFEventType.NULL ) { - + if( objectToCheck instanceof JBIBinding ) { String errorMsg = check((JBIBinding) objectToCheck); if( errorMsg != null ) - return ctx.createFailureStatus( new Object[] { errorMsg }); + return ctx.createFailureStatus( errorMsg ); } } return ctx.createSuccessStatus(); Added: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/OnlyJbiBindings.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/OnlyJbiBindings.java (rev 0) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/jbiBinding/OnlyJbiBindings.java 2009-11-04 16:53:25 UTC (rev 3346) @@ -0,0 +1,161 @@ +/****************************************************************************** + * Copyright (c) 2009, EBM WebSourcing + * 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: + * EBM WebSourcing - initial API and implementation + *******************************************************************************/ + +package org.eclipse.stp.sca.validation.frascati.jbiBinding; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.validation.AbstractModelConstraint; +import org.eclipse.emf.validation.EMFEventType; +import org.eclipse.emf.validation.IValidationContext; +import org.eclipse.stp.sca.BaseReference; +import org.eclipse.stp.sca.BaseService; +import org.eclipse.stp.sca.Binding; +import org.eclipse.stp.sca.Component; +import org.eclipse.stp.sca.ComponentReference; +import org.eclipse.stp.sca.ComponentService; +import org.eclipse.stp.sca.Composite; +import org.eclipse.stp.sca.Reference; +import org.eclipse.stp.sca.Service; +import org.eclipse.stp.sca.domainmodel.frascati.JBIBinding; +import org.eclipse.stp.sca.validation.frascati.Messages; + +/** + * This constraint checks that a composite with JBI binding only has JBI bindings. + * @author Vincent Zurczak - EBM WebSourcing + */ +public class OnlyJbiBindings extends AbstractModelConstraint { + + + /* + * (non-Javadoc) + * @see org.eclipse.emf.validation.AbstractModelConstraint + * #validate(org.eclipse.emf.validation.IValidationContext) + */ + @Override + public IStatus validate( IValidationContext ctx ) { + + IStatus status = ctx.createSuccessStatus(); + EObject objectToCheck = ctx.getTarget(); + if( ctx.getEventType() == EMFEventType.NULL && objectToCheck instanceof Composite ) + status = check((Composite) objectToCheck, ctx ); + + return status; + } + + + /** + * Checks that in the composite, there is either no JBI binding or only JBI bindings. + * <p> + * Elements from included composites should be retrieved by the model + * when parsing the root composite. + * </p> + * + * @param composite + * @param ctx + * @return + * FIXME: we do not need to get all the invalid bindings. Simplify the check. + */ + private IStatus check( Composite composite, IValidationContext ctx ) { + + boolean hasJbiBindng = false; + List<BaseService> baseServices = new ArrayList<BaseService> (); + List<BaseReference> baseReferences = new ArrayList<BaseReference> (); + + // Composite services + if( composite.getService() != null ) { + for( int i=0; i<composite.getService().size(); i++ ) { + Service service = composite.getService().get( i ); + if( service.getBinding() == null ) + continue; + + for( int j=0; j<service.getBinding().size(); j++ ) { + Binding binding = service.getBinding().get( i ); + if( binding instanceof JBIBinding ) + hasJbiBindng = true; + else if( hasJbiBindng ) + baseServices.add( service ); + } + + } + } + + // Composite references + if( composite.getReference() != null ) { + for( int i=0; i<composite.getReference().size(); i++ ) { + Reference reference = composite.getReference().get( i ); + if( reference.getBinding() == null ) + continue; + + for( int j=0; j<reference.getBinding().size(); j++ ) { + Binding binding = reference.getBinding().get( i ); + if( binding instanceof JBIBinding ) + hasJbiBindng = true; + else if( hasJbiBindng ) + baseReferences.add( reference ); + } + } + } + + // Component elements + if( composite.getComponent() != null ) { + for( int i=0; i<composite.getComponent().size(); i++ ) { + Component component = composite.getComponent().get( i ); + + // Component services + if( component.getService() != null ) { + for( int j=0; j<component.getService().size(); j++ ) { + ComponentService service = component.getService().get( j ); + if( service.getBinding() == null ) + continue; + + for( int k=0; k<service.getBinding().size(); k++ ) { + Binding binding = service.getBinding().get( k ); + if( binding instanceof JBIBinding ) + hasJbiBindng = true; + else if( hasJbiBindng ) + baseServices.add( service ); + } + } + } + + // Component references + if( component.getReference() != null ) { + for( int j=0; j<component.getReference().size(); j++ ) { + ComponentReference reference = component.getReference().get( j ); + if( reference.getBinding() == null ) + continue; + + for( int k=0; k<reference.getBinding().size(); k++ ) { + Binding binding = reference.getBinding().get( k ); + if( binding instanceof JBIBinding ) + hasJbiBindng = true; + else if( hasJbiBindng ) + baseReferences.add( reference ); + } + } + } + } + } + + // Create the result + if( ! baseServices.isEmpty() || ! baseReferences.isEmpty()) { + String errorMsg = Messages.OnlyJbiBindings_0 + Messages.OnlyJbiBindings_1; + return ctx.createFailureStatus( errorMsg ); + } + + // Return null if everything is fine + return ctx.createSuccessStatus(); + } +} Copied: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/messages.properties (from rev 3341, org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/messages.properties) =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/messages.properties (rev 0) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/frascati/messages.properties 2009-11-04 16:53:25 UTC (rev 3346) @@ -0,0 +1,28 @@ +# <copyright> +# Copyright (c) 2009, EBM WebSourcing +# +# 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: +# EBM WebSourcing - initial API and implementation +# </copyright> +# +# + +JbiBindingAttributesAndModeValidation_10=The JBI end-point name must be specified (or let the service name empty) +JbiBindingAttributesAndModeValidation_13=The JBI end-point name must be specified +JbiBindingAttributesAndModeValidation_14=The JBI WSDL attribute must be specified +JbiBindingAttributesAndModeValidation_3=in the service "{0}". +JbiBindingAttributesAndModeValidation_5=in the reference "{0}". +JbiBindingAttributesAndModeValidation_7=The JBI service name must be specified +JbiBindingAttributesAndModeValidation_8=The JBI service namespace must be specified +JbiBindingAttributesAndModeValidation_9=The JBI service name must be specified (or let the end-point name empty) + +JbiBindingInterfaceNotNull_6=The JBI interface name must be specified +JbiBindingInterfaceNotNull_7=The JBI interface namespace must be specified + +OnlyJbiBindings_0=A JBI binding was found in the composite, but bindings from other types were found. +OnlyJbiBindings_1=The JBI binding is expected to run in a specific environment (Petals) and is incompatible with other bindings. Deleted: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/messages.properties =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/messages.properties 2009-10-19 07:07:04 UTC (rev 3345) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.validation.frascati/src/org/eclipse/stp/sca/validation/messages.properties 2009-11-04 16:53:25 UTC (rev 3346) @@ -1,24 +0,0 @@ -# <copyright> -# Copyright (c) 2009, EBM WebSourcing -# -# 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: -# EBM WebSourcing - initial API and implementation -# </copyright> -# -# - -JbiBindingAttributesAndModeValidation_10=The JBI end-point name must be specified (or let the service name empty) -JbiBindingAttributesAndModeValidation_13=The JBI end-point name must be specified -JbiBindingAttributesAndModeValidation_14=The JBI WSDL attribute must be specified -JbiBindingAttributesAndModeValidation_3=in the service "{0}{1}". -JbiBindingAttributesAndModeValidation_5=in the reference "{0}{1}". -JbiBindingAttributesAndModeValidation_7=The JBI service name must be specified -JbiBindingAttributesAndModeValidation_8=The JBI service namespace must be specified -JbiBindingAttributesAndModeValidation_9=The JBI service name must be specified (or let the end-point name empty) -JbiBindingInterfaceNotNull_6=The JBI interface name must be specified -JbiBindingInterfaceNotNull_7=The JBI interface namespace must be specified ]]> Wed, 04 Nov 2009 16:53:29 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02485.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02484.html Author: azoppello Date: 2009-11-03 11:46:42 -0500 (Tue, 03 Nov 2009) New Revision: 2979 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im/model/stpmodel.ecore Log: Fix BUG 294084 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im/model/stpmode... Author: azoppello Date: 2009-11-03 11:46:42 -0500 (Tue, 03 Nov 2009) New Revision: 2979 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im/model/stpmodel.ecore Log: Fix BUG 294084 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im/model/stpmodel.ecore =================================================================== --- org.eclipse.stp.model/trunk/org.eclipse.stp.im/model/stpmodel.ecore 2009-10-08 07:54:07 UTC (rev 2978) +++ org.eclipse.stp.model/trunk/org.eclipse.stp.im/model/stpmodel.ecore 2009-11-03 16:46:42 UTC (rev 2979) @@ -4,7 +4,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; name="im" nsURI="http://eclipse.org/stp/im"; nsPrefix="im"> <eClassifiers xsi:type="ecore:EClass" name="Process" eSuperTypes="#//Service"> - <eStructuralFeatures xsi:type="ecore:EReference" name="steps" unique="false" upperBound="-1" + <eStructuralFeatures xsi:type="ecore:EReference" name="steps" upperBound="-1" eType="#//Step" containment="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> ]]> Tue, 03 Nov 2009 16:46:43 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02484.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02483.html Author: vzurczak Date: 2009-10-19 03:07:04 -0400 (Mon, 19 Oct 2009) New Revision: 3345 Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/composite2java/GenerationSelectionDialog.java org.eclipse.stp.sca... Author: vzurczak Date: 2009-10-19 03:07:04 -0400 (Mon, 19 Oct 2009) New Revision: 3345 Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/composite2java/GenerationSelectionDialog.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/builder/ScaDependencyVertex.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/provisional/builder/ScaValidator.java Log: Use the new utility methods Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/builder/ScaDependencyVertex.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/builder/ScaDependencyVertex.java 2009-10-13 08:55:58 UTC (rev 3344) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/builder/ScaDependencyVertex.java 2009-10-19 07:07:04 UTC (rev 3345) @@ -13,53 +13,54 @@ import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import javax.xml.namespace.QName; -import org.eclipse.emf.common.command.BasicCommandStack; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; -import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; -import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; -import org.eclipse.stp.sca.DocumentRoot; -import org.eclipse.stp.sca.provider.ScaItemProviderAdapterFactory; +import org.eclipse.emf.common.util.EList; +import org.eclipse.stp.sca.Composite; +import org.eclipse.stp.sca.Include; +import org.eclipse.stp.sca.common.utils.ScaModelUtils; /** * A vertex is an item of a dependency graph used to determine relations between *.composite files. * @author Vincent Zurczak - EBM WebSourcing */ public class ScaDependencyVertex { - + /** The *.composite file associated to this vertex. */ - private File file; - + private final File file; + /** A composite has both a name and a target name space. */ private QName name; - + /** A composite may include other composites, referenced by their name and target name space. */ - private List<QName> includes = new ArrayList<QName> (); - + private final List<QName> includes = new ArrayList<QName> (); + /** True if EMF could load this file or never tried to. False otherwise. */ private boolean isValidEmfFile = true; - - /** The EMF resource associated to this composite. */ - private Resource resource; - - - + /** - * The constructor initializes and loads a composite with EMF. + * The composite model (not null if {@link #isValidEmfFile()} returns true). */ + private Composite composite; + + /** + * + */ + private final ScaModelUtils scaModelUtils = new ScaModelUtils(); + + + + /** + * The constructor initializes and loads a composite with EMF. + */ protected ScaDependencyVertex( File file ) { this.file = file; - loadResource (); - } - - + loadResource (); + } + + /** * Loads the EMF resource associated with {@link #file}. * <p> @@ -67,74 +68,47 @@ * </p> */ private void loadResource() { - + try { - Resource resource = getEmfResource(); - if( resource == null ) - return; - - DocumentRoot root = (DocumentRoot) resource.getContents().get( 0 ); - if( root.getComposite() != null ) { + this.composite = this.scaModelUtils.getCompositeFile( this.file ); + if( this.composite != null ) { this.name = new QName( - root.getComposite().getTargetNamespace(), - root.getComposite().getName() - ); - - // FIXME: it seems the EMF model does not handle inclusions + this.composite.getTargetNamespace(), + this.composite.getName() + ); + + // FIXME: it seems the EMF model does not handle inclusions // - and currently, it could not handle more than one inclusion. - if( root.getInclude() != null && root.getInclude().getName() != null ) { - this.name = new QName( - root.getInclude().getName().getNamespaceURI(), - root.getInclude().getName().getLocalPart() - ); + EList<Include> includes = this.composite.getInclude(); + if( includes != null ) { + for( int i=0; i<includes.size(); i++ ) { + Include include = includes.get( i ); + QName qName = new QName( + include.getName().getNamespaceURI(), + include.getName().getLocalPart() + ); + + this.includes.add( qName ); + } } } else - isValidEmfFile = false; - + this.isValidEmfFile = false; + } catch( Exception e ) { e.printStackTrace(); } } - - - /** - * @return the EMF resource associated with this vertex. - */ - public Resource getEmfResource() { - if( resource == null && isValidEmfFile ) { - ComposedAdapterFactory adapterFactory = - new ComposedAdapterFactory( ComposedAdapterFactory.Descriptor.Registry.INSTANCE ); - - adapterFactory.addAdapterFactory( new ResourceItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory( new ScaItemProviderAdapterFactory()); - adapterFactory.addAdapterFactory( new ReflectiveItemProviderAdapterFactory()); - - BasicCommandStack commandStack = new BasicCommandStack(); - AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain( - adapterFactory, commandStack, new HashMap<Resource, Boolean>()); - - try { - URI uri = URI.createFileURI( file.getAbsolutePath()); - resource = editingDomain.getResourceSet().getResource( uri, true ); - } catch( Exception e ) { - isValidEmfFile = false; - e.printStackTrace(); - } - } - - return resource; - } - + /** * @return the file */ public File getFile() { - return file; + return this.file; } - - + + /** * @return the tnsNameCouple */ @@ -142,12 +116,12 @@ return this.name; } - + /** * @return the includes */ public List<QName> getIncludes() { - return includes; + return this.includes; } @@ -155,6 +129,14 @@ * @return the isValidEmfFile */ public boolean isValidEmfFile() { - return isValidEmfFile; + return this.isValidEmfFile; } + + + /** + * @return the composite + */ + public Composite getComposite() { + return this.composite; + } } Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/provisional/builder/ScaValidator.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/provisional/builder/ScaValidator.java 2009-10-13 08:55:58 UTC (rev 3344) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/internal/provisional/builder/ScaValidator.java 2009-10-19 07:07:04 UTC (rev 3345) @@ -25,14 +25,14 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.stp.sca.DocumentRoot; import org.eclipse.stp.sca.common.internal.Messages; -import org.eclipse.stp.sca.common.internal.builder.ScaCustomDiagnostician; import org.eclipse.stp.sca.common.internal.builder.ScaDependencyGraph; import org.eclipse.stp.sca.common.internal.builder.ScaDependencyVertex; +import org.eclipse.stp.sca.common.utils.ScaModelUtils; /** * A class to validate an SCA application. * <p> - * The validation relies on the EMF meta-model of SCA, + * The validation relies on the EMF meta-model of SCA, * and uses a graph to describe the relations between SCA artifacts. * It can be used inside and outside Eclipse. * </p> @@ -65,49 +65,49 @@ * TODO: improve the builder performances. Reload every model is heavy and perform a full validation * every time a java resource changes is heavy. Think about: * -- Libraries added or new referenced project: full build. - * -- Class changed: only reload the related SCA resources (e.g. composites that use the changed resource). + * -- Class changed: only reload the related SCA resources (e.g. composites that use the changed resource). * * @author Vincent Zurczak - EBM WebSourcing */ public class ScaValidator { - private List<ScaAbstractValidationExtension> extensions = + private final List<ScaAbstractValidationExtension> extensions = new ArrayList<ScaAbstractValidationExtension>(); - - /** - * The dependency graph used by this builder. + + /** + * The dependency graph used by this builder. */ - private ScaDependencyGraph graph = new ScaDependencyGraph(); - - + private final ScaDependencyGraph graph = new ScaDependencyGraph(); + + /** * @param o * @return * @see java.util.List#add(java.lang.Object) */ public boolean addValidationExtension( ScaAbstractValidationExtension o ) { - return extensions.add( o ); + return this.extensions.add( o ); } - + /** * @param c * @return * @see java.util.List#addAll(java.util.Collection) */ public boolean addAllValidationExtensions( Collection<? extends ScaAbstractValidationExtension> c ) { - return extensions.addAll( c ); + return this.extensions.addAll( c ); } - - + + /** * * @see org.eclipse.stp.sca.common.internal.builder.ScaDependencyGraph * #clearVertices() */ public void clearResources() { - graph.clearVertices(); + this.graph.clearVertices(); } @@ -117,7 +117,7 @@ * #loadVertex(org.eclipse.core.resources.File) */ public void loadResource( File file ) { - graph.loadVertex( file ); + this.graph.loadVertex( file ); } @@ -127,7 +127,7 @@ * #removeVertex(org.eclipse.core.resources.File) */ public void removeResource( File file ) { - graph.removeVertex( file ); + this.graph.removeVertex( file ); } @@ -139,129 +139,109 @@ * </p> */ public Map<Diagnostic,File> performValidation () { - + Map<Diagnostic,File> diagnostics = new HashMap<Diagnostic, File>(); - - + + // 1st step in the validation: indicate which files could not be loaded by EMF - for( ScaDependencyVertex vertex : graph.findFilesEmfCouldNotLoad()) { + for( ScaDependencyVertex vertex : this.graph.findFilesEmfCouldNotLoad()) { String filename = vertex.getFile().getName(); String message = NLS.bind( Messages.IncrementalBuilder_2, filename ); - - Diagnostic d = new BasicDiagnostic( - Diagnostic.ERROR, - vertex.getFile().getAbsolutePath(), - 0, - message, - new Object[ 0 ]); + + Diagnostic d = new BasicDiagnostic( + Diagnostic.ERROR, + vertex.getFile().getAbsolutePath(), + 0, + message, + new Object[ 0 ]); diagnostics.put( d, vertex.getFile()); return diagnostics; } - - + + // 2nd step in the validation: composite name = *.composite file name - for( ScaDependencyVertex vertex : graph.findFilesWithWrongName()) { + for( ScaDependencyVertex vertex : this.graph.findFilesWithWrongName()) { String filename = vertex.getFile().getName(); String message = NLS.bind( Messages.IncrementalBuilder_3, filename ); - + EObject eObject = null; - if( vertex.getEmfResource() != null ) { - DocumentRoot root = (DocumentRoot) vertex.getEmfResource().getContents().get( 0 ); - eObject = root.getComposite() == null ? root : root.getComposite(); - } - - Diagnostic d = new BasicDiagnostic( - Diagnostic.ERROR, - vertex.getFile().getAbsolutePath(), - 0, - message, - new Object[]{ eObject }); + if( vertex.isValidEmfFile()) + eObject = vertex.getComposite(); + + Diagnostic d = new BasicDiagnostic( + Diagnostic.ERROR, + vertex.getFile().getAbsolutePath(), + 0, + message, + new Object[]{ eObject }); diagnostics.put( d, vertex.getFile()); return diagnostics; } - - + + // 3rd step in the validation: the couple (name, tns) is unique in the project - for( ScaDependencyVertex vertex : graph.findFilesWithSameIds()) { - String message = NLS.bind( - Messages.IncrementalBuilder_5, - new Object[] { - vertex.getName().getLocalPart(), - vertex.getName().getNamespaceURI()}); - + for( ScaDependencyVertex vertex : this.graph.findFilesWithSameIds()) { + String message = NLS.bind( + Messages.IncrementalBuilder_5, + new Object[] { + vertex.getName().getLocalPart(), + vertex.getName().getNamespaceURI()}); + EObject eObject = null; - if( vertex.getEmfResource() != null ) { - DocumentRoot root = (DocumentRoot) vertex.getEmfResource().getContents().get( 0 ); - eObject = root.getComposite() == null ? root : root.getComposite(); - } - - Diagnostic d = new BasicDiagnostic( - Diagnostic.ERROR, - vertex.getFile().getAbsolutePath(), - 0, - message, - new Object[]{ eObject }); + if( vertex.isValidEmfFile()) + eObject = vertex.getComposite(); + + Diagnostic d = new BasicDiagnostic( + Diagnostic.ERROR, + vertex.getFile().getAbsolutePath(), + 0, + message, + new Object[]{ eObject }); diagnostics.put( d, vertex.getFile()); return diagnostics; } - - + + // 4th step in the validation: find cycles in inclusions - for( Map.Entry<ScaDependencyVertex, String> entry : graph.findDependencyCycles().entrySet()) { - File file = entry.getKey().getFile(); + for( Map.Entry<ScaDependencyVertex, String> entry : this.graph.findDependencyCycles().entrySet()) { + File file = entry.getKey().getFile(); String message = NLS.bind( Messages.IncrementalBuilder_8, entry.getValue()); - + EObject eObject = null; - if( entry.getKey().getEmfResource() != null ) { - DocumentRoot root = (DocumentRoot) entry.getKey().getEmfResource().getContents().get( 0 ); - eObject = root.getComposite() == null ? root : root.getComposite(); - } - - Diagnostic d = new BasicDiagnostic( - Diagnostic.ERROR, - file.getAbsolutePath(), - 0, - message, - new Object[]{ eObject }); + if( entry.getKey().isValidEmfFile()) + eObject = entry.getKey().getComposite(); + + Diagnostic d = new BasicDiagnostic( + Diagnostic.ERROR, + file.getAbsolutePath(), + 0, + message, + new Object[]{ eObject }); diagnostics.put( d, file ); return diagnostics; } - - + + // 5th step in the validation: run EMF + extended validation - for( ScaDependencyVertex vertex : graph.getFilesToValidateWithEmf ()) { - if( vertex.getEmfResource() == null ) + for( ScaDependencyVertex vertex : this.graph.getFilesToValidateWithEmf ()) { + if( ! vertex.isValidEmfFile()) continue; - - DocumentRoot root = (DocumentRoot) vertex.getEmfResource().getContents().get( 0 ); - Diagnostic diagnostic = null; - try { - diagnostic = new ScaCustomDiagnostician().validate( root ); - } catch( Exception e ) { - // Exception if a promote only defines the component - diagnostic = new BasicDiagnostic ( - Diagnostic.ERROR, - e.getMessage(), - 0, - Messages.ScaIncrementalBuilder_3, - new Object[ 0 ] - ); - } - + Diagnostic diagnostic = ScaModelUtils.validate( vertex.getComposite()); if( diagnostic.getSeverity() != Diagnostic.OK ) diagnostics.put( diagnostic, vertex.getFile()); // Extended validation + DocumentRoot root = (DocumentRoot) vertex.getComposite().eContainer(); URI uri = root.eResource().getURI(); if( uri.isPlatform()) continue; - - for( ScaAbstractValidationExtension ext : extensions ) { + + for( ScaAbstractValidationExtension ext : this.extensions ) { if( ! ext.initialize( root, vertex.getFile())) continue; - + diagnostics.putAll( ext.validatePreRequisites()); diagnostics.putAll( ext.validateInterfaceCompatibilityInPromotes()); diagnostics.putAll( ext.validateInterfaceCompatibilityInWires()); @@ -270,7 +250,7 @@ diagnostics.putAll( ext.validateOthers()); } } - + return diagnostics; } } Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/composite2java/GenerationSelectionDialog.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/composite2java/GenerationSelectionDialog.java 2009-10-13 08:55:58 UTC (rev 3344) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/composite2java/GenerationSelectionDialog.java 2009-10-19 07:07:04 UTC (rev 3345) @@ -58,28 +58,30 @@ */ public class GenerationSelectionDialog extends TitleAreaDialog { - private IFile compositeFile; - private JComposite jComposite; + private final IFile compositeFile; + private final JComposite jComposite; private IClasspathEntry selectedEntry; - private List<JavaFile> selectedFiles = new ArrayList<JavaFile> (); + private final List<JavaFile> selectedFiles = new ArrayList<JavaFile> (); private Image cuImg, packageImg, sourceImg; - - + + /** * @param parentShell + * @param compositeFile + * @param jComposite */ public GenerationSelectionDialog( Shell parentShell, IFile compositeFile, JComposite jComposite ) { super( parentShell ); this.compositeFile = compositeFile; this.jComposite = jComposite; setShellStyle( SWT.PRIMARY_MODAL | SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX ); - - cuImg = ScaCommonJdtPlugin.getImage( "icons/obj16/jcu_obj.gif" ); //$NON-NLS-1$ - packageImg = ScaCommonJdtPlugin.getImage( "icons/obj16/package_obj.gif" ); //$NON-NLS-1$ - sourceImg = ScaCommonJdtPlugin.getImage( "icons/obj16/packagefolder_obj.gif" ); //$NON-NLS-1$ + + this.cuImg = ScaCommonJdtPlugin.getImage( "icons/obj16/jcu_obj.gif" ); //$NON-NLS-1$ + this.packageImg = ScaCommonJdtPlugin.getImage( "icons/obj16/package_obj.gif" ); //$NON-NLS-1$ + this.sourceImg = ScaCommonJdtPlugin.getImage( "icons/obj16/packagefolder_obj.gif" ); //$NON-NLS-1$ } - - + + /* * (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog @@ -87,48 +89,39 @@ */ @Override protected Control createDialogArea( Composite parent ) { - + Composite bigContainer = (Composite) super.createDialogArea( parent ); GridLayout layout = new GridLayout(); layout.marginHeight = 0; bigContainer.setLayout( layout ); bigContainer.setLayoutData( new GridData( GridData.FILL_BOTH )); - + Composite container = new Composite( bigContainer, SWT.NONE ); layout = new GridLayout (); layout.marginWidth = layout.marginHeight = 0; container.setLayout( layout ); container.setLayoutData( new GridData( GridData.FILL_BOTH )); - - + + // Source folder Label l = new Label( container, SWT.NONE ); l.setText( Messages.GenerationSelectionDialog_3 ); - + Composite comp = new Composite( container, SWT.NONE ); layout = new GridLayout( 2, false ); layout.marginHeight = layout.marginWidth = 0; comp.setLayout( layout ); comp.setLayoutData( new GridData( GridData.FILL_HORIZONTAL )); - + l = new Label( comp, SWT.NONE ); - l.setImage( sourceImg ); - + l.setImage( this.sourceImg ); + Combo combo = new Combo( comp, SWT.READ_ONLY | SWT.BORDER | SWT.DROP_DOWN ); combo.setLayoutData( new GridData( GridData.FILL_HORIZONTAL )); - ComboViewer comboViewer = new ComboViewer( combo ); - final IJavaProject jp = JDTUtils.getJavaProject( compositeFile.getProject()); - List<IClasspathEntry> entries = new ArrayList<IClasspathEntry> (); - - try { - for( IClasspathEntry entry : jp.getRawClasspath()) { - if( entry.getEntryKind() == IClasspathEntry.CPE_SOURCE ) - entries.add( entry ); - } - } catch( JavaModelException e ) { - e.printStackTrace(); - } - + ComboViewer comboViewer = new ComboViewer( combo ); + final IJavaProject jp = JDTUtils.getJavaProject( this.compositeFile.getProject()); + List<IClasspathEntry> entries = JDTUtils.getSourceFolders( jp ); + comboViewer.setContentProvider( new ArrayContentProvider ()); comboViewer.setLabelProvider( new LabelProvider () { @Override @@ -136,37 +129,37 @@ IPath path = ((IClasspathEntry) element).getPath(); return " " + path.lastSegment() + " - " + path.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } - + @Override public Image getImage( Object element ) { - return sourceImg; + return GenerationSelectionDialog.this.sourceImg; } }); - + comboViewer.setInput( entries ); if( entries.size() > 0 ) { - selectedEntry = entries.get( 0 ); - comboViewer.setSelection( new StructuredSelection( selectedEntry )); + this.selectedEntry = entries.get( 0 ); + comboViewer.setSelection( new StructuredSelection( this.selectedEntry )); } - + comboViewer.addSelectionChangedListener( new ISelectionChangedListener () { public void selectionChanged( SelectionChangedEvent event ) { - selectedEntry = (IClasspathEntry) ((IStructuredSelection) event.getSelection()).getFirstElement(); + GenerationSelectionDialog.this.selectedEntry = (IClasspathEntry) ((IStructuredSelection) event.getSelection()).getFirstElement(); } }); - - + + // Java selection l = new Label( container, SWT.NONE ); l.setText( Messages.GenerationSelectionDialog_6 ); GridData layoutData = new GridData(); layoutData.verticalIndent = 15; l.setLayoutData( layoutData ); - + int style = SWT.BORDER | SWT.SINGLE | SWT.HIDE_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL; final CheckboxTreeViewer treeViewer = new CheckboxTreeViewer( container, style ); treeViewer.getTree().setLayoutData( new GridData( GridData.FILL_BOTH )); - + treeViewer.setLabelProvider( new LabelProvider () { @Override public String getText( Object element ) { @@ -180,17 +173,17 @@ return ((JavaFile) element).name; return super.getText( element ); } - + @Override public Image getImage( Object element ) { if( element instanceof JavaPackage ) - return packageImg; + return GenerationSelectionDialog.this.packageImg; if( element instanceof JavaFile ) - return cuImg; + return GenerationSelectionDialog.this.cuImg; return super.getImage( element ); } }); - + final Map<String, JavaPackage> javaPackages = new HashMap<String, JavaPackage> (); treeViewer.setContentProvider( new ITreeContentProvider () { public void dispose() { @@ -216,29 +209,29 @@ public boolean hasChildren( Object element ) { if( element instanceof JavaPackage ) return ((JavaPackage) element).classes.size() > 0; - return false; + return false; } public Object[] getElements( Object inputElement ) { - + if( !( inputElement instanceof JComposite )) return new Object[ 0 ]; - + List<JInterface> elements = new ArrayList<JInterface> (); elements.addAll( ((JComposite) inputElement).getInterfaces().values()); elements.addAll( ((JComposite) inputElement).getImplementations().values()); - + javaPackages.clear(); for( JInterface ji : elements ) { try { IType iType = jp.findType( ji.getName()); if( iType != null ) continue; - + } catch( JavaModelException e ) { e.printStackTrace(); } - + String[] parts = JDTUtils.getQualifiedNameElements( ji.getName()); String pn = parts[ 0 ]; JavaPackage pck = javaPackages.get( pn ); @@ -246,7 +239,7 @@ pck = new JavaPackage(); pck.name = pn; } - + JavaFile jf = new JavaFile(); jf.name = parts[ 1 ]; jf.pck = pck; @@ -254,45 +247,45 @@ pck.classes.add( jf ); javaPackages.put( pck.name, pck ); } - + return javaPackages.values().toArray(); } }); - - treeViewer.setInput( jComposite ); + + treeViewer.setInput( this.jComposite ); treeViewer.setSorter( new ViewerSorter () { @Override public int compare( Viewer viewer, Object e1, Object e2 ) { if( e1.getClass().equals( e2.getClass())) { - if( e1 instanceof JavaPackage ) + if( e1 instanceof JavaPackage ) return ((JavaPackage) e1).getName().compareTo(((JavaPackage) e2).getName()); - else - return ((JavaFile) e1).getName().compareTo(((JavaFile) e2).getName()); + + return ((JavaFile) e1).getName().compareTo(((JavaFile) e2).getName()); } return super.compare( viewer, e1, e2 ); } }); - + treeViewer.expandAll(); for( JavaPackage pck : javaPackages.values()) - selectedFiles.addAll( pck.classes ); - + this.selectedFiles.addAll( pck.classes ); + for( JavaPackage pck : javaPackages.values()) treeViewer.setSubtreeChecked( pck, true ); - + treeViewer.addCheckStateListener( new ICheckStateListener () { public void checkStateChanged( CheckStateChangedEvent event ) { - + if( event.getElement() instanceof JavaPackage ) { JavaPackage pck = (JavaPackage) event.getElement(); treeViewer.setSubtreeChecked( pck, event.getChecked()); - + if( event.getChecked()) - selectedFiles.addAll( pck.classes ); + GenerationSelectionDialog.this.selectedFiles.addAll( pck.classes ); else - selectedFiles.removeAll( pck.classes ); + GenerationSelectionDialog.this.selectedFiles.removeAll( pck.classes ); } - + else { JavaFile jf = (JavaFile) event.getElement(); int checked = 0; @@ -300,7 +293,7 @@ if( treeViewer.getChecked( jfRun )) checked ++; } - + if( checked == jf.pck.classes.size()) { treeViewer.setGrayChecked( jf.pck, false ); treeViewer.setChecked( jf.pck, true ); @@ -311,26 +304,26 @@ else { treeViewer.setGrayChecked( jf.pck, true ); } - + if( event.getChecked()) - selectedFiles.add( jf ); + GenerationSelectionDialog.this.selectedFiles.add( jf ); else - selectedFiles.remove( jf ); + GenerationSelectionDialog.this.selectedFiles.remove( jf ); } } }); - + getShell().setText( Messages.GenerationSelectionDialog_8 ); setTitle( Messages.GenerationSelectionDialog_8 ); - if( selectedFiles.size() == - jComposite.getImplementations().size() + jComposite.getInterfaces().size()) + if( this.selectedFiles.size() == + this.jComposite.getImplementations().size() + this.jComposite.getInterfaces().size()) setMessage( Messages.GenerationSelectionDialog_10 ); else setMessage( Messages.GenerationSelectionDialog_11, DialogPage.WARNING ); return bigContainer; } - - + + /* * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getInitialSize() @@ -339,52 +332,52 @@ protected Point getInitialSize () { return new Point( 600, 500 ); } - - + + /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TrayDialog#close() */ @Override public boolean close() { - - if( sourceImg != null ) { - sourceImg.dispose(); - sourceImg = null; + + if( this.sourceImg != null ) { + this.sourceImg.dispose(); + this.sourceImg = null; } - if( packageImg != null ) { - packageImg.dispose(); - packageImg = null; + if( this.packageImg != null ) { + this.packageImg.dispose(); + this.packageImg = null; } - if( cuImg != null ) { - cuImg.dispose(); - cuImg = null; + if( this.cuImg != null ) { + this.cuImg.dispose(); + this.cuImg = null; } - + return super.close(); } - + /** * */ public class JavaPackage { String name; HashSet<JavaFile> classes = new HashSet<JavaFile> (); - + /** * @return the name */ public String getName() { - return name; + return this.name; } - + /** * @return the classes */ public HashSet<JavaFile> getClasses() { - return classes; + return this.classes; } } - + /** * */ @@ -392,26 +385,26 @@ String name; JInterface jInterface; JavaPackage pck; - + /** * @return the name */ public String getName() { - return name; + return this.name; } - + /** * @return the jInterface */ public JInterface getJInterface() { - return jInterface; + return this.jInterface; } - + /** * @return the pck */ public JavaPackage getPck() { - return pck; + return this.pck; } } @@ -419,18 +412,18 @@ * @return */ public IPackageFragmentRoot getPackageFragmentRoot() { - IJavaProject jp = JDTUtils.getJavaProject( compositeFile.getProject()); - IPackageFragmentRoot[] roots = jp.findPackageFragmentRoots( selectedEntry ); - + IJavaProject jp = JDTUtils.getJavaProject( this.compositeFile.getProject()); + IPackageFragmentRoot[] roots = jp.findPackageFragmentRoots( this.selectedEntry ); + if( roots.length != 0 ) return roots[ 0 ]; return null; } - + /** * @return the selected files */ public List<JavaFile> getSelectedFiles() { - return selectedFiles; + return this.selectedFiles; } } \ No newline at end of file ]]> Mon, 19 Oct 2009 07:07:05 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02483.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02482.html Author: vzurczak Date: 2009-10-13 04:55:58 -0400 (Tue, 13 Oct 2009) New Revision: 3344 Added: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ScaModelUtils.java Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.s... Author: vzurczak Date: 2009-10-13 04:55:58 -0400 (Tue, 13 Oct 2009) New Revision: 3344 Added: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ScaModelUtils.java Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/utils/JDTUtils.java org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java Log: Added utility methods. Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java 2009-09-21 11:38:01 UTC (rev 3343) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ResourceUtils.java 2009-10-13 08:55:58 UTC (rev 3344) @@ -61,19 +61,19 @@ IResource[] resources = container.members(); for (IResource resource : resources) { switch (resource.getType()) { - case IResource.FILE: - String fileExtension = resource.getFileExtension() - .toLowerCase(); - if (fileExtension.equals(extension) - || fileExtension.equals("*")) //$NON-NLS-1$ - result.add((IFile) resource); - break; - case IResource.FOLDER: - IFolder subFolder = (IFolder) resource; - result.addAll(getFiles(subFolder, extension)); - break; - default: - break; + case IResource.FILE: + String fileExtension = resource.getFileExtension() + .toLowerCase(); + if (fileExtension.equals(extension) + || fileExtension.equals("*")) //$NON-NLS-1$ + result.add((IFile) resource); + break; + case IResource.FOLDER: + IFolder subFolder = (IFolder) resource; + result.addAll(getFiles(subFolder, extension)); + break; + default: + break; } } } catch (CoreException e) { @@ -98,12 +98,12 @@ IResource[] resources = container.members(); for (IResource resource : resources) { switch (resource.getType()) { - case IResource.FOLDER: - IFolder subFolder = (IFolder) resource; - result.add(subFolder); - result.addAll(getFolders(subFolder)); - default: - break; + case IResource.FOLDER: + IFolder subFolder = (IFolder) resource; + result.add(subFolder); + result.addAll(getFolders(subFolder)); + default: + break; } } } catch (CoreException e) { @@ -122,8 +122,8 @@ public static IFile getIFileFromEditor() { try { IEditorPart editorPart = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage() - .getActiveEditor(); + .getActiveWorkbenchWindow().getActivePage() + .getActiveEditor(); return ((FileEditorInput) editorPart.getEditorInput()).getFile(); } catch (Exception e) { IStatus status = new Status( @@ -190,6 +190,10 @@ } /** + * @param container + * @param extensions + * @param resourcesToSkip + * @return * @see #getDirectValidChildren(IContainer, List) */ public static IResource[] getDirectValidChildren(IContainer container, @@ -226,7 +230,7 @@ File bundleFile; try { bundleFile = FileLocator - .getBundleFile(Platform.getBundle(pluginId)); + .getBundleFile(Platform.getBundle(pluginId)); if (bundleFile.isFile()) return bundleFile; else if (bundleFile.isDirectory()) { @@ -260,7 +264,7 @@ public static IFile getIFile(File file) { Path path = new Path(file.getAbsolutePath()); return ResourcesPlugin.getWorkspace().getRoot() - .getFileForLocation(path); + .getFileForLocation(path); } /** @@ -284,7 +288,7 @@ IProject project = currentCompositeFile.getProject(); List<IFile> compo = ResourceUtils.getFiles(project, "composite"); Iterator<IFile> composites = ScaResourceFiltersEPManager.getInstance() - .filterAllowedFiles(compo).iterator(); + .filterAllowedFiles(compo).iterator(); while (result == null && composites.hasNext()) { IFile compositeFile = composites.next(); if (compositeName.equals(compositeFile.getName())) { @@ -300,10 +304,10 @@ int i = 0; while (result == null && i < projects.length) { List<IFile> compo2 = ResourceUtils.getFiles(projects[i], - "composite"); + "composite"); Iterator<IFile> compositesIt = ScaResourceFiltersEPManager - .getInstance().filterAllowedFiles(compo2) - .iterator(); + .getInstance().filterAllowedFiles(compo2) + .iterator(); while (result == null && compositesIt.hasNext()) { IFile compositeFile = compositesIt.next(); if (compositeName.equals(compositeFile.getName())) { @@ -318,4 +322,18 @@ return result; } + + /** + * Returns an IResources corresponding to the File object. + * @param file the file + * @return an instance of IFile, or IContainer, or null if the file is not in the workspace + */ + public static IResource getResource( File file ) { + + Path path = new Path( file.getAbsolutePath()); + if( file.isFile()) + return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation( path ); + + return ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation( path ); + } } Added: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ScaModelUtils.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ScaModelUtils.java (rev 0) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common/src/org/eclipse/stp/sca/common/utils/ScaModelUtils.java 2009-10-13 08:55:58 UTC (rev 3344) @@ -0,0 +1,136 @@ +/****************************************************************************** + * Copyright (c) 2009, EBM WebSourcing + * 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: + * EBM WebSourcing - initial API and implementation + *******************************************************************************/ + +package org.eclipse.stp.sca.common.utils; + +import java.io.File; +import java.util.HashMap; + +import org.eclipse.emf.common.command.BasicCommandStack; +import org.eclipse.emf.common.util.BasicDiagnostic; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; +import org.eclipse.stp.sca.Composite; +import org.eclipse.stp.sca.DocumentRoot; +import org.eclipse.stp.sca.common.internal.Messages; +import org.eclipse.stp.sca.common.internal.builder.ScaCustomDiagnostician; +import org.eclipse.stp.sca.provider.ScaItemProviderAdapterFactory; + +/** + * A set of utility method related to the SCA meta-model. + * @author Vincent Zurczak - EBM WebSourcing + */ +public class ScaModelUtils { + + private final AdapterFactoryEditingDomain editingDomain; + + + /** + * Constructor. + */ + public ScaModelUtils() { + + ComposedAdapterFactory adapterFactory = + new ComposedAdapterFactory( ComposedAdapterFactory.Descriptor.Registry.INSTANCE ); + + adapterFactory.addAdapterFactory( new ResourceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory( new ScaItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory( new ReflectiveItemProviderAdapterFactory()); + + BasicCommandStack commandStack = new BasicCommandStack(); + this.editingDomain = new AdapterFactoryEditingDomain( + adapterFactory, commandStack, new HashMap<Resource, Boolean>()); + } + + + /** + * Loads a composite file through the SCA meta-model. + * <p> + * This method assumes the different model extensions were already registered + * in the registry instance. In Eclipse, this is done at startup. + * In stand-alone, it should be explicitly done before calling this method. + * </p> + * + * @param file the file to load + * @return the associated composite model + * @throws InvalidScaModelException if the model could not be loaded + */ + public Composite getCompositeFile( File file ) throws InvalidScaModelException { + + try { + URI uri = URI.createFileURI( file.getAbsolutePath()); + Resource resource = this.editingDomain.getResourceSet().getResource( uri, true ); + DocumentRoot root = (DocumentRoot) resource.getContents().get( 0 ); + return root.getComposite(); + + } catch( Exception e ) { + throw new InvalidScaModelException( e ); + } + } + + + /** + * Returns the editing domain used in {@link #getCompositeFile(File)}. + * @return the editingDomain + */ + public AdapterFactoryEditingDomain getEditingDomain() { + return this.editingDomain; + } + + + /** + * An exception thrown if the parsing of an SCA model file fails. + * @author Vincent Zurczak - EBM WebSourcing + */ + public static class InvalidScaModelException extends Exception { + + /** The serail ID. */ + private static final long serialVersionUID = -5305543094858796368L; + + + /** + * Constructor. + * @param sourceException the exception that triggered the creation of this exception + */ + public InvalidScaModelException( Exception sourceException ) { + setStackTrace( sourceException.getStackTrace()); + } + } + + + /** + * Validates a composite. + * @param composite the composite to validate + * @return a diagnostic + */ + public static Diagnostic validate( Composite composite ) { + + try { + return new ScaCustomDiagnostician().validate( composite.eContainer() ); + + } catch( Exception e ) { + + // Exception if a promote only defines the component + return new BasicDiagnostic ( + Diagnostic.ERROR, + e.getMessage(), + 0, + Messages.ScaIncrementalBuilder_3, + new Object[ 0 ] + ); + } + } +} Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/utils/JDTUtils.java =================================================================== --- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/utils/JDTUtils.java 2009-09-21 11:38:01 UTC (rev 3343) +++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/utils/JDTUtils.java 2009-10-13 08:55:58 UTC (rev 3344) @@ -86,12 +86,13 @@ return classes; } + /** + * @param _resources * @param resources * @return */ - public static IResource[] removeResourceFromBinaryFolders( - IResource[] _resources) { + public static IResource[] removeResourceFromBinaryFolders( IResource[] _resources ) { Map<IProject, IJavaProject> projects = new HashMap<IProject, IJavaProject>(); List<IResource> toKeep = new ArrayList<IResource>(); @@ -107,8 +108,7 @@ continue; } - // Get Java project and make sure the resource is not in an output - // folder + // Get Java project and make sure the resource is not in an output folder try { if (p.hasNature(JavaCore.NATURE_ID)) { IJavaProject jp = projects.get(p); @@ -131,6 +131,7 @@ return toKeep.toArray(result); } + /** * Get the referenced projects from a Java project. * <p> @@ -159,7 +160,7 @@ for (String projectName : projectNames) { IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(projectName); + .getProject(projectName); try { if (!project.exists() || !project.isOpen() || !project.hasNature(JavaCore.NATURE_ID)) @@ -177,6 +178,7 @@ return result; } + /** * Get the referenced projects from a Java project. * <p> @@ -206,14 +208,14 @@ return result; } + /** * Get the class path from Java project. * * @param javaProject * @return the class path as a list of string locations. */ - public static List<String> getClasspath(IJavaProject javaProject, - boolean getReferencedProjectClasspath) { + public static List<String> getClasspath(IJavaProject javaProject, boolean getReferencedProjectClasspath) { List<String> paths = new ArrayList<String>(); try { @@ -223,31 +225,31 @@ for (IClasspathEntry entry : entries) { switch (entry.getEntryKind()) { - case IClasspathEntry.CPE_PROJECT: - if (!getReferencedProjectClasspath) - break; + case IClasspathEntry.CPE_PROJECT: + if (!getReferencedProjectClasspath) + break; - String projectName = entry.getPath().toString(); - IProject project = ResourcesPlugin.getWorkspace() - .getRoot().getProject(projectName); - IJavaProject jProject = JavaCore.create(project); + String projectName = entry.getPath().toString(); + IProject project = ResourcesPlugin.getWorkspace() + .getRoot().getProject(projectName); + IJavaProject jProject = JavaCore.create(project); - List<String> subPaths = getClasspath(jProject, true); - paths.addAll(subPaths); - break; + List<String> subPaths = getClasspath(jProject, true); + paths.addAll(subPaths); + break; - case IClasspathEntry.CPE_LIBRARY: - String path = entry.getPath().toString(); - paths.add(path); - break; + case IClasspathEntry.CPE_LIBRARY: + String path = entry.getPath().toString(); + paths.add(path); + break; - case IClasspathEntry.CPE_VARIABLE: - entry = JavaCore.getResolvedClasspathEntry(entry); - if (entry != null) { - path = entry.getPath().toString(); - paths.add(path); - } - break; + case IClasspathEntry.CPE_VARIABLE: + entry = JavaCore.getResolvedClasspathEntry(entry); + if (entry != null) { + path = entry.getPath().toString(); + paths.add(path); + } + break; } } } @@ -259,6 +261,7 @@ return paths; } + /** * @param project * an IProject instance @@ -277,6 +280,7 @@ return null; } + /** * @param qualifiedName * the Java qualified name @@ -287,11 +291,12 @@ int index = qualifiedName.lastIndexOf('.'); if (index < 0) return new String[] { "", qualifiedName }; //$NON-NLS-1$ - else - return new String[] { qualifiedName.substring(0, index), - qualifiedName.substring(index + 1) }; + + return new String[] { qualifiedName.substring(0, index), + qualifiedName.substring(index + 1) }; } + /** * @param name * @param eo @@ -314,6 +319,7 @@ return null; } + /** * Checks whether the given class implements all the super interfaces. * <p> @@ -334,10 +340,11 @@ String className, List<String> superClassNames) { String[] scn = superClassNames.toArray(new String[superClassNames - .size()]); + .size()]); return implementsOrExtendsAll(javaProject, className, scn); } + /** * Checks whether the given class implements all the super interfaces. * <p> @@ -390,6 +397,7 @@ return notImplemented; } + /** * Computes the class name from the given parameter. * <p> @@ -443,6 +451,13 @@ return null; } + + /** + * + * @param transfer + * @param tmpFile + * @return + */ public static IResource copyFileEnclosedInJar(JarEntryFile transfer, java.io.File tmpFile) { IResource result = null; @@ -460,6 +475,13 @@ return result; } + + /** + * + * @param in + * @param tmpFile + * @return + */ private static boolean copyFile(InputStream in, java.io.File tmpFile) { boolean result = false; FileOutputStream out = null; @@ -493,4 +515,25 @@ return result; } + + /** + * Gets the source folders of a IJavaProject. + * @param javaProject + * @return the list of source folders in this Java project + */ + public static List<IClasspathEntry> getSourceFolders( IJavaProject javaProject ) { + + List<IClasspathEntry> result = new ArrayList<IClasspathEntry>(); + try { + for( IClasspathEntry entry : javaProject.getRawClasspath()) { + if( entry.getEntryKind() == IClasspathEntry.CPE_SOURCE ) + result.add( entry ); + } + + } catch( JavaModelException e ) { + e.printStackTrace(); + } + + return result; + } } ]]> Tue, 13 Oct 2009 08:55:58 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02482.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02481.html Author: azoppello Date: 2009-10-08 03:54:07 -0400 (Thu, 08 Oct 2009) New Revision: 2978 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java Log: Modified: org.eclipse.stp.model... Author: azoppello Date: 2009-10-08 03:54:07 -0400 (Thu, 08 Oct 2009) New Revision: 2978 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java Log: Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java =================================================================== --- org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java 2009-10-05 14:50:48 UTC (rev 2977) +++ org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java 2009-10-08 07:54:07 UTC (rev 2978) @@ -79,10 +79,10 @@ } WorkspaceModifyOperation operationFixBpmnDiagram = new FixBpmnDiagramAction(bpmnFile, idSelectedPools); - PlatformUI.getWorkbench().getProgressService().run(true, false, operationFixBpmnDiagram); + PlatformUI.getWorkbench().getProgressService().run(false, false, operationFixBpmnDiagram); WorkspaceModifyOperation createIMOperation = new Bpmn2ImWorkspaceOperation(bpmnFile, idSelectedPools); - PlatformUI.getWorkbench().getProgressService().run(true, false, createIMOperation); + PlatformUI.getWorkbench().getProgressService().run(false, false, createIMOperation); MessageDialog.openInformation(shell, "Information", ]]> Thu, 08 Oct 2009 07:54:08 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02481.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02480.html Author: azoppello Date: 2009-10-05 10:50:48 -0400 (Mon, 05 Oct 2009) New Revision: 2977 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java org.eclipse.stp.model/trunk/org.ecli... Author: azoppello Date: 2009-10-05 10:50:48 -0400 (Mon, 05 Oct 2009) New Revision: 2977 Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java Log: Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java =================================================================== --- org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java 2009-09-30 09:34:37 UTC (rev 2976) +++ org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java 2009-10-05 14:50:48 UTC (rev 2977) @@ -109,9 +109,11 @@ public static IStatus makeStatus(Throwable x) { - return new Status(IStatus.ERROR, Bpmn2ImActivator.PLUGIN_ID, - IStatus.ERROR, x.getMessage(), null); + return new Status(IStatus.ERROR, Bpmn2ImActivator.PLUGIN_ID, IStatus.ERROR, + (x.getMessage() != null) ? x.getMessage() + : (x.getCause() != null) ? x.getCause().getMessage() : "", null); + } public final void selectionChanged(final IAction action, Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java =================================================================== --- org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java 2009-09-30 09:34:37 UTC (rev 2976) +++ org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java 2009-10-05 14:50:48 UTC (rev 2977) @@ -9,34 +9,26 @@ *******************************************************************************/ package org.eclipse.stp.im.tool.in.bpmneditor.action; -import java.lang.reflect.InvocationTargetException; import java.util.Collections; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.stp.bpmn.BpmnDiagram; -import org.eclipse.stp.im.constants.ImConstants; import org.eclipse.stp.im.tool.in.bpmneditor.BpmnEditorExtensionActivator; import org.eclipse.stp.im.tool.in.bpmneditor.dialog.BpmnImVersionDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.actions.WorkspaceModifyOperation; public class VersionBpmnDiagramAction implements IObjectActionDelegate { @@ -133,11 +125,11 @@ public static IStatus makeStatus(Throwable x) { - return new Status(IStatus.ERROR, - BpmnEditorExtensionActivator.PLUGIN_ID, - IStatus.ERROR, - x.getMessage(), null); + return new Status(IStatus.ERROR, BpmnEditorExtensionActivator.PLUGIN_ID, IStatus.ERROR, + (x.getMessage() != null) ? x.getMessage() + : (x.getCause() != null) ? x.getCause().getMessage() : "", null); + } } ]]> Mon, 05 Oct 2009 14:50:49 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02480.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02479.html Author: ohurley Date: 2009-09-30 09:00:25 -0400 (Wed, 30 Sep 2009) New Revision: 2945 Added: build/branches/3.6M2/ Log: Helios M2 Copied: build/branches/3.6M2 (from rev 2944, build/trunk) Author: ohurley Date: 2009-09-30 09:00:25 -0400 (Wed, 30 Sep 2009) New Revision: 2945 Added: build/branches/3.6M2/ Log: Helios M2 Copied: build/branches/3.6M2 (from rev 2944, build/trunk) ]]> Wed, 30 Sep 2009 13:00:25 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02479.html genie@xxxxxxx (genie) http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02478.html Author: ohurley Date: 2009-09-30 08:59:39 -0400 (Wed, 30 Sep 2009) New Revision: 2944 Modified: build/trunk/stp/stp.rmap Log: Helios M2 Modified: build/trunk/stp/stp.rmap =================================================================== --- build/trunk/s... Author: ohurley Date: 2009-09-30 08:59:39 -0400 (Wed, 30 Sep 2009) New Revision: 2944 Modified: build/trunk/stp/stp.rmap Log: Helios M2 Modified: build/trunk/stp/stp.rmap =================================================================== --- build/trunk/stp/stp.rmap 2009-09-22 12:43:06 UTC (rev 2943) +++ build/trunk/stp/stp.rmap 2009-09-30 12:59:39 UTC (rev 2944) @@ -22,7 +22,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/trunk/features/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/tags/3.6M2/features/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -36,7 +36,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/trunk/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/tags/3.6M2/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -50,7 +50,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/trunk/samples/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/tags/3.6M2/samples/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -65,7 +65,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.bpmn-modeler/org.eclipse.stp.bpmn/trunk/features/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.bpmn-modeler/org.eclipse.stp.bpmn/tags/3.6M2/features/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -79,7 +79,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.bpmn-modeler/org.eclipse.stp.bpmn/trunk/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.bpmn-modeler/org.eclipse.stp.bpmn/tags/3.6M2/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -93,7 +93,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.policy-editor/org.eclipse.stp.policy/trunk/features/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.policy-editor/org.eclipse.stp.policy/tags/3.6M2/features/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -107,7 +107,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.policy-editor/org.eclipse.stp.policy/trunk/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.policy-editor/org.eclipse.stp.policy/tags/3.6M2/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -121,7 +121,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.intermediate-model/org.eclipse.stp.model/trunk/features/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.intermediate-model/org.eclipse.stp.model/tags/3.6M2/features/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -135,7 +135,7 @@ </uri> </provider> <provider readerType="svn" componentTypes="osgi.bundle,buckminster" mutable="true" source="true"> - <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.intermediate-model/org.eclipse.stp.model/trunk/{0}";> + <uri format="http://dev.eclipse.org/svnroot/stp/org.eclipse.stp.intermediate-model/org.eclipse.stp.model/tags/3.6M2/{0}";> <bc:propertyRef key="buckminster.component" /> </uri> </provider> @@ -143,7 +143,7 @@ <searchPath name="orbit"> <provider readerType="eclipse.import" componentTypes="osgi.bundle" mutable="false" source="false"> - <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/orbitBundles-R20090529135407.map"; /> + <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/orbitBundles-R20090825191606.map"; /> </provider> </searchPath> ]]> Wed, 30 Sep 2009 12:59:39 GMT http://dev.eclipse.org/mhonarc/lists/stp-commits/msg02478.html genie@xxxxxxx (genie)