This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 128649 - Merge Markers lost enum declared parameters
Summary: Merge Markers lost enum declared parameters
Status: VERIFIED FIXED
Alias: None
Product: uml
Classification: Unclassified
Component: Code Generation (show other bugs)
Version: 6.x
Hardware: All All
: P1 blocker (vote)
Assignee: Viktor Lapitski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-02-28 01:30 UTC by dleon
Modified: 2008-03-04 05:09 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description dleon 2008-02-28 01:30:38 UTC 
==Before==
public enum xType{
    x1("x111","more.."),
    x2("x222","more.."),
    x3("x222","more..");

private xType(String str1, String str2){...}

...


==Action==

UML project node -> Generate Code ... -> (enable) Add Merge Markers to Existing Source Elements -> OK 

==After==
public enum xType{
// <editor-fold defaultstate="collapsed" desc=" UML Marker "> 
// #[regen=yes,id=DCE.7B788E9B-0EC5-5808-8709-980E20CBD0CD]
// </editor-fold>
    x1,
// <editor-fold defaultstate="collapsed" desc=" UML Marker "> 
// #[regen=yes,id=DCE.7B788E9B-0EC5-5808-8709-980E20CBD0CD]
// </editor-fold>
    x2,
// <editor-fold defaultstate="collapsed" desc=" UML Marker "> 
// #[regen=yes,id=DCE.7B788E9B-0EC5-5808-8709-980E20CBD0CD]
// </editor-fold>
    x3;

private xType(String str1, String str2){...}

...


Then the declared parameters are gone.
Comment 1 Viktor Lapitski 2008-02-28 02:24:55 UTC 
The reason isn't the merge markers itself. Generation of the new code without the markers 
would produce the same result. The information about parameters is absent in the model 
as UML RE omits the parameters because in UML literals don't have parameters.
Comment 2 Viktor Lapitski 2008-02-28 08:59:51 UTC 
Fixed. The enum literal arguments are REed and stored in "JavaEnumLiteralArguments" tagged value 
of the literal. User can edit it there as well, and code generation would pick it from there.

changeset:   70293:8d33a3f2698b
tag:         tip
user:        lvv@netbeans.org
date:        Thu Feb 28 00:47:15 2008 -0800
summary:     Fix for 128649 Merge Markers lost enum declared parameters

and

Checking in uml/codegen/src/org/netbeans/modules/uml/codegen/resources/templates
/java/DeclLib_ftl;
/cvs/uml/codegen/src/org/netbeans/modules/uml/codegen/resources/templates/java/A
ttic/DeclLib_ftl,v  <--  DeclLib_ftl
new revision: 1.7.6.5; previous revision: 1.7.6.4
done
Checking in uml/core/src/org/netbeans/modules/uml/core/reverseengineering/reinte
gration/UMLParsingIntegrator.java;
/cvs/uml/core/src/org/netbeans/modules/uml/core/reverseengineering/reintegration
/Attic/UMLParsingIntegrator.java,v  <--  UMLParsingIntegrator.java
new revision: 1.7.2.8; previous revision: 1.7.2.7
done
Checking in uml/core/src/org/netbeans/modules/uml/core/reverseengineering/parsin
gfacilities/translation/statehandlers/EnumMemberStateHandler.java;
/cvs/uml/core/src/org/netbeans/modules/uml/core/reverseengineering/parsingfacili
ties/translation/statehandlers/Attic/EnumMemberStateHandler.java,v  <--  EnumMem
berStateHandler.java
new revision: 1.2.6.3; previous revision: 1.2.6.2
Comment 3 Peter Lam 2008-03-04 05:09:30 UTC 
verified fixed in latest 6.1 M2 build. The enum parameters are no longer lost during reverse engineering and code
regeneration.