equal
deleted
inserted
replaced
172 layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
172 layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
173 hasHorizontalScrollBar: false |
173 hasHorizontalScrollBar: false |
174 hasVerticalScrollBar: false |
174 hasVerticalScrollBar: false |
175 autoHideScrollBars: false |
175 autoHideScrollBars: false |
176 hasBorder: false |
176 hasBorder: false |
177 component: #'Tools::Diff3CodeView2' |
177 component: diffView |
178 postBuildCallback: postBuildDiffView: |
178 postBuildCallback: postBuildDiffView: |
179 ) |
179 ) |
180 ) |
180 ) |
181 |
181 |
182 ) |
182 ) |
691 |
691 |
692 "Created: / 19-03-2012 / 11:47:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
692 "Created: / 19-03-2012 / 11:47:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
693 "Modified: / 30-11-2012 / 13:47:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
693 "Modified: / 30-11-2012 / 13:47:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
694 ! ! |
694 ! ! |
695 |
695 |
|
696 !TextDiff3Tool methodsFor:'initialization'! |
|
697 |
|
698 initializeDiffView |
|
699 "superclass Tools::TextDiffTool says that I am responsible to implement this method" |
|
700 |
|
701 ^ Tools::Diff3CodeView2 new |
|
702 |
|
703 "Modified: / 16-01-2013 / 09:52:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
704 ! ! |
|
705 |
696 !TextDiff3Tool methodsFor:'menu actions'! |
706 !TextDiff3Tool methodsFor:'menu actions'! |
697 |
707 |
698 doMergeAllAuto |
708 doMergeAllAuto |
699 self mergeDataHolder value |
709 self mergeDataHolder value |
700 text1:self textC |
710 text1:self textC |
706 |
716 |
707 doMergeAllExternal |
717 doMergeAllExternal |
708 | left wc right merge | |
718 | left wc right merge | |
709 |
719 |
710 left := Filename newTemporary. |
720 left := Filename newTemporary. |
711 left writingFileDo:[:s|s nextPutAll: self textC]. |
721 left writingFileDo:[:s|s nextPutAll: self textC ? '']. |
712 |
722 |
713 wc := Filename newTemporary. |
723 wc := Filename newTemporary. |
714 wc writingFileDo:[:s|s nextPutAll: self textA]. |
724 wc writingFileDo:[:s|s nextPutAll: self textA ? '']. |
715 |
725 |
716 right := Filename newTemporary. |
726 right := Filename newTemporary. |
717 right writingFileDo:[:s|s nextPutAll: self textB]. |
727 right writingFileDo:[:s|s nextPutAll: self textB ? '']. |
718 |
728 |
719 merge := Filename newTemporary. |
729 merge := Filename newTemporary. |
720 |
730 |
721 [ |
731 [ |
722 (OperatingSystem executeCommand: |
732 (OperatingSystem executeCommand: |
735 wc remove. |
745 wc remove. |
736 right remove. |
746 right remove. |
737 merge exists ifTrue:[merge remove]. |
747 merge exists ifTrue:[merge remove]. |
738 ] |
748 ] |
739 |
749 |
740 "Modified: / 30-11-2012 / 14:13:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
750 "Modified: / 16-01-2013 / 10:02:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
741 ! |
751 ! |
742 |
752 |
743 doMergeAllUsingA |
753 doMergeAllUsingA |
744 self mergeData mergeUsingA: self textA |
754 self mergeData mergeUsingA: self textA |
745 |
755 |
1087 ! ! |
1097 ! ! |
1088 |
1098 |
1089 !TextDiff3Tool class methodsFor:'documentation'! |
1099 !TextDiff3Tool class methodsFor:'documentation'! |
1090 |
1100 |
1091 version_SVN |
1101 version_SVN |
1092 ^ '$Id: Tools__TextDiff3Tool.st 8086 2013-01-15 12:03:21Z vranyj1 $' |
1102 ^ '$Id: Tools__TextDiff3Tool.st 8087 2013-01-16 11:53:38Z vranyj1 $' |
1093 ! ! |
1103 ! ! |