<commit_before>---

Copyright 2014 Mentor Graphics Corp.  All Rights Reserved.

---

# Proxy merge issues
### xtUML Project Review Minutes

Reviewed:  https://github.com/xtuml/internal/blob/master/doc-internal/notes/244_class_merge/244_class_merge.dnt.md
           480cc6649d2a0ee8780e85422705be1ca4b5f096
Present:  Bob,Keith,Travis

<pre>

-- Num Type  Who  Section  Comment
x- 01  min   SKB  [2]      Wrong CQ number
x- 02  min   bob  4        formatting problem
x- 03  min   trl  7.2      This is only when it is in a compare situation (when it is a compare root)
x- 04  min   bob  7.4      "not elements " -> "not all elements "
x- 05  min   bob  7.5      Make sure there is documentation for this debug flag.  Perhaps we should add
                           a preference (or something like that) to turn this debug flag on (that could make it 
						   self-documenting).
x- 06  min   tlr  8.1      The first stepsshould say that it is a class file referring to another class (it
                            is a RGO)
X- 07  min   skb  8.3      Add an expected result after the "undo" step
x- 08  min   bob  8.4      This should call out that this has to start with 2 states and a transition between the 2 states.


</pre>
   
No major observations, a re-review is not required.


End
---<commit_msg>#244 Competed the code review <commit_after>---

Copyright 2014 Mentor Graphics Corp.  All Rights Reserved.

---

# Proxy merge issues
### xtUML Project Review Minutes

Reviewed:  https://github.com/xtuml/internal/blob/master/doc-internal/notes/244_class_merge/244_class_merge.dnt.md
           480cc6649d2a0ee8780e85422705be1ca4b5f096
Present:  Bob,Keith,Travis

<pre>

-- Num Type  Who  Section  Comment
x- 01  min   SKB  [2]      Wrong CQ number
x- 02  min   bob  4        formatting problem
x- 03  min   trl  7.2      This is only when it is in a compare situation (when it is a compare root)
x- 04  min   bob  7.4      "not elements " -> "not all elements "
x- 05  min   bob  7.5      Make sure there is documentation for this debug flag.  Perhaps we should add
                           a preference (or something like that) to turn this debug flag on (that could make it 
						   self-documenting).
x- 06  min   tlr  8.1      The first stepsshould say that it is a class file referring to another class (it
                            is a RGO)
X- 07  min   skb  8.3      Add an expected result after the "undo" step
x- 08  min   bob  8.4      This should call out that this has to start with 2 states and a transition between the 2 states.


Code Review on branch 244_class_merge_2 (Bob, Keith, Travis)
-----------
1) MergeWorkbenchAdvisor.java   Think about if perhaps this can/should be refactored and shared with the similar code in 
                                model.compare/ModelMErgeProcessor.java so there is not duplications.
                                It is not completely duplicate, but it may be good to do something to show that 
                                the 2 places are similar so when one is modified the other s not missed.
2) ModelMergeProcessor.java::adjustPersistenceOrdering() - the new parameter that was added is not being used, 
                              remove it.                                
3) ModelMergeProcessor.java::handlePostCreation() - Around line 727 where there 
                              is a test for NoEventTransition, investigate to see if we need a similar test for
                              creation transition.
4) ModelMergeProcessor.java::line 813 - Investigate this change and retest 
5) ModelCompareContentProvider.java:getChildren()   - Stopped using getLoadedGraphicalModelsForElements, but not sure why.  Investigate.           
6) ModelCompareContentProvider.java::getAdjustedLocationForSlot - This was modified to fix the
                             ordering issue that Bob saw while onsite in Montreal.  The
                             document is not currently describing this and needs to.
                             Code should also be commented better.
7) ModelStructureDiffViewer.java::inputChanged() - After the refresh, investigate 
                             to see if we should test again to see if the tree 
                             was disposed.                               
</pre>
   
No major observations, a re-review is not required.


End
---
{'fraction_non_alphanumeric': 0.05491990846681922, 'fraction_numerical': 0.03638443935926773, 'mean_word_length': 2.0144827586206895, 'pattern_counts': {'":': 0, '<': 7, '<?xml version=': 0, '>': 9, 'https://': 2, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 6, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5216460', 'n_tokens_mistral': 1296, 'n_tokens_neox': 1171, 'n_words': 532}