Tools__TextDiffTool.st
branchjv
changeset 12405 76f9a872362b
parent 12318 1dda95be3d40
parent 11703 100f3c5ed545
child 12406 1fbd331e4489
--- a/Tools__TextDiffTool.st	Mon Jan 28 21:19:21 2013 +0000
+++ b/Tools__TextDiffTool.st	Fri Feb 08 08:35:48 2013 +0100
@@ -63,6 +63,7 @@
 "
 ! !
 
+
 !TextDiffTool class methodsFor:'image specs'!
 
 versionA24x24
@@ -93,8 +94,19 @@
     "Created: / 17-03-2012 / 12:18:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool class methodsFor:'interface specs'!
 
+
+
+
+
+
+
+
+
+
+
 windowSpec
     "This resource specification was automatically generated
      by the UIPainter of ST/X."
@@ -183,6 +195,7 @@
       )
 ! !
 
+
 !TextDiffTool class methodsFor:'interface specs - labels'!
 
 versionALabelSpec
@@ -289,6 +302,8 @@
     "Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 versionCLabelSpec
     "This resource specification was automatically generated
      by the UIPainter of ST/X."
@@ -342,6 +357,7 @@
     "Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool class methodsFor:'plugIn spec'!
 
 aspectSelectors
@@ -364,6 +380,7 @@
     "Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool methodsFor:'accessing'!
 
 label: aString
@@ -381,11 +398,11 @@
 !
 
 labelB: aString
-
     ^self labelBHolder value: aString
 
     "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 27-07-2012 / 21:57:15 / cg"
 !
 
 labelC: aString
@@ -404,10 +421,10 @@
 !
 
 textA: aString
-
     ^self textAHolder value: aString
 
     "Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 27-07-2012 / 21:57:37 / cg"
 !
 
 textB
@@ -418,10 +435,10 @@
 !
 
 textB: aString
-
     ^self textBHolder value: aString
 
     "Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 27-07-2012 / 21:57:41 / cg"
 !
 
 textC
@@ -446,6 +463,7 @@
     "Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool methodsFor:'aspects'!
 
 classHolder
@@ -458,29 +476,39 @@
 !
 
 classHolder: aValueHolder
-
     classHolder := aValueHolder.
     "codeView notNil ifTrue:[codeView classHolder: aValueHolder]."
     diffView notNil ifTrue:[diffView classHolder: aValueHolder].
 
     "Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 27-07-2012 / 21:57:00 / cg"
 !
 
 codeAspectHolder
     "return/create the 'codeAspectHolder' value holder (automatically generated)"
 
     codeAspectHolder isNil ifTrue:[
-        codeAspectHolder := ValueHolder with: #expression.
+	codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression).
+	codeAspectHolder addDependent:self
     ].
     ^ codeAspectHolder
 
     "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 23:46:11 / cg"
 !
 
 codeAspectHolder:something
     "set the 'codeAspectHolder' value holder (automatically generated)"
 
+    codeAspectHolder notNil ifTrue:[
+	codeAspectHolder removeDependent:self
+    ].
     codeAspectHolder := something.
+    codeAspectHolder notNil ifTrue:[
+	codeAspectHolder addDependent:self
+    ].
+
+    "Modified: / 27-07-2012 / 22:55:42 / cg"
 !
 
 contentSpecHolder
@@ -512,6 +540,10 @@
     ].
 !
 
+
+
+
+
 diffView
 "/    diffView isNil ifTrue:[
         diffView := self initializeDiffView.
@@ -549,7 +581,14 @@
     diffView notNil ifTrue:[diffView languageHolder: aValueHolder].
 
     "Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+
+
+
+
+ !
+
 
 !TextDiffTool methodsFor:'aspects-versions'!
 
@@ -739,8 +778,18 @@
     "Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool methodsFor:'change & update'!
 
+
+
+codeAspect:aSymbol
+    self codeAspectHolder value:aSymbol
+
+    "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 27-07-2012 / 21:56:48 / cg"
+!
+
 update:something with:aParameter from:changedObject
     "Invoked when an object that I depend upon sends a change notification."
 
@@ -766,16 +815,23 @@
     "Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 updateAfterAorBorCChanged
     "Called whenever one of the texts changes"
 
     ^ self subclassResponsibility
 
     "Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+ !
+
 
 !TextDiffTool methodsFor:'hooks'!
 
+
+
 postBuildDiffView:aScrollableView
 
     diffView := aScrollableView.
@@ -795,6 +851,7 @@
     "Created: / 26-07-2012 / 19:13:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool methodsFor:'initialization'!
 
 initialize
@@ -812,6 +869,20 @@
     "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
+!TextDiffTool methodsFor:'private'!
+
+
+
+
+
+
+
+
+
+ !
+
+
 !TextDiffTool methodsFor:'testing'!
 
 isDiff2
@@ -832,8 +903,18 @@
     "Created: / 19-03-2012 / 11:53:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !TextDiffTool class methodsFor:'documentation'!
 
+version
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $'
+!
+
 version_SVN
-    ^ '$Id: Tools__TextDiffTool.st 8087 2013-01-16 11:53:38Z vranyj1 $'
+    ^ '§Id§'
 ! !
+