Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 04 Sep 2015 06:42:45 +0100
branchjv
changeset 15843 1c2cf683dbd2
parent 15830 21dc9d6ef3a1 (current diff)
parent 15837 95f2b67f68e8 (diff)
child 15844 024b2d99744a
Merge
DebugView.st
FileBrowser.st
NewLauncher.st
SystemBrowser.st
Tools__LintRuleDetail.st
Tools__ProjectCheckerBrowser.st
WorkspaceApplication.st
--- a/DebugView.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/DebugView.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -4389,25 +4391,24 @@
     sel := mthd selector.
 
     (cls notNil and:[(cls includesSelector:sel)]) ifTrue:[
-	cls browserClass openInClass:cls selector:sel.
-	^ self
+        cls browserClass openInClass:cls selector:sel.
+        ^ self
     ].
 
     mthd source notEmptyOrNil ifTrue:[
-	(Dialog confirm:'Block''s home method is (no longer) present in any class.\Do you want to see the method anyway?' withCRs)
-	ifTrue:[
-	    UserPreferences current systemBrowserClass
-		browseMethods:{ mthd } title:'Unbound Method' sort:false
-	    "/ TextView openWith:mthd source title:'Unbound Method''s Source'.
-	].
-	^ self
+        (Dialog confirm:'Block''s home method is (no longer) present in any class.\Do you want to see the method anyway?' withCRs)
+        ifTrue:[
+            SystemBrowser default browseMethods:{ mthd } title:'Unbound Method' sort:false
+            "/ TextView openWith:mthd source title:'Unbound Method''s Source'.
+        ].
+        ^ self
     ].
     cls notNil ifTrue:[
-	(Dialog confirm:'Block''s home method is (no longer) present in any class and no source can be shown.\Do you want to browse the method''s last class instead?' withCRs)
-	ifTrue:[
-	    cls browserClass openInClass:cls selector:nil.
-	].
-	^ self
+        (Dialog confirm:'Block''s home method is (no longer) present in any class and no source can be shown.\Do you want to browse the method''s last class instead?' withCRs)
+        ifTrue:[
+            cls browserClass openInClass:cls selector:nil.
+        ].
+        ^ self
     ].
     Dialog information:'Block''s home method is (no longer) present in any class.'.
 !
--- a/FileBrowser.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/FileBrowser.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1991 by Claus Gittinger
               All Rights Reserved
@@ -166,6 +164,14 @@
 
 !FileBrowser class methodsFor:'defaults'!
 
+default
+    ^ UserPreferences current fileBrowserClass 
+
+    "   
+     FileBrowser default open
+    "
+!
+
 defaultIcon
     "return the file browsers default window icon"
 
@@ -7537,10 +7543,10 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.669 2015-03-25 19:20:05 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.669 2015-03-25 19:20:05 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/NewLauncher.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/NewLauncher.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1997-1998 by eXept Software AG
 	      All Rights Reserved
@@ -3924,7 +3926,7 @@
                                         package notNil ifTrue:[
                                             dir := Smalltalk packageDirectoryForPackageId:package.
                                             dir notNil ifTrue:[
-                                                UserPreferences current fileBrowserClass openOn:dir.
+                                                FileBrowser default openOn:dir.
                                             ] ifFalse:[
                                                 Dialog warn:(resources string:'Directory not present/readable: "%1"' with:dir)
                                             ]
@@ -3936,7 +3938,7 @@
                                 itemValue: 
                                     [
                                         defClass notNil ifTrue:[
-                                            UserPreferences current systemBrowserClass openInClass:defClass class
+                                            SystemBrowser default openInClass:defClass class
                                         ].
                                     ]
                                 enabled:defClass notNil).
@@ -5384,8 +5386,7 @@
 findApplicationAndOpen
     |cls|
 
-    cls := UserPreferences current systemBrowserClass 
-                askForClassWithFilter:[:cls | cls isVisualStartable].
+    cls := SystemBrowser default askForClassWithFilter:[:cls | cls isVisualStartable].
     cls notNil ifTrue:[
         cls open
     ]
@@ -5394,10 +5395,9 @@
 findClassAndBrowse
     |cls|
 
-    cls := UserPreferences current systemBrowserClass askForClass.
+    cls := SystemBrowser default askForClass.
     cls notNil ifTrue:[
-        UserPreferences current systemBrowserClass 
-            openInClass:cls selector:nil
+        SystemBrowser default openInClass:cls selector:nil
     ]
 !
 
--- a/SystemBrowser.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/SystemBrowser.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -99,6 +101,7 @@
     ^ self openOnDevice:(Screen current) 
 
     "
+     SystemBrowser default open
      SystemBrowser open
     "
 !
@@ -110,6 +113,7 @@
     ^ self openInClass:aClass selector:nil
 
     "
+     SystemBrowser default openInClass:Object
      SystemBrowser openInClass:Object
     "
 
@@ -162,6 +166,9 @@
         label:(self classResources string:'System Browser')
 
     "
+     SystemBrowser default openOn:Smalltalk
+     SystemBrowser default openOn:Demos
+
      SystemBrowser openOn:Smalltalk
      SystemBrowser openOn:Demos
     "
@@ -367,6 +374,17 @@
     "Modified: / 10.2.2000 / 14:07:07 / cg"
 !
 
+default
+    "convenient getter for the user's preference.
+     Returns his choice of browser class"
+
+    ^ UserPreferences current systemBrowserClass
+
+    "   
+     SystemBrowser default open
+    "
+!
+
 methodTemplate
     "return a method definition template string or nil"
 
@@ -7011,15 +7029,15 @@
 !SystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.358 2015-03-30 20:07:13 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.358 2015-03-30 20:07:13 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: SystemBrowser.st,v 1.358 2015-03-30 20:07:13 cg Exp $'
+    ^ '$Id$'
 ! !
 
 
--- a/Tools__LintRuleDetail.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/Tools__LintRuleDetail.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
  Copyright (c) 2009-2010 eXept Software AG
@@ -404,6 +406,7 @@
 
 setupHTMLView:aView
     rationalView := aView.
+    rationalView linkActionPerformer:self.
     aView painter
         leftMargin:20;
         topMargin:5.
@@ -475,14 +478,14 @@
 !LintRuleDetail class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__LintRuleDetail.st,v 1.15 2014-11-23 17:21:24 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__LintRuleDetail.st,v 1.15 2014-11-23 17:21:24 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: Tools__LintRuleDetail.st,v 1.15 2014-11-23 17:21:24 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/Tools__ProjectCheckerBrowser.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/Tools__ProjectCheckerBrowser.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -406,6 +408,7 @@
 !ProjectCheckerBrowser methodsFor:'hooks'!
 
 setupHTMLView:aView
+    aView linkActionPerformer:self.
     aView painter
         leftMargin:20;
         topMargin:5.
@@ -416,11 +419,11 @@
 !ProjectCheckerBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ProjectCheckerBrowser.st,v 1.4 2013-03-30 19:07:38 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ProjectCheckerBrowser.st,v 1.4 2013-03-30 19:07:38 cg Exp $'
+    ^ '$Header$'
 !
 
 version_HG
@@ -429,6 +432,6 @@
 !
 
 version_SVN
-    ^ 'Id: Tools__ProjectCheckerBrowser.st 8024 2012-07-26 10:10:37Z vranyj1 '
+    ^ '$Id$'
 ! !
 
--- a/WorkspaceApplication.st	Thu Sep 03 06:56:33 2015 +0200
+++ b/WorkspaceApplication.st	Fri Sep 04 06:42:45 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2001 by eXept Software AG
               All Rights Reserved
@@ -57,6 +55,13 @@
 
 !WorkspaceApplication class methodsFor:'defaults'!
 
+default
+    "a place where the default workspaceApplication could be hooked in;
+     see SystemBrowser default and FileBrowser default on the intention..."
+
+    ^ self
+!
+
 defaultEditToolbarVisible
     ^ UserPreferences current editToolbarVisibleInWorkspace