624 |
624 |
625 codeAspectHolder |
625 codeAspectHolder |
626 "return/create the 'codeAspectHolder' value holder (automatically generated)" |
626 "return/create the 'codeAspectHolder' value holder (automatically generated)" |
627 |
627 |
628 codeAspectHolder isNil ifTrue:[ |
628 codeAspectHolder isNil ifTrue:[ |
629 codeAspectHolder := ValueHolder with: #expression. |
629 codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression). |
|
630 codeAspectHolder addDependent:self |
630 ]. |
631 ]. |
631 ^ codeAspectHolder |
632 ^ codeAspectHolder |
632 |
633 |
633 "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
634 "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
635 "Modified: / 27-07-2012 / 23:46:11 / cg" |
634 ! |
636 ! |
635 |
637 |
636 codeAspectHolder:something |
638 codeAspectHolder:something |
637 "set the 'codeAspectHolder' value holder (automatically generated)" |
639 "set the 'codeAspectHolder' value holder (automatically generated)" |
638 |
640 |
|
641 codeAspectHolder notNil ifTrue:[ |
|
642 codeAspectHolder removeDependent:self |
|
643 ]. |
639 codeAspectHolder := something. |
644 codeAspectHolder := something. |
|
645 codeAspectHolder notNil ifTrue:[ |
|
646 codeAspectHolder addDependent:self |
|
647 ]. |
|
648 |
|
649 "Modified: / 27-07-2012 / 22:55:42 / cg" |
640 ! |
650 ! |
641 |
651 |
642 diffSpecHolder |
652 diffSpecHolder |
643 "return/create the 'diffSpecHolder' value holder (automatically generated)" |
653 "return/create the 'diffSpecHolder' value holder (automatically generated)" |
644 |
654 |
867 "Created: / 27-07-2012 / 21:56:48 / cg" |
877 "Created: / 27-07-2012 / 21:56:48 / cg" |
868 ! |
878 ! |
869 |
879 |
870 update:something with:aParameter from:changedObject |
880 update:something with:aParameter from:changedObject |
871 "Invoked when an object that I depend upon sends a change notification." |
881 "Invoked when an object that I depend upon sends a change notification." |
872 |
|
873 |
882 |
874 changedObject == textAHolder ifTrue:[ |
883 changedObject == textAHolder ifTrue:[ |
875 textAChanged := true. |
884 textAChanged := true. |
876 self updateAfterAorBChanged. |
885 self updateAfterAorBChanged. |
877 ^ self. |
886 ^ self. |
879 changedObject == textBHolder ifTrue:[ |
888 changedObject == textBHolder ifTrue:[ |
880 textBChanged := true. |
889 textBChanged := true. |
881 self updateAfterAorBChanged. |
890 self updateAfterAorBChanged. |
882 ^ self. |
891 ^ self. |
883 ]. |
892 ]. |
884 |
893 changedObject == codeAspectHolder ifTrue:[ |
|
894 (codeView notNil and:[codeView scrolledView notNil ]) ifTrue:[codeView scrolledView codeAspect: codeAspectHolder value]. |
|
895 (diffView notNil and:[diffView scrolledView notNil ]) ifTrue:[diffView scrolledView codeAspect: codeAspectHolder value]. |
|
896 self updateViews. |
|
897 ^ self. |
|
898 ]. |
885 (changedObject == showDiffHolder) ifTrue:[ |
899 (changedObject == showDiffHolder) ifTrue:[ |
886 self updateViews. |
900 self updateViews. |
887 ^self. |
901 ^self. |
888 ]. |
902 ]. |
889 super update:something with:aParameter from:changedObject |
903 super update:something with:aParameter from:changedObject |
890 |
904 |
891 "Modified: / 19-07-2011 / 19:44:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
905 "Modified: / 19-07-2011 / 19:44:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
906 "Modified: / 27-07-2012 / 23:44:32 / cg" |
892 ! |
907 ! |
893 |
908 |
894 updateAfterAorBChanged |
909 updateAfterAorBChanged |
895 |
|
896 (textAChanged & textBChanged) ifTrue:[ |
910 (textAChanged & textBChanged) ifTrue:[ |
897 textAChanged := textBChanged := false. |
911 textAChanged := textBChanged := false. |
898 self updateViews |
912 self updateViews |
899 ]. |
913 ]. |
900 |
914 |
901 "Created: / 06-07-2011 / 12:12:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
915 "Created: / 06-07-2011 / 12:12:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
916 "Modified (format): / 27-07-2012 / 23:00:28 / cg" |
902 ! |
917 ! |
903 |
918 |
904 updateViews |
919 updateViews |
905 |
|
906 | a b | |
920 | a b | |
|
921 |
907 a := self textAHolder value. |
922 a := self textAHolder value. |
908 b := self textBHolder value. |
923 b := self textBHolder value. |
909 |
924 |
910 self showDiffHolder value ifFalse:[ |
925 self showDiffHolder value ifFalse:[ |
911 self showTextOnly. |
926 self showTextOnly. |
975 |
991 |
976 self diffSpecHolder value: #diffSpec. |
992 self diffSpecHolder value: #diffSpec. |
977 |
993 |
978 diffView isNil ifTrue:[^self]. |
994 diffView isNil ifTrue:[^self]. |
979 (scrolledView := diffView scrolledView) isNil ifTrue:[^self]. |
995 (scrolledView := diffView scrolledView) isNil ifTrue:[^self]. |
|
996 scrolledView codeAspect: codeAspectHolder value. |
980 scrolledView |
997 scrolledView |
981 text1: self textAHolder value |
998 text1: self textAHolder value |
982 text2: self textBHolder value |
999 text2: self textBHolder value |
983 |
1000 |
984 "Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1001 "Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
985 "Modified: / 18-11-2011 / 15:01:12 / cg" |
1002 "Modified: / 27-07-2012 / 23:31:04 / cg" |
986 ! |
1003 ! |
987 |
1004 |
988 showNothing |
1005 showNothing |
989 self diffSpecHolder value: #nothingSpec |
1006 self diffSpecHolder value: #nothingSpec |
990 |
1007 |