Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tools__SmalltalkDiffTool.st
changeset 8875 ddee2038db1e
parent 8820 1577041ef5a2
child 8905 0c1d8d4dcce7 
--- a/Tools__SmalltalkDiffTool.st	Mon Oct 05 15:40:13 2009 +0200
+++ b/Tools__SmalltalkDiffTool.st	Mon Oct 05 16:32:58 2009 +0200
@@ -10,13 +10,6 @@
 	category:'Interface-Diff & Merge tool'
 !
 
-Object subclass:#DiffItem
-	instanceVariableNames:'versionA versionB'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:SmalltalkDiffTool
-!
-
 
 !SmalltalkDiffTool class methodsFor:'interface opening'!
 
@@ -315,7 +308,7 @@
 !
 
 diffItemClass
-    ^ SmalltalkDiffTool::DiffItem
+    ^ SmalltalkDiffItem
 
     "Created: / 21-05-2008 / 14:38:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 09-08-2009 / 14:57:37 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -769,189 +762,14 @@
     "Modified: / 07-10-2008 / 11:05:42 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!SmalltalkDiffTool::DiffItem class methodsFor:'instance creation'!
-
-versionA: changeA
-
-    ^self new 
-        versionA: changeA
-
-    "Created: / 06-12-2007 / 17:51:17 / janfrog"
-    "Modified: / 06-12-2007 / 21:26:59 / janfrog"
-    "Modified: / 21-05-2008 / 14:15:04 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-versionA: changeA versionB: changeB
-
-    ^self new 
-        versionA: changeA;
-        versionB: changeB
-
-    "Created: / 06-12-2007 / 17:51:31 / janfrog"
-!
-
-versionB: changeB
-
-    ^self new 
-        versionB: changeB
-
-    "Created: / 06-12-2007 / 17:51:37 / janfrog"
-    "Modified: / 06-12-2007 / 21:27:14 / janfrog"
-    "Modified: / 21-05-2008 / 14:15:10 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!SmalltalkDiffTool::DiffItem methodsFor:'accessing'!
-
-version
-    ^ versionA ? versionB
-
-    "Created: / 21-05-2008 / 11:54:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-versionA
-    ^ versionA
-
-    "Created: / 06-12-2007 / 17:36:51 / janfrog"
-!
-
-versionA:something
-    versionA := something.
-
-    "Created: / 06-12-2007 / 17:36:51 / janfrog"
-!
-
-versionASource
-    ^ versionA 
-        ifNil:[nil]
-        ifNotNil:[versionA source]
-
-    "Created: / 07-12-2007 / 12:16:49 / janfrog"
-!
-
-versionB
-    ^ versionB
-
-    "Created: / 06-12-2007 / 17:36:51 / janfrog"
-!
-
-versionB:something
-    versionB := something.
-
-    "Created: / 06-12-2007 / 17:36:51 / janfrog"
-!
-
-versionBSource
-    ^ versionB 
-        ifNil:[nil]
-        ifNotNil:[versionB source]
-
-    "Created: / 07-12-2007 / 12:17:01 / janfrog"
-! !
-
-!SmalltalkDiffTool::DiffItem methodsFor:'displaying'!
-
-displayChangeOn: aGC x:x y:y
-
-    self displayString displayOn: aGC x:x y:y
-
-    "Created: / 06-12-2007 / 21:06:18 / janfrog"
-!
-
-displayOn: aGC x:x y:y
-
-    self displayChangeOn: aGC x:x y:y.
-
-    "Created: / 21-05-2008 / 11:55:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-displayString
-
-    ^self version printString
-
-    "Created: / 06-12-2007 / 21:10:22 / janfrog"
-    "Modified: / 12-12-2007 / 15:14:31 / janfrog"
-    "Modified: / 08-11-2008 / 09:28:04 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!SmalltalkDiffTool::DiffItem methodsFor:'queries'!
-
-hasVersionA
-
-    ^versionA notNil
-
-    "Created: / 11-12-2007 / 16:42:22 / janfrog"
-!
-
-hasVersionB
-
-    ^versionB notNil
-
-    "Created: / 11-12-2007 / 16:42:26 / janfrog"
-! !
-
-!SmalltalkDiffTool::DiffItem methodsFor:'testing'!
-
-isMergedVersionDifferent
-
-    ^false
-
-    "Created: / 21-05-2008 / 14:17:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-isMethodChange
-
-    "Created: / 11-12-2007 / 18:39:35 / janfrog"
-! !
-
-!SmalltalkDiffTool::DiffItem methodsFor:'ui support'!
-
-showVersionAAndBAndMergedIn: aMergeTool
-
-    self isMergedVersionDifferent
-        ifTrue:[aMergeTool showVersionAAndBAndMergedFor: self]
-        ifFalse:[aMergeTool showVersionAAndBFor: self]
-
-    "Created: / 07-12-2007 / 13:05:45 / janfrog"
-!
-
-showVersionAAndMergedIn: aMergeTool
-
-    self isMergedVersionDifferent
-        ifTrue:[aMergeTool showVersionAAndMergedFor: self]
-        ifFalse:[aMergeTool showVersionAFor: self]
-
-    "Created: / 07-12-2007 / 13:03:05 / janfrog"
-!
-
-showVersionBAndMergedIn: aMergeTool
-
-    self isMergedVersionDifferent
-        ifTrue:[aMergeTool showVersionBAndMergedFor: self]
-        ifFalse:[aMergeTool showVersionBFor: self]
-
-    "Created: / 07-12-2007 / 13:03:05 / janfrog"
-!
-
-showVersionsIn: aMergeTool
-
-    (versionA notNil and:[versionB isNil])
-        ifTrue:[^self showVersionAAndMergedIn: aMergeTool].
-    (versionA notNil and:[versionB notNil])
-        ifTrue:[^self showVersionAAndBAndMergedIn: aMergeTool].
-    (versionA isNil and:[versionB notNil])
-        ifTrue:[^self showVersionBAndMergedIn: aMergeTool].
-
-    "Created: / 07-12-2007 / 12:57:39 / janfrog"
-! !
-
 !SmalltalkDiffTool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.3 2009-09-30 12:11:17 fm Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.4 2009-10-05 14:32:58 fm Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.3 2009-09-30 12:11:17 fm Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.4 2009-10-05 14:32:58 fm Exp $'
 !
 
 version_SVN
hg/stx-libtool