diff -r 825d52f63cf7 -r cd9107f4f9a2 Tools__SmalltalkDiffTool.st --- a/Tools__SmalltalkDiffTool.st Thu Sep 08 05:28:38 2011 +0200 +++ b/Tools__SmalltalkDiffTool.st Mon Sep 12 11:52:32 2011 +0200 @@ -15,7 +15,7 @@ ApplicationModel subclass:#SmalltalkDiffTool instanceVariableNames:'diffSetHolder changeSetA changeSetB selectionHolder titleHolder - showMergingChangeSetHolder versionsViewHolder' + showMergingChangeSetHolder versionsViewHolder ignoreExtensions' classVariableNames:'' poolDictionaries:'' category:'Interface-Diff & Merge tool' @@ -47,13 +47,24 @@ !SmalltalkDiffTool class methodsFor:'interface opening'! openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title + ^ self + openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title + ignoreExtensions:false + + "Created: / 19-04-2008 / 12:52:12 / Jan Vrany " + "Modified: / 12-09-2011 / 11:52:20 / cg" +! + +openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title ignoreExtensions:aBoolean ^self new + ignoreExtensions:aBoolean; diffSet: diffSet labelA: labelA labelB: labelB; title: title; open "Created: / 19-04-2008 / 12:52:12 / Jan Vrany " + "Created: / 12-09-2011 / 11:51:11 / cg" ! ! !SmalltalkDiffTool class methodsFor:'interface specs'! @@ -373,6 +384,10 @@ "Modified: / 07-10-2008 / 10:24:24 / Jan Vrany " ! +ignoreExtensions:something + ignoreExtensions := something. +! + onlyInALabel:labelA self inAOnlyLabelHolder value:'Only in ', labelA @@ -801,7 +816,7 @@ !SmalltalkDiffTool::DiffItem class methodsFor:'documentation'! version - ^'$Id: Tools__SmalltalkDiffTool.st,v 1.7 2011-08-04 19:31:35 cg Exp $' + ^'$Id: Tools__SmalltalkDiffTool.st,v 1.8 2011-09-12 09:52:32 cg Exp $' ! ! !SmalltalkDiffTool::DiffItem class methodsFor:'instance creation'! @@ -982,7 +997,7 @@ !SmalltalkDiffTool class methodsFor:'documentation'! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.7 2011-08-04 19:31:35 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.8 2011-09-12 09:52:32 cg Exp $' ! version_SVN