Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 27 Nov 2015 23:08:58 +0000
branchjv
changeset 15973 18139a360981
parent 15963 2dca933fab18 (current diff)
parent 15972 723bad4f8101 (diff)
child 15978 2e1c1fcc135d
Merge
Tools__BrowserList.st
abbrev.stc
extensions.st
libtool.rc
stx_libtool.st
--- a/Tools__BrowserList.st	Thu Nov 26 06:54:59 2015 +0100
+++ b/Tools__BrowserList.st	Fri Nov 27 23:08:58 2015 +0000
@@ -899,6 +899,7 @@
 !
 
 update:something with:aParameter from:changedObject
+    |window|
 
     changedObject == environmentHolder ifTrue:[
         self environmentChanged.
@@ -940,10 +941,10 @@
         "/ self invalidateList. "/  setListValid:false.
     ].
 
-    self window isNil ifTrue:[
+    ((window := self window) notNil and:[window isOpen]) ifFalse:[
         ^ self
     ].
-    self window sensor userEventCount > 100 ifTrue:[
+    window sensor userEventCount > 100 ifTrue:[
         listValid ifTrue:[
             "/ enqueue a full update.
             self setListValid:false.
@@ -2112,10 +2113,10 @@
 !BrowserList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BrowserList.st,v 1.86 2015-05-23 12:47:29 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BrowserList.st,v 1.86 2015-05-23 12:47:29 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/abbrev.stc	Thu Nov 26 06:54:59 2015 +0100
+++ b/abbrev.stc	Fri Nov 27 23:08:58 2015 +0000
@@ -228,3 +228,4 @@
 Tools::HierarchicalChangeList Tools__HierarchicalChangeList stx:libtool 'Interface-Browsers-ChangeSet' 1
 Tools::HierarchicalPackageFilterList Tools__HierarchicalPackageFilterList stx:libtool 'Interface-Browsers-New-Profiler' 1
 Tools::InheritanceClassList Tools__InheritanceClassList stx:libtool 'Interface-Browsers-New' 1
+XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 0
--- a/extensions.st	Thu Nov 26 06:54:59 2015 +0100
+++ b/extensions.st	Fri Nov 27 23:08:58 2015 +0000
@@ -1936,6 +1936,16 @@
     "Created: / 14-10-2010 / 12:04:32 / cg"
 ! !
 
+!SimpleView methodsFor:'inspecting'!
+
+inspectorExtraAttributes
+    ^ super inspectorExtraAttributes
+        add:'-windowGroup' -> [ self instVarNamed:#windowGroup ];
+        add:'-sensor' -> [ self instVarNamed:#sensor ];
+        add:'-parent' -> [ self instVarNamed:#container ];
+        yourself
+! !
+
 !SimpleView methodsFor:'testing'!
 
 isCodeView2
--- a/libtool.rc	Thu Nov 26 06:54:59 2015 +0100
+++ b/libtool.rc	Fri Nov 27 23:08:58 2015 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libtool.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,132
+  FILEVERSION     6,2,1,134
   PRODUCTVERSION  6,2,5,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Tools (LIB)\0"
-      VALUE "FileVersion", "6.2.1.132\0"
+      VALUE "FileVersion", "6.2.1.134\0"
       VALUE "InternalName", "stx:libtool\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Tue, 29 Sep 2015 17:23:53 GMT\0"
+      VALUE "ProductDate", "Thu, 26 Nov 2015 16:19:56 GMT\0"
     END
 
   END
--- a/stx_libtool.st	Thu Nov 26 06:54:59 2015 +0100
+++ b/stx_libtool.st	Fri Nov 27 23:08:58 2015 +0000
@@ -599,6 +599,7 @@
         SmallInteger inspectorExtraAttributes
         SocketAddress inspectorValueStringInListFor:
         CharacterArray inspector2TabXMLTree
+        SimpleView inspectorExtraAttributes
     )
 ! !