Merge jv
authorMerge Script
Thu, 21 May 2015 06:57:45 +0200
branchjv
changeset 15653 1a50d41800d9
parent 15650 5d58a8bfb8d4 (current diff)
parent 15652 788f4c9d0b07 (diff)
child 15654 b052edb26c7c
Merge
ChangesBrowser.st
Tools__NavigationState.st
--- a/ChangesBrowser.st	Wed May 20 11:22:14 2015 +0100
+++ b/ChangesBrowser.st	Thu May 21 06:57:45 2015 +0200
@@ -4014,22 +4014,22 @@
 !
 
 selectorOfMethodChange:changeNr
-    "return a method-changes selector, or nil if its not a methodChange"
+    "return a method-changes selector, or nil if it's not a methodChange"
 
     |sel |
 
     changeSelectors size >= changeNr ifTrue:[
-	sel := changeSelectors at:changeNr.
-	sel notNil ifTrue:[ ^ sel ].
+        sel := changeSelectors at:changeNr.
+        sel notNil ifTrue:[ ^ sel ].
     ].
 
     sel := self extractSelectorOfMethodChange:changeNr.
     sel notNil ifTrue:[
-	changeSelectors isNil ifTrue:[
-	    changeSelectors := OrderedCollection new
-	].
-	changeSelectors grow:changeNr.
-	changeSelectors at:changeNr put:sel.
+        changeSelectors isNil ifTrue:[
+            changeSelectors := OrderedCollection new
+        ].
+        changeSelectors grow:changeNr.
+        changeSelectors at:changeNr put:sel.
     ].
     ^ sel
 !
@@ -6554,10 +6554,10 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.472 2015-02-27 14:22:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.473 2015-05-20 10:28:51 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.472 2015-02-27 14:22:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.473 2015-05-20 10:28:51 cg Exp $'
 ! !
 
--- a/Tools__NavigationState.st	Wed May 20 11:22:14 2015 +0100
+++ b/Tools__NavigationState.st	Thu May 21 06:57:45 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 by eXept Software AG
               All Rights Reserved
@@ -1031,9 +1033,7 @@
     selectedMethodsArray isNil ifTrue:[
         selectedMethodsArray := OrderedCollection new 
     ].
-    index > selectedMethodsArray size ifTrue:[
-        selectedMethodsArray grow:index
-    ].
+    selectedMethodsArray ensureSizeAtLeast:index.
     holder := selectedMethodsArray at:index.
     holder isNil ifTrue:[
         selectedMethodsArray at:index put:(holder := ValueHolder new)
@@ -1087,9 +1087,7 @@
     selectorListGeneratorArray isNil ifTrue:[
         selectorListGeneratorArray := OrderedCollection new 
     ].
-    index > selectorListGeneratorArray size ifTrue:[
-        selectorListGeneratorArray grow:index
-    ].
+    selectorListGeneratorArray ensureSizeAtLeast:index.
     holder := selectorListGeneratorArray at:index.
     holder isNil ifTrue:[
         selectorListGeneratorArray at:index put:(holder := ValueHolder new)
@@ -1204,6 +1202,7 @@
     "Created: / 24.2.2000 / 23:45:28 / cg"
 ! !
 
+
 !NavigationState methodsFor:'aspects-kludges'!
 
 metaToggle
@@ -1725,15 +1724,15 @@
 !NavigationState class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationState.st,v 1.60 2015-02-20 21:46:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationState.st,v 1.61 2015-05-20 10:27:52 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationState.st,v 1.60 2015-02-20 21:46:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationState.st,v 1.61 2015-05-20 10:27:52 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__NavigationState.st,v 1.60 2015-02-20 21:46:26 cg Exp $'
+    ^ '$Id: Tools__NavigationState.st,v 1.61 2015-05-20 10:27:52 cg Exp $'
 ! !