# HG changeset patch # User HG Automerge # Date 1483650326 0 # Node ID e15b5eca8c7a0853b9677c05d491b7283cd0cdae # Parent c4b69c6c5356bb38c70ec461f2dc6343d6e0b8e4# Parent d581c117b1dbd9e2fc3fed55ca466cb3035a730f Merge diff -r c4b69c6c5356 -r e15b5eca8c7a ApplicationModel.st --- a/ApplicationModel.st Thu Dec 29 00:19:20 2016 +0000 +++ b/ApplicationModel.st Thu Jan 05 21:05:26 2017 +0000 @@ -874,7 +874,7 @@ "return true, if this application can be started via #open. (to allow start of a change browser via double-click in the browser)" - (self isAbstract) ifTrue:[^ false "I am abstract"]. + self isAbstract ifTrue:[^ false]. ((self respondsTo:#open) or:[self class includesSelector:#openInterface]) ifFalse:[^ false]. "/ (self respondsTo:#windowSpec) ifFalse:[^ false]. ^ true @@ -1802,9 +1802,9 @@ interfaceSpecifications from a Dictionary or whatever. Typically, an interfaceSpecification is returned there." - ^ ApplicationModel - specificationFor:aKey - application:self + ^ self class + specificationFor:aKey + application:self onDevice:(device) ! diff -r c4b69c6c5356 -r e15b5eca8c7a BooleanBlockValue.st --- a/BooleanBlockValue.st Thu Dec 29 00:19:20 2016 +0000 +++ b/BooleanBlockValue.st Thu Jan 05 21:05:26 2017 +0000 @@ -11,6 +11,8 @@ " "{ Package: 'stx:libview2' }" +"{ NameSpace: Smalltalk }" + BlockValue subclass:#BooleanBlockValue instanceVariableNames:'' classVariableNames:'' @@ -39,7 +41,7 @@ & anotherBooleanValueHolder "return another valueHolder, which returns the logical and of myself and another valueHolder" - ^ BooleanBlockValue + ^ self class forLogical:self and:anotherBooleanValueHolder " @@ -59,7 +61,7 @@ logicalNot "return another valueHolder, which returns the logical not of myself" - ^ BooleanBlockValue forLogicalNot:self. + ^ self class forLogicalNot:self. " |b nb| @@ -76,7 +78,7 @@ | anotherBooleanValueHolder "return another valueHolder, which returns the logical or of myself and another valueHolder" - ^ BooleanBlockValue + ^ self class forLogical:self or:anotherBooleanValueHolder " @@ -98,10 +100,10 @@ !BooleanBlockValue class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/BooleanBlockValue.st,v 1.4 2013-07-27 08:09:59 cg Exp $' + ^ '$Header$' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview2/BooleanBlockValue.st,v 1.4 2013-07-27 08:09:59 cg Exp $' + ^ '$Header$' ! ! diff -r c4b69c6c5356 -r e15b5eca8c7a ColorValue.st --- a/ColorValue.st Thu Dec 29 00:19:20 2016 +0000 +++ b/ColorValue.st Thu Jan 05 21:05:26 2017 +0000 @@ -1,5 +1,3 @@ -"{ Encoding: utf8 }" - " COPYRIGHT (c) 1995 by Claus Gittinger All Rights Reserved @@ -178,7 +176,7 @@ |clr| encoding size == 2 ifTrue:[ - clr := ColorValue name:(encoding at:2). + clr := self class name:(encoding at:2). red := clr scaledRed. green := clr scaledGreen. blue := clr scaledBlue. @@ -224,15 +222,13 @@ "Modified: 22.1.1997 / 04:17:59 / cg" ! ! - - !ColorValue class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/ColorValue.st,v 1.19 2015-03-24 15:15:07 cg Exp $' + ^ '$Header$' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview2/ColorValue.st,v 1.19 2015-03-24 15:15:07 cg Exp $' + ^ '$Header$' ! !