author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 04 Apr 2013 19:06:16 +0100 | |
branch | jv |
changeset 12650 | e0f607754b9a |
parent 12179 | 47f98e7d6de1 |
child 15566 | 184cea584be5 |
permissions | -rw-r--r-- |
9977 | 1 |
" |
10069 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
3 |
All Rights Reserved |
|
9977 | 4 |
|
10069 | 5 |
Permission is hereby granted, free of charge, to any person |
6 |
obtaining a copy of this software and associated documentation |
|
7 |
files (the 'Software'), to deal in the Software without |
|
8 |
restriction, including without limitation the rights to use, |
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
10 |
copies of the Software, and to permit persons to whom the |
|
11 |
Software is furnished to do so, subject to the following |
|
12 |
conditions: |
|
13 |
||
14 |
The above copyright notice and this permission notice shall be |
|
15 |
included in all copies or substantial portions of the Software. |
|
16 |
||
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
24 |
OTHER DEALINGS IN THE SOFTWARE. |
|
9977 | 25 |
" |
26 |
"{ Package: 'stx:libtool' }" |
|
27 |
||
28 |
"{ NameSpace: Tools }" |
|
29 |
||
30 |
ApplicationModel subclass:#DiffCodeView2DemoApp |
|
31 |
instanceVariableNames:'view' |
|
32 |
classVariableNames:'' |
|
33 |
poolDictionaries:'' |
|
34 |
category:'Interface-CodeView' |
|
35 |
! |
|
36 |
||
37 |
!DiffCodeView2DemoApp class methodsFor:'documentation'! |
|
38 |
||
39 |
copyright |
|
40 |
" |
|
10069 | 41 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
42 |
All Rights Reserved |
|
43 |
||
44 |
Permission is hereby granted, free of charge, to any person |
|
45 |
obtaining a copy of this software and associated documentation |
|
46 |
files (the 'Software'), to deal in the Software without |
|
47 |
restriction, including without limitation the rights to use, |
|
48 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
49 |
copies of the Software, and to permit persons to whom the |
|
50 |
Software is furnished to do so, subject to the following |
|
51 |
conditions: |
|
9977 | 52 |
|
10069 | 53 |
The above copyright notice and this permission notice shall be |
54 |
included in all copies or substantial portions of the Software. |
|
55 |
||
56 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
57 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
58 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
59 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
60 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
61 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
62 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
63 |
OTHER DEALINGS IN THE SOFTWARE. |
|
9977 | 64 |
" |
65 |
! ! |
|
66 |
||
67 |
!DiffCodeView2DemoApp class methodsFor:'interface specs'! |
|
68 |
||
69 |
windowSpec |
|
70 |
"This resource specification was automatically generated |
|
71 |
by the UIPainter of ST/X." |
|
72 |
||
73 |
"Do not manually edit this!! If it is corrupted, |
|
74 |
the UIPainter may not be able to read the specification." |
|
75 |
||
76 |
" |
|
77 |
UIPainter new openOnClass:Tools::DiffCodeView2DemoApp andSelector:#windowSpec |
|
78 |
Tools::DiffCodeView2DemoApp new openInterface:#windowSpec |
|
79 |
Tools::DiffCodeView2DemoApp open |
|
80 |
" |
|
81 |
||
82 |
<resource: #canvas> |
|
83 |
||
84 |
^ |
|
85 |
#(FullSpec |
|
86 |
name: windowSpec |
|
87 |
window: |
|
88 |
(WindowSpec |
|
89 |
label: 'DiffCodeView2 Demo App' |
|
90 |
name: 'DiffCodeView2 Demo App' |
|
91 |
min: (Point 0 0) |
|
92 |
bounds: (Rectangle 0 0 748 375) |
|
93 |
) |
|
94 |
component: |
|
95 |
(SpecCollection |
|
96 |
collection: ( |
|
97 |
(NonScrollableArbitraryComponentSpec |
|
98 |
name: 'DiffCodeView2' |
|
99 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
100 |
component: diffCodeView2 |
|
101 |
) |
|
102 |
) |
|
103 |
||
104 |
) |
|
105 |
) |
|
106 |
! ! |
|
107 |
||
108 |
!DiffCodeView2DemoApp methodsFor:'accessing'! |
|
109 |
||
110 |
text1 |
|
111 |
||
112 |
^ |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
113 |
' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
114 |
Line 1 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
115 |
Where is the difference? |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
116 |
Line 3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
117 |
Line 4 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
118 |
Line 5 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
119 |
Some text to delete |
9977 | 120 |
' |
121 |
||
122 |
"Modified: / 22-06-2010 / 22:25:20 / Jakub <zelenja7@fel.cvut.cz>" |
|
123 |
"Created: / 01-08-2010 / 20:34:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
124 |
! |
|
125 |
||
126 |
text2 |
|
127 |
||
128 |
^ |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
129 |
' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
130 |
Line 1 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
131 |
Here is the difference!! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
132 |
Line 3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
133 |
Line 3.5 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
134 |
Line 5 |
9977 | 135 |
' |
136 |
||
137 |
"Created: / 06-03-2010 / 10:39:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
138 |
"Modified: / 22-06-2010 / 22:25:20 / Jakub <zelenja7@fel.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
139 |
"Modified: / 16-03-2012 / 16:16:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
9977 | 140 |
! ! |
141 |
||
142 |
!DiffCodeView2DemoApp methodsFor:'accessing - views'! |
|
143 |
||
144 |
diffCodeView2 |
|
145 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
146 |
view := Diff2CodeView2 new. |
9977 | 147 |
|
148 |
"/ view text1: self text1 text2: self text2. |
|
149 |
^view |
|
150 |
||
151 |
"Created: / 06-03-2010 / 10:38:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
152 |
"Modified: / 16-03-2012 / 13:17:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
9977 | 153 |
! ! |
154 |
||
155 |
!DiffCodeView2DemoApp methodsFor:'hooks'! |
|
156 |
||
157 |
commonPostOpen |
|
158 |
||
159 |
[ Delay waitForSeconds: 1. |
|
160 |
view text1: self text1 text2: self text2 |
|
161 |
] fork |
|
162 |
||
163 |
"Modified: / 08-07-2010 / 15:27:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
164 |
! ! |
|
165 |
||
166 |
!DiffCodeView2DemoApp class methodsFor:'documentation'! |
|
167 |
||
168 |
version_CVS |
|
12123
4bde08cebd48
trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10069
diff
changeset
|
169 |
^ '§Header: /cvs/stx/stx/libtool/Tools__DiffCodeView2DemoApp.st,v 1.2 2011/07/03 17:50:00 cg Exp §' |
9977 | 170 |
! |
171 |
||
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
172 |
version_HG |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
173 |
|
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
174 |
^ '$Changeset: <not expanded> $' |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
175 |
! |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
176 |
|
9977 | 177 |
version_SVN |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
178 |
^ '$Id: Tools__DiffCodeView2DemoApp.st 7925 2012-03-16 17:08:17Z vranyj1 $' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12123
diff
changeset
|
179 |
! ! |
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
180 |