merged in jv's changes
authorClaus Gittinger <cg@exept.de>
Wed, 05 Feb 2014 18:52:27 +0100
changeset 3463 94e2c950bba2
parent 3462 b4af88a682ec
child 3464 9121565ffec3
merged in jv's changes
HistoryManager.st
--- a/HistoryManager.st	Wed Feb 05 18:52:25 2014 +0100
+++ b/HistoryManager.st	Wed Feb 05 18:52:27 2014 +0100
@@ -369,7 +369,7 @@
 !HistoryManager class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.83 2012-07-31 12:31:47 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.84 2014-02-05 17:52:27 cg Exp $'
 ! !
 
 !HistoryManager methodsFor:'accessing'!
@@ -597,7 +597,8 @@
     newMethod compilerClass == Compiler ifFalse:[^ self].
 
     oldMethod isNil ifTrue:[
-        whatChange := #creation
+        whatChange := #creation.
+        newHistories := OrderedCollection new.
     ] ifFalse:[
         whatChange := #modification.
 
@@ -680,6 +681,7 @@
     ].
 
     "Created: / 30-06-2011 / 16:51:19 / cg"
+    "Modified: / 02-10-2012 / 13:22:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HistoryManager methodsFor:'initialization'!
@@ -1020,7 +1022,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.83 2012-07-31 12:31:47 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.84 2014-02-05 17:52:27 cg Exp $'
 ! !
 
 !HistoryManager::HistoryLine class methodsFor:'filtering'!
@@ -1082,7 +1084,7 @@
                         | anotherHistLine |
                         anotherHistLine := aCollectionOfHistoryLines at:index+1.
                         (anotherHistLine isKindOfModified and:[anotherHistLine user = histLine user]) 
-                            ifTrue:[skipNext := true]
+                            ifTrue:[skipNext := (self timeIsShortFrom:histLine to:anotherHistLine)]
                     ].
                 ].
             ].
@@ -1097,6 +1099,7 @@
     "Modified: / 20-06-2004 / 16:36:00 / masca"
     "Modified: / 01-09-2004 / 20:20:42 / janfrog"
     "Modified: / 05-07-2011 / 23:09:01 / cg"
+    "Modified: / 08-10-2012 / 14:59:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 modificationLimit
@@ -1715,8 +1718,9 @@
 !HistoryManager class methodsFor:'documentation'!
 
 version_SVN
-    ^ '§Id: HistoryManager.st 1911 2012-04-03 17:14:36Z vranyj1 §'
+    ^ '$Id: HistoryManager.st,v 1.84 2014-02-05 17:52:27 cg Exp $'
 ! !
 
+
 HistoryManager initialize!
 HistoryManager::HistoryLine initialize!