Community
Participate
Working Groups
Hi, it's a common practice to distinguish fully generated code from user code with different source folders. Operations package is a kind of mixed generated/user code since the generated skeletons always have to be completed with user code. Do you think you could provide a new option similar to the "Model/Model Directory" option allowing to generate the Operations package in a separate source folder? Best regards, Sebastien
That sounds like an interesting enhancement; contributions are most welcome!
Created attachment 272142 [details] Patch proposal for operation folder selection in UML2 genmodel
(In reply to Sebastien Revol from comment #2) > Created attachment 272142 [details] > Patch proposal for operation folder selection in UML2 genmodel Hi Kenn, here is a patch proposal. (Are you using gerrit?) Basically, I updated UML2 GenModel.ecore to add a "operationsFolder" feature to the GenModel EClass. I also added this feature in the "UML2" category in GenModel.genmodel. (Sorry I directly modified the ecore model since I don't have Rose). I chose to call the new attribute "operations*Folder*" to limit confusion with the "directory" attributes we have for model/edit/editor. Indeed, unlike the directory attributes, this operationFolder path should be relative the first segment of the "modelDirectory" value, since the code will be always generated in the model project. (Supporting the capability to define a new operation plugin looked much more complex to implement). Then the feature is implemented in three main steps : -I modified UML2GenClassGeneratorAdapter.java to call a new org.eclipse.uml2.codegen.ecore.genmodel.util.UML2GenModelUtil.getOperationsFolderPath(GenModel) to generate the Operations class in the correct folder -I defined a GenModelGeneratorAdapter.java class to override EMF default adapter, just adding the new operation folder ClassPathEntry in the java project (and updated the GenModelGeneratorAdapterFactory accordingly). I had to duplicate a little piece of code from EMF to compare ClassPathEntries in a custom UniqueEList implementation. -I overrode org.eclipse.uml2.codegen.ecore.genmodel.impl.GenModelImpl.getModelSourceFolders() in order to add the operationsFolder. This method is used by the Build.properties generator. I tested the patch on the master branch with Photon M4. I noticed some generated code differences (even using the UML2 code formatter). Hence, tried to put in the patch only my modifications : to test it, you should apply it first and then regenerate the code. I hope you will find it ok. Best regards, Seb
(In reply to comment #3) > (In reply to Sebastien Revol from comment #2) > > Created attachment 272142 [details] > > Patch proposal for operation folder selection in UML2 genmodel > > Hi Kenn, here is a patch proposal. (Are you using gerrit?) Thanks for the contribution, Sebastien! I'll take a look as soon as possible and get back to you with any feedback I have. Gerrit hasn't been set up for the UML2 project (yet), but I've just submitted a request to do so (see Bug 529533).
(In reply to comment #3) > Basically, I updated UML2 GenModel.ecore to add a "operationsFolder" feature to > the GenModel EClass. I also added this feature in the "UML2" category in > GenModel.genmodel. (Sorry I directly modified the ecore model since I don't have > Rose). No worries, we stopped using the Rose model as the source of truth for the model years ago. ;) > I noticed some generated code differences (even using the UML2 code formatter). I regenerated the code based on latest EMF changes (and updated the UML2 code formatter profile while I was at it) to provide a new baseline that will help highlight which changes are related to this contribution. > Hence, tried to put in the patch only my modifications : to test it, you should > apply it first and then regenerate the code. > > I hope you will find it ok. I've applied your changes against the new baseline (see above) and regenerated the code. So far, everything looks really good! I'll spend some time testing it and then commit/push the changes.
(In reply to Kenn Hussey from comment #5) > I've applied your changes against the new baseline (see above) and > regenerated the code. So far, everything looks really good! I'll spend some > time testing it and then commit/push the changes. Great, thanks! Alternatively, if you want, I can also re-push the patch on gerrit now that it's available. It would probably require to commit first your generated code and formatter updates before, but no pb for me. Seb
I committed/pushed the changes to the 'master' branch in git. I ended up refactoring the contribution a little bit for consistency, string safety, and completeness (which included adding a description for the new generator model property and ensuring the operations folder is added as a source folder in cases where the edit and editor plugins are the same as the model). Thanks again!
(In reply to Kenn Hussey from comment #7) > I committed/pushed the changes to the 'master' branch in git. > > I ended up refactoring the contribution a little bit for consistency, string > safety, and completeness (which included adding a description for the new > generator model property and ensuring the operations folder is added as a > source folder in cases where the edit and editor plugins are the same as the > model). > > Thanks again! Perfect, I'm happy it was useful!
The changes are now available in a UML2 5.4.0 integration build.
The changes are available in UML2 5.4.0 (as part of the simultaneous Eclipse Photon release).
