Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 332962

Summary: [console] Query Delegate Text Viewer for OCL
Product: [Modeling] OCL Reporter: Kenn Hussey <Kenn.Hussey>
Component: CoreAssignee: OCL Inbox <mdt-ocl-inbox>
Status: CLOSED FIXED QA Contact:
Severity: enhancement    
Priority: P3 CC: adolfosbh, ed, jon, lothar
Version: 3.1.0Flags: ed: indigo+
Target Milestone: 3.1.0   
Hardware: PC   
OS: Mac OS X - Carbon (unsup.)   
Whiteboard: Usability
Bug Depends on: 332961    
Bug Blocks:    
Attachments:
Description Flags
ocl query delegate text viewer
none
updated patch
adolfosbh: iplog+, Kenn.Hussey: review?, adolfosbh: review+
screen shot none

Description Kenn Hussey CLA 2010-12-20 12:36:09 EST
Provide a query delegate text viewer implementation (and factory) which adapts the source viewer of the OCL interpreter (interactive console) example for use within the EMF Ecore data set editor.
Comment 1 Kenn Hussey CLA 2010-12-20 14:01:31 EST
Created attachment 185585 [details]
ocl query delegate text viewer

Here are changes to the OCL console example which adapt its source editor as a query delegate text viewer; see corresponding patch attached to bug 332961 for details.
Comment 2 Ed Willink CLA 2010-12-21 04:42:36 EST
This patch is nice and simple and only affects examples so no fundamental problem. We have the practical problem again of waiting for an EMF I-build.

Where can I tell that it's working? does the OCL console suddenly provide a proxy editor for an EAnnotation in the Sample Ecore Editor or ...?

The overridden createHelper is not very elegant; the override is for an initialization, rather than helper creation so perhaps an initEnvironment() would be more focussed. But I can't see any reason why the derived code should not be present directly by adding an OCLDocument.setParameters. Existing users will see an empty parameter list, new usage has the opportunity for 'global' variables as well as context.

Adding setParameters might go hand in hand with solving the missing 'Load Resource...' functionality.

[Patch also needs some @since 3.1's]
Comment 3 Kenn Hussey CLA 2010-12-21 09:29:46 EST
(In reply to comment #2)
> This patch is nice and simple and only affects examples so no fundamental
> problem. We have the practical problem again of waiting for an EMF I-build.

I'll create an integration build of EMF as soon as Ed (Merks) has reviewed the changes there, hopefully sometime today.

> Where can I tell that it's working? does the OCL console suddenly provide a
> proxy editor for an EAnnotation in the Sample Ecore Editor or ...?

Right now it surfaces in the EMF ODA data set editor, accessible from BIRT. I'll be posting instructions on how to try it out at some point in the near future...

> The overridden createHelper is not very elegant; the override is for an
> initialization, rather than helper creation so perhaps an initEnvironment()
> would be more focussed. But I can't see any reason why the derived code should
> not be present directly by adding an OCLDocument.setParameters. Existing users
> will see an empty parameter list, new usage has the opportunity for 'global'
> variables as well as context.

OK, I'll add setParameters to the document class and attach a new patch.

> [Patch also needs some @since 3.1's]

I'll add those and the missing references to this bug number as well.
Comment 4 Kenn Hussey CLA 2010-12-21 11:09:05 EST
Created attachment 185646 [details]
updated patch

Here's an updated version of the patch which (I hope) addresses your concerns. I'll let you know once the EMF changes have been committed and an integration build is available.
Comment 5 Ed Willink CLA 2010-12-21 11:48:07 EST
Looks good. +1.

It would be nice to see it in action before committing it.
Comment 6 Kenn Hussey CLA 2010-12-21 11:52:33 EST
(In reply to comment #5)
> Looks good. +1.

Thanks!!!

> It would be nice to see it in action before committing it.

Would screen shots suffice? Or would you like to do a Skype demo?

I'll try to find time to write up the steps for trying it out, but I'd like to have an integration build with the changes by the end of this week if possible, so I'm not sure whether time will permit...
Comment 7 Kenn Hussey CLA 2010-12-21 13:02:24 EST
The changes to org.eclipse.emf.edit.ui have been committed. I'll initiate an integration build now...
Comment 8 Adolfo Sanchez-Barbudo Herrera CLA 2010-12-21 13:35:50 EST
Kenn,

I would also like to see the resulting UI of these changes. 

P.S: As soon as the code is in the CVS your requested Integration build could be made quickly. We got a failure in our last nightly build, but it seems that it was due to build servers issues.

Cheers,
Adolfo.
Comment 9 Kenn Hussey CLA 2010-12-21 13:56:18 EST
Created attachment 185660 [details]
screen shot

Here's a screen shot showing the integrated OCL text viewer in action.
Comment 10 Ed Willink CLA 2010-12-21 14:28:56 EST
Thanks. That makes more sense now.

As and when the Xtext editor takes over it should be arther similar but with configurable coloring and more features.

Adolfo: Are you happy for a commit?
Comment 11 Kenn Hussey CLA 2010-12-21 15:20:50 EST
An integration build containing the EMF changes is now available.
Comment 12 Adolfo Sanchez-Barbudo Herrera CLA 2010-12-21 16:41:46 EST
(In reply to comment #10)
> Thanks. That makes more sense now.
> 
> As and when the Xtext editor takes over it should be arther similar but with
> configurable coloring and more features.
> 
> Adolfo: Are you happy for a commit?

I'm not unhappy with it ;=). When I reviewed the code at work I didn't found any strange thing.

Go ahead with the commit, and I'll prepare the build tomorrow.

Regards,
Adolfo.
Comment 13 Adolfo Sanchez-Barbudo Herrera CLA 2010-12-22 07:21:28 EST
Ed,

I've committed the changes to the CVS so that we may prepare the I-build.

Cheers,
Adolfo
Comment 14 Adolfo Sanchez-Barbudo Herrera CLA 2010-12-22 09:37:09 EST
Ooops, I forgot to resolve.

Commited to CVS HEAD. It will be avaiable in the next M5 (and I-builds ;) )

P.S: Kenn, our p2 repo URL corresponding to the last successful integration build:  http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/3.1.0
Comment 15 Kenn Hussey CLA 2010-12-22 10:23:31 EST
(In reply to comment #14)
> Ooops, I forgot to resolve.
> 
> Commited to CVS HEAD. It will be avaiable in the next M5 (and I-builds ;) )

Thanks!

> P.S: Kenn, our p2 repo URL corresponding to the last successful integration
> build:  http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/3.1.0

Uh, is that where you place integration builds? Or did you mean http://download.eclipse.org/modeling/mdt/ocl/updates/integration/3.1.0?
Comment 16 Adolfo Sanchez-Barbudo Herrera CLA 2010-12-22 10:33:50 EST
Sorry Kenn,

The following is the correct one. Let me know if it works well:

http://download.eclipse.org/modeling/mdt/ocl/updates/interim/3.1.0

Regards,
Adolfo.
Comment 17 Ed Willink CLA 2011-05-27 03:13:18 EDT
Closing