Merge jv
authorMerge Script
Fri, 22 Jul 2016 07:11:22 +0200
branchjv
changeset 16753 d0e2c8fd4a62
parent 16748 62486fba2d74 (current diff)
parent 16752 090ac9d87a3d (diff)
child 16755 c430681b2623
child 16765 589cf9d699fe
Merge
AbstractLauncherApplication.st
ChangeSetBrowser.st
DebugView.st
Tools__NewClassWizardDialog.st
--- a/AbstractLauncherApplication.st	Thu Jul 21 07:04:01 2016 +0200
+++ b/AbstractLauncherApplication.st	Fri Jul 22 07:11:22 2016 +0200
@@ -740,13 +740,12 @@
 
     knownTopViews := IdentitySet new.
     Screen allScreens do:[:aScreen |
-        aScreen knownViews do:[:aView |
+        aScreen allViewsDo:[:aView |
             |top showIt wg|
 
             aView notNil ifTrue:[
                 top := aView topView.
                 (knownTopViews includes:top) ifFalse:[
-
                     (top isKindOf:DebugView) ifTrue:[
                         "/ although modal, show it.
                         showIt := top realized
--- a/ChangeSetBrowser.st	Thu Jul 21 07:04:01 2016 +0200
+++ b/ChangeSetBrowser.st	Fri Jul 22 07:11:22 2016 +0200
@@ -562,10 +562,10 @@
 
     anyChanges ifFalse:[^ self].
 
-    action := OptionBox 
+    action := OptionBox
                       request:(resources string:'The modified changeSet has not been saved.\\Update the changeSet before closing ?') withCRs
                       label:'ChangesBrowser'
-                      form:(WarningBox iconBitmap)
+                      image:(WarningBox iconBitmap)
                       buttonLabels:(resources array:#('Cancel' 'Don''t Update' 'Update'))
                       values:#(#abort #ignore #save)
                       default:#save
@@ -631,7 +631,7 @@
 !
 
 showingDiffsDefault
-    ^ "false" super showingDiffsDefault 
+    ^ "false" super showingDiffsDefault
 ! !
 
 !ChangeSetBrowser methodsFor:'menu aspects'!
--- a/DebugView.st	Thu Jul 21 07:04:01 2016 +0200
+++ b/DebugView.st	Fri Jul 22 07:11:22 2016 +0200
@@ -159,7 +159,10 @@
 lowSpaceCleanup
     "in low memory situations, give up cached debuggers"
 
-    CachedDebugger := nil.
+    CachedDebugger notNil ifTrue:[
+        CachedDebugger destroy.
+        CachedDebugger := nil.
+    ].
     CachedExclusive := nil.
     OpenDebuggers := nil.
     RememberedCallChain := nil.
@@ -176,7 +179,10 @@
      Call this, if you changed the debugger heavily, and you want to avoid
      that an old, cached debugger gets reused when the next error comes around."
 
-    CachedDebugger := nil.
+    CachedDebugger notNil ifTrue:[
+        CachedDebugger destroy.
+        CachedDebugger := nil.
+    ].
     CachedExclusive := nil.
     OpenDebuggers := nil.
 
--- a/Tools__NewClassWizardDialog.st	Thu Jul 21 07:04:01 2016 +0200
+++ b/Tools__NewClassWizardDialog.st	Fri Jul 22 07:11:22 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2009 by eXept Software AG
               All Rights Reserved
@@ -1146,7 +1148,7 @@
 !
 
 listOfCategories
-    ^ (Smalltalk allClassCategories copyAs:OrderedCollection) sort
+    ^ Smalltalk allClassCategories asNewOrderedCollection sort
 !
 
 listOfLanguages