Merge jv
authorMerge Script
Thu, 19 Nov 2015 06:42:10 +0100
branchjv
changeset 3522 e522b598e90a
parent 3518 29fed85b3596 (current diff)
parent 3521 3ba988e35485 (diff)
child 3525 642f9346516c
Merge
--- a/Model.st	Fri Nov 13 06:40:53 2015 +0100
+++ b/Model.st	Thu Nov 19 06:42:10 2015 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview2' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#Model
 	instanceVariableNames:'dependents'
 	classVariableNames:''
@@ -66,6 +68,12 @@
 "
 ! !
 
+!Model class methodsFor:'queries'!
+
+isAbstract
+    ^ self == Model
+! !
+
 !Model methodsFor:'converting'!
 
 skippedInLiteralEncoding
@@ -276,5 +284,6 @@
 !Model class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Model.st,v 1.40 2012-11-24 12:49:46 stefan Exp $'
+    ^ '$Header$'
 ! !
+
--- a/ResourceSpecEditor.st	Fri Nov 13 06:40:53 2015 +0100
+++ b/ResourceSpecEditor.st	Thu Nov 19 06:42:10 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1997-1998 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libview2' }"
 
+"{ NameSpace: Smalltalk }"
+
 ToolApplicationModel subclass:#ResourceSpecEditor
 	instanceVariableNames:'specClass specClassName specSelector aspects modified hasSaved
 		tabSelection isEmbeddedInBrowser'
@@ -663,7 +667,7 @@
     "opens a System Browser on the specClass and specSelector"
 
     specClass notNil 
-        ifTrue: [UserPreferences systemBrowserClass openInClass:specClass class selector: specSelector] 
+        ifTrue: [specClass browserClass openInClass:specClass class selector: specSelector] 
         ifFalse:[self information:'No class defined!!']
 !
 
@@ -784,9 +788,10 @@
 !ResourceSpecEditor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ResourceSpecEditor.st,v 1.49 2010-10-25 10:02:04 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/ResourceSpecEditor.st,v 1.49 2010-10-25 10:02:04 cg Exp $'
+    ^ '$Header$'
 ! !
+
--- a/ToolApplicationModel.st	Fri Nov 13 06:40:53 2015 +0100
+++ b/ToolApplicationModel.st	Thu Nov 19 06:42:10 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1997 by eXept Software AG
               All Rights Reserved
@@ -913,12 +911,8 @@
 
 !ToolApplicationModel 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 == ToolApplicationModel ifTrue:[^false].
-    ^super isVisualStartable
+isAbstract
+    ^ self == ToolApplicationModel 
 ! !
 
 !ToolApplicationModel class methodsFor:'startup & release'!