Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Tools::ChangeSetDiffList jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 03 Aug 2012 14:47:21 +0100
branchjv
changeset 12275 a416cf8a4b50
parent 12274 1e0599b8a007
child 12276 415495417f39
- Tools::ChangeSetDiffList added: #listEntryFor: #shouldDisplayDiff: changed: #updateList - extensions ...
Tools__ChangeSetDiffList.st file | annotate | diff | comparison | revisions
Tools__ChangeSetDiffTool.st file | annotate | diff | comparison | revisions
libtool.rc file | annotate | diff | comparison | revisions
stx_libtool.st file | annotate | diff | comparison | revisions 
--- a/Tools__ChangeSetDiffList.st	Fri Aug 03 14:08:30 2012 +0100
+++ b/Tools__ChangeSetDiffList.st	Fri Aug 03 14:47:21 2012 +0100
@@ -384,6 +384,23 @@
     "Nothing to do"
 !
 
+shouldDisplayDiff: aDiffCompoment
+    "Return true if given diff component should be displayed"
+
+    (showVersionMethodDiffsHolder value not and:[aDiffCompoment isForVersionMethod])
+        ifTrue:[ ^ false ].
+
+    (showCopyrightMethodDiffsHolder value not and:[aDiffCompoment isForCopyrightMethod])
+        ifTrue:[ ^ false ].
+
+    aDiffCompoment isDiffSet 
+        ifTrue:[ ^ aDiffCompoment diffs anySatisfy:[:diff|self shouldDisplayDiff: diff]].
+
+    ^true
+
+    "Created: / 03-08-2012 / 14:38:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 updateList
     "Superclass Tools::BrowserList says that I am responsible to implement this method"
     
@@ -393,26 +410,21 @@
     newDiffs := self inGeneratorHolder value ? #().
     (newDiffs isKindOf: ChangeSetDiffComponent) ifTrue:
         [newDiffs := newDiffs diffs].
-    showVersionMethodDiffsHolder value ifFalse:[
-        newDiffs := newDiffs reject:[:diff|diff isForVersionMethod]
-    ].
-    showCopyrightMethodDiffsHolder value ifFalse:[
-        newDiffs := newDiffs reject:[:diff|diff isForCopyrightMethod]
-    ].
-
 
     newDiffs := self filterList: newDiffs.
     newList := OrderedCollection new:16.    
     newDiffs do:
         [:item|
-        newList add:(ListEntry model: item application: self).
-        item addDependent: self].
+        (self shouldDisplayDiff: item) ifTrue:[
+            newList add:(ListEntry model: item application: self).
+            item addDependent: self].
+        ].
 
     newList sort:[:a :b|a label < b label].
     self listHolder value:newList
 
     "Modified: / 07-07-2011 / 14:17:26 / jv"
-    "Modified: / 01-08-2012 / 16:37:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-08-2012 / 14:42:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffList::ListEntry class methodsFor:'instance creation'!
@@ -490,5 +502,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffList.st 8034 2012-08-03 13:08:30Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetDiffList.st 8035 2012-08-03 13:47:21Z vranyj1 $'
 ! !
--- a/Tools__ChangeSetDiffTool.st	Fri Aug 03 14:08:30 2012 +0100
+++ b/Tools__ChangeSetDiffTool.st	Fri Aug 03 14:47:21 2012 +0100
@@ -2459,6 +2459,12 @@
     "Created: / 20-03-2012 / 00:01:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+changeSetASpec: spec
+    ^self changesetSpecAHolder value: spec
+
+    "Created: / 01-08-2012 / 15:38:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 changeSetB
 
     | specB |
@@ -2475,6 +2481,12 @@
     "Created: / 20-03-2012 / 00:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+changeSetBSpec: spec
+    ^self changesetSpecBHolder value: spec
+
+    "Created: / 01-08-2012 / 15:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 changeSetBase
 
     | specBase |
@@ -2673,5 +2685,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffTool.st 8034 2012-08-03 13:08:30Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetDiffTool.st 8035 2012-08-03 13:47:21Z vranyj1 $'
 ! !
--- a/libtool.rc	Fri Aug 03 14:08:30 2012 +0100
+++ b/libtool.rc	Fri Aug 03 14:47:21 2012 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.2.1\0"
-      VALUE "ProductDate", "Fri, 03 Aug 2012 13:11:10 GMT\0"
+      VALUE "ProductDate", "Fri, 03 Aug 2012 13:52:21 GMT\0"
     END
 
   END
--- a/stx_libtool.st	Fri Aug 03 14:08:30 2012 +0100
+++ b/stx_libtool.st	Fri Aug 03 14:47:21 2012 +0100
@@ -533,13 +533,13 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'8028            '"$"
+    ^ "$SVN-Revision:"'8032            '"$"
 ! !
 
 !stx_libtool class methodsFor:'documentation'!
 
 version
-    ^ '$Id: stx_libtool.st 8031 2012-07-27 16:17:58Z vranyj1 $'
+    ^ '$Id: stx_libtool.st 8035 2012-08-03 13:47:21Z vranyj1 $'
 !
 
 version_CVS
@@ -547,5 +547,5 @@
 !
 
 version_SVN
-    ^ '$Id: stx_libtool.st 8031 2012-07-27 16:17:58Z vranyj1 $'
+    ^ '$Id: stx_libtool.st 8035 2012-08-03 13:47:21Z vranyj1 $'
 ! !
hg/stx-libtool