equal
deleted
inserted
replaced
497 ]. |
497 ]. |
498 lbl notNil ifTrue:[ rawLabel := lbl ]. |
498 lbl notNil ifTrue:[ rawLabel := lbl ]. |
499 ]. |
499 ]. |
500 ]. |
500 ]. |
501 ] ifFalse:[ |
501 ] ifFalse:[ |
502 (rawLabel isKindOf:LabelAndIcon) ifTrue:[ |
502 (rawLabel isLabelAndIcon) ifTrue:[ |
503 rawLabel := rawLabel copy string:(resources string:rawLabel string). |
503 rawLabel := rawLabel copy string:(resources string:rawLabel string). |
504 ]. |
504 ]. |
505 |
505 |
506 rawLabel isSequenceable ifFalse:[^ rawLabel]. |
506 rawLabel isSequenceable ifFalse:[^ rawLabel]. |
507 rawLabel isEmptyOrNil ifTrue:[^ nil ]. |
507 rawLabel isEmptyOrNil ifTrue:[^ nil ]. |
526 rawLabel isEmpty ifTrue:[ ^ nil ]. |
526 rawLabel isEmpty ifTrue:[ ^ nil ]. |
527 lbl := rawLabel asStringCollection. |
527 lbl := rawLabel asStringCollection. |
528 lbl size > 1 ifTrue:[^ lbl ]. |
528 lbl size > 1 ifTrue:[^ lbl ]. |
529 ]. |
529 ]. |
530 ^ rawLabel |
530 ^ rawLabel |
|
531 |
|
532 "Modified: / 04-02-2017 / 22:10:42 / cg" |
531 ! ! |
533 ! ! |
532 |
534 |
533 !DataSetLabel methodsFor:'queries'! |
535 !DataSetLabel methodsFor:'queries'! |
534 |
536 |
535 hasSeparator |
537 hasSeparator |