Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jv
authorMerge Script
Thu, 19 Nov 2015 06:41:45 +0100
branchjv
changeset 15949 9c20ced90e66
parent 15937 b79f5d644b9a (current diff)
parent 15948 6c77b437c12b (diff)
child 15951 0cebe6652d14
Merge
AbstractLauncherApplication.st file | annotate | diff | comparison | revisions
AbstractSettingsApplication.st file | annotate | diff | comparison | revisions
FileOperation.st file | annotate | diff | comparison | revisions
InspectorView.st file | annotate | diff | comparison | revisions
MemoryUsageView.st file | annotate | diff | comparison | revisions
MultiViewToolApplication.st file | annotate | diff | comparison | revisions
SystemBrowser.st file | annotate | diff | comparison | revisions
Tools__BreakpointBrowser.st file | annotate | diff | comparison | revisions
Tools__NewSystemBrowser.st file | annotate | diff | comparison | revisions
Tools__TestRunner2.st file | annotate | diff | comparison | revisions 
--- a/AbstractLauncherApplication.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/AbstractLauncherApplication.st	Thu Nov 19 06:41:45 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1997 by eXept Software AG
               All Rights Reserved
@@ -188,17 +186,8 @@
 
 !AbstractLauncherApplication class methodsFor:'queries'!
 
-isVisualStartable
-    "return true, if this application can be started via #open.
-     (to allow start of a change browser via double-click in the browser)"
-
-    "/ assume all my subclasses can
-    ^ self ~~ AbstractLauncherApplication
-
-    "
-     AbstractLauncherApplication isVisualStartable
-     NewLauncher isVisualStartable
-    "
+isAbstract
+    ^ self == AbstractLauncherApplication
 ! !
 
 !AbstractLauncherApplication class methodsFor:'settings application list'!
--- a/AbstractSettingsApplication.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/AbstractSettingsApplication.st	Thu Nov 19 06:41:45 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
 	      All Rights Reserved
@@ -539,12 +537,8 @@
 
 !AbstractSettingsApplication class methodsFor:'queries'!
 
-isVisualStartable
-    "return true, if this application can be started via #open.
-     (to allow start of a change browser via double-click in the browser)"
-
-    (self == AbstractSettingsApplication) ifTrue:[^ false "I am abstract"].
-    ^ super isVisualStartable
+isAbstract
+    ^ (self == AbstractSettingsApplication)
 ! !
 
 !AbstractSettingsApplication methodsFor:'accessing'!
--- a/FileOperation.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/FileOperation.st	Thu Nov 19 06:41:45 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2003 by eXept Software AG
 	      All Rights Reserved
@@ -161,6 +159,12 @@
     ^ '.copy'
 ! !
 
+!FileOperation class methodsFor:'queries'!
+
+isAbstract
+    ^ self == FileOperation
+! !
+
 !FileOperation methodsFor:'accessing'!
 
 errorString
@@ -1650,10 +1654,10 @@
 !FileOperation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.99 2015-04-12 15:01:54 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.99 2015-04-12 15:01:54 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/InspectorView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/InspectorView.st	Thu Nov 19 06:41:45 2015 +0100
@@ -2294,8 +2294,7 @@
     |cls|
 
     cls := what class.
-    (cls browserClass ? UserPreferences systemBrowserClass) 
-        openInClass:cls selector:nil
+    cls browserClass openInClass:cls selector:nil
 
     "Created: / 14-12-1995 / 19:15:50 / cg"
     "Modified: / 27-07-2012 / 22:42:44 / cg"
--- a/MemoryUsageView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/MemoryUsageView.st	Thu Nov 19 06:41:45 2015 +0100
@@ -194,7 +194,7 @@
     |class|
 
     (class := self selectedClass) isNil ifTrue:[ ^ self ].
-    UserPreferences systemBrowserClass openInClass:class.
+    class browserClass openInClass:class.
 
     "Modified: / 11-05-2011 / 14:34:38 / cg"
 !
--- a/MultiViewToolApplication.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/MultiViewToolApplication.st	Thu Nov 19 06:41:45 2015 +0100
@@ -547,6 +547,10 @@
 
 !MultiViewToolApplication class methodsFor:'queries'!
 
+isAbstract
+    ^ self == MultiViewToolApplication
+!
+
 isVisualStartable
     "return true, if this application can be started via #open.
      (to allow start of a change browser via double-click in the browser)"
@@ -1413,10 +1417,10 @@
 !MultiViewToolApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/MultiViewToolApplication.st,v 1.53 2015-02-24 15:44:47 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/MultiViewToolApplication.st,v 1.53 2015-02-24 15:44:47 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/SystemBrowser.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/SystemBrowser.st	Thu Nov 19 06:41:45 2015 +0100
@@ -122,7 +122,7 @@
 
 openInClass:aClass selector:aSelector
     "launch a standard browser which immediately switches
-     to aClass>>aSelector."
+     to aClass>>aSelector. Returns the browser"
 
     |brwsr classesName|
 
@@ -378,7 +378,7 @@
     "convenient getter for the user's preference.
      Returns his choice of browser class"
 
-    ^ UserPreferences current systemBrowserClass
+    ^ UserPreferences systemBrowserClass
 
     "   
      SystemBrowser default open
@@ -510,6 +510,12 @@
             ^ ToolbarIconLibrary perform:iconSymbol
         ].
     ].
+    (aClass isUtilityClass) ifTrue:[
+        ^ ToolbarIconLibrary utilityClassIcon
+    ].
+    (aClass isAbstract) ifTrue:[
+        ^ ToolbarIconLibrary abstractClassIcon
+    ].
 
     ^ nil
 
--- a/Tools__BreakpointBrowser.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__BreakpointBrowser.st	Thu Nov 19 06:41:45 2015 +0100
@@ -1906,13 +1906,13 @@
     |browser|
 
     browser := UserPreferences systemBrowserClass
-	openInClass:(Smalltalk classNamed:className) selector:selector.
+        openInClass:(Smalltalk classNamed:className) selector:selector.
 
     lineNumber notNil ifTrue:[
-	browser codeView cursorLine:lineNumber col:1.
-	browser codeView selectLine:lineNumber.
+        browser codeView 
+            cursorLine:lineNumber col:1;
+            selectLine:lineNumber.
     ].
-
 !
 
 method
@@ -2064,10 +2064,10 @@
 !BreakpointBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.55 2015-05-07 22:32:03 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.55 2015-05-07 22:32:03 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/Tools__NewSystemBrowser.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__NewSystemBrowser.st	Thu Nov 19 06:41:45 2015 +0100
@@ -8704,7 +8704,7 @@
 
     <resource: #menu>
 
-    ^
+    ^ 
      #(Menu
         (
          (MenuItem
@@ -8717,7 +8717,7 @@
             itemValue: classMenuNewSubclass
           )
          (MenuItem
-            label: 'Application'
+            label: 'GUI Application'
             itemValue: classMenuNewApplication
           )
          (MenuItem
@@ -18248,7 +18248,8 @@
 !
 
 openInClass:aClass selector:aSelector
-    "launch a full browser, with aClass/aSelector initially selected."
+    "launch a full browser, with aClass/aSelector initially selected.
+     Returns the browser"
 
     |browser|
 
--- a/Tools__TestRunner2.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__TestRunner2.st	Thu Nov 19 06:41:45 2015 +0100
@@ -1548,9 +1548,7 @@
     ].
 
     cls notNil ifTrue:[
-        UserPreferences systemBrowserClass 
-            openInClass: cls 
-            selector:selector.
+        cls browse:selector.
     ].
 
     "Created: / 23-09-2011 / 18:55:50 / cg"
@@ -1930,7 +1928,7 @@
 !TestRunner2::ClassList class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.64 2015-02-28 20:35:02 cg Exp $'
+    ^'$Header$'
 ! !
 
 !TestRunner2::ClassList methodsFor:'private'!
@@ -2435,15 +2433,15 @@
 !TestRunner2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.64 2015-02-28 20:35:02 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.64 2015-02-28 20:35:02 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: Tools__TestRunner2.st,v 1.64 2015-02-28 20:35:02 cg Exp $'
+    ^ '$Id$'
 ! !
hg/stx-libtool