Merge jv
authorMerge Script
Wed, 20 Apr 2016 07:00:31 +0200
branchjv
changeset 5671 38c0fa86cc2f
parent 5667 abf48da94d00 (current diff)
parent 5670 802bd5e3f30d (diff)
child 5673 bebf345df71e
Merge
GenericToolbarIconLibrary.st
--- a/GenericToolbarIconLibrary.st	Mon Apr 18 07:01:38 2016 +0200
+++ b/GenericToolbarIconLibrary.st	Wed Apr 20 07:00:31 2016 +0200
@@ -795,7 +795,7 @@
         ]
 !
 
-breakpointRedDisabled9x9
+breakpointDisabled9x9
     <resource: #image>
     "This resource specification was automatically generated
      by the ImageEditor of ST/X."
@@ -813,7 +813,7 @@
                 height:9;
                 photometric:(#palette);
                 bitsPerSample:(#[ 4 ]);
-                samplesPerPixel:(1);
+                samplesPerPixel:1;
                 bits:(ByteArray 
                             fromPackedString:'H$QDQBADX7M$HDZTQIY@RDQDRDA@QDQ@PD!!DQD!!@R%QDV$@$(PF$HDQDQDH ');
                 colorMapFromArray:#[ 79 80 79 85 85 85 255 255 255 135 135 135 227 235 248 122 122 122 201 201 201 105 105 105 98 98 98 103 103 103 182 182 182 ];
@@ -826,24 +826,29 @@
         ]
 !
 
-breakpointRedDisabledWithWarning9x9
-    "This resource specification was automatically generated
-     by the ImageEditor of ST/X."
-
-    "Do not manually edit this!! If it is corrupted,
-     the ImageEditor may not be able to read the specification."
-
+breakpointDisabledWithWarning9x9
+    <resource: #image>
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
     "
      self breakpointRedDisabledWithWarning9x9 inspect
      ImageEditor openOnClass:self andSelector:#breakpointRedDisabledWithWarning9x9
-     Icon flushCachedIcons
-    "
-
-    <resource: #image>
-
-    ^Icon
+     Icon flushCachedIcons"
+    
+    ^ Icon 
         constantNamed:'GenericToolbarIconLibrary breakpointRedDisabledWithWarning9x9'
-        ifAbsentPut:[(Depth4Image new) width:9; height:9; bits:(ByteArray fromPackedString:'DTQDQB@QX7M$HAFTQIY@DTQDRD@QQDQ@PAEDQD!!@R%QDV$@Q(@B$HAEDQDH ') ; colorMapFromArray:#[79 80 79 255 244 0 255 255 255 135 135 135 227 235 248 122 122 122 201 201 201 105 105 105 98 98 98 103 103 103 182 182 182]; mask:((ImageMask new) width:9; height:9; bits:(ByteArray fromPackedString:'0@C>@O\@80CA@NL@]0C>@L@@') ; yourself); yourself]
+        ifAbsentPut:[
+            (Depth4Image width:9 height:9)
+                bits:(ByteArray 
+                            fromPackedString:'DTQDQB@QX7M$HAFTQIY@DTQDRD@QQDQ@PAEDQD!!@R%QDV$@Q(@B$HAEDQDH ')
+                    colorMapFromArray:#[ 79 80 79 255 0 0 255 255 255 135 135 135 227 235 248 122 122 122 201 201 201 105 105 105 98 98 98 103 103 103 182 182 182 ]
+                    mask:((ImageMask width:9 height:9)
+                            bits:(ByteArray fromPackedString:'0@C>@O\@80CA@NL@]0C>@L@@');
+                            yourself);
+                yourself
+        ]
 !
 
 breakpointRedEnabled9x9
@@ -894,7 +899,9 @@
 
     ^Icon
         constantNamed:'GenericToolbarIconLibrary breakpointRedEnabledWithWarning9x9'
-        ifAbsentPut:[(Depth8Image new) width:9; height:9; bits:(ByteArray fromPackedString:'D1L@@@@@@@@SD1LJ@0HCB @SD1LABP,I@P<@D1LHDQDQB@L@D1LDCP0RA@H@D1LEC 8NAPL@@@<AA!!@G@P<@D1LJ@0HCB @@D1L@@@@@@ALS') ; colorMapFromArray:#[253 255 252 127 73 46 114 60 38 139 79 54 203 129 108 195 127 107 205 147 131 204 146 130 200 145 130 208 165 152 225 182 169 229 191 180 190 104 83 194 111 90 204 134 115 216 159 144 215 159 145 219 166 152 192 108 89 255 255 0]; mask:((ImageMask new) width:9; height:9; bits:(ByteArray fromPackedString:'0@C>@O<@?0C?@O<@_0C>@L@@') ; yourself); yourself]
+        ifAbsentPut:[(Depth8Image width:9 height:9) bits:(ByteArray fromPackedString:'D1L@@@@@@@@SD1LJ@0HCB @SD1LABP,I@P<@D1LHDQDQB@L@D1LDCP0RA@H@D1LEC 8NAPL@@@<AA!!@G@P<@D1LJ@0HCB @@D1L@@@@@@ALS')
+            colorMapFromArray:#[253 255 252 127 73 46 114 60 38 139 79 54 203 129 108 195 127 107 205 147 131 204 146 130 200 145 130 208 165 152 225 182 169 229 191 180 190 104 83 194 111 90 204 134 115 216 159 144 215 159 145 219 166 152 192 108 89 255 0 0]
+            mask:((ImageMask width:9 height:9) bits:(ByteArray fromPackedString:'0@C>@O<@?0C?@O<@_0C>@L@@'); yourself); yourself]
 !
 
 closeIndicatorInTree9x9Icon
@@ -15541,30 +15548,51 @@
 !
 
 breakpointBlueDisabled
+    <resource: #programImage>
+
     ^ self breakpointBlueDisabled9x9
 !
 
 breakpointBlueEnabled
+    <resource: #programImage>
+
     ^ self breakpointBlueEnabled9x9
 !
 
+breakpointDisabled
+    <resource: #programImage>
+    ^ self breakpointDisabled9x9
+!
+
+breakpointDisabledWithWarning
+    <resource: #programImage>
+    ^ self breakpointDisabledWithWarning9x9
+
+    "Created: / 16-02-2015 / 06:20:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 breakpointRedDisabled
-    ^ self breakpointRedDisabled9x9
+    <resource: #programImage>
+    ^ self breakpointDisabled
 !
 
 breakpointRedDisabledWithWarning
-    ^ self breakpointRedDisabledWithWarning9x9
-
-    "Created: / 16-02-2015 / 06:20:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    <resource: #programImage>
+
+    ^ self breakpointDisabledWithWarning
 !
 
 breakpointRedEnabled
+    <resource: #programImage>
+
     ^ self breakpointRedEnabled9x9
 
     "Modified: / 16-02-2015 / 06:29:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 breakpointRedEnabledWithWarning
+    <resource: #programImage>
+
     ^ self breakpointRedEnabledWithWarning9x9
 
     "Created: / 16-02-2015 / 06:29:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -15641,6 +15669,8 @@
 !
 
 tracepointBlue
+    <resource: #programImage>
+
     ^ self tracepointBlue9x9
 ! !
 
--- a/Workspace.st	Mon Apr 18 07:01:38 2016 +0200
+++ b/Workspace.st	Wed Apr 20 07:00:31 2016 +0200
@@ -1868,10 +1868,11 @@
                         ] ifFalse:[
                             (cls notNil
                               and:[ cls nameSpace notNil
+                              and:[ cls nameSpace isNameSpace
                               and:[ nameOfVariable knownAsSymbol
                               and:[ (nsClass := cls nameSpace at:nameOfVariable asSymbol) notNil
                               and:[ nsClass isBehavior
-                            ]]]]) ifTrue:[
+                            ]]]]]) ifTrue:[
                                 "/ a namespace class?
                                 browserClass browseReferendsOf:nsClass name
                             ] ifFalse:[