Merged 0fdab73d067c and 4230977a8af5 (branch default - CVS head) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 13 Jan 2014 11:46:45 +0000
branchjv
changeset 3429 47dfed736c56
parent 3428 0fdab73d067c (current diff)
parent 3426 4230977a8af5 (diff)
child 3434 a140fb9f5970
Merged 0fdab73d067c and 4230977a8af5 (branch default - CVS head)
SourceCodeManagerUtilities.st
--- a/.hgtags	Mon Jan 06 21:58:34 2014 +0100
+++ b/.hgtags	Mon Jan 13 11:46:45 2014 +0000
@@ -26,7 +26,6 @@
 7e98ed39d4fd9dbabf33dac219211e9b26b0ec49 rel2_10_8_6_last_before_vmData_change
 83824ad8d5cb4b9564a8d61d4eaea720e383ee4f rel5_1_3
 83824ad8d5cb4b9564a8d61d4eaea720e383ee4f stx_513
-848ad94c1e8f5888798d9820432781d73b0c338d expecco_2_6_0
 882d87800deaf0bb95f7d7cdefb4622997dd4543 expeccoNET_1_5_0rc1
 882d87800deaf0bb95f7d7cdefb4622997dd4543 expecco_1_8_2rc1
 891d18a71bbf9f1df5d102cd44ee0393d298aa66 rel5_4_6
@@ -47,6 +46,7 @@
 cc7dd729c2a63686729c206a8f1a31f6e21d8aab expeccoNET_1_5_1rc1
 cd22e54333338ca2523c75c747377620600753f4 expecco_1_8_0rc1
 cdbd6a3ada7b4d839bc9443cdd0d4807b6618492 expecco_1_7_0rc8
+d78776a464e49ca27991b8d8d97b1276e7c7917e expecco_2_6_0
 de51055f13615567a9dd2d55521d6979074e8f41 rel3-1-2
 e749382ae30a3f36c3bf556d60a3bfd43127d059 expecco_1_6_0
 e749382ae30a3f36c3bf556d60a3bfd43127d059 expecco_1_6_0rc5
--- a/SourceCodeManagerUtilities.st	Mon Jan 06 21:58:34 2014 +0100
+++ b/SourceCodeManagerUtilities.st	Mon Jan 13 11:46:45 2014 +0000
@@ -3203,14 +3203,14 @@
     box := DialogBox new.
     box label:title.
 
-    component := box addTextLabel:boxText withCRs.
-    component adjust:#left; borderWidth:0.
+    component := box addTextLabel:boxText withCRs adjust:#left.
+    component borderWidth:0.
     box addVerticalSpace.
     box addVerticalSpace.
 
     y := box yPosition.
-    component := box addTextLabel:(resources string:'Module:').
-    component width:0.4; adjust:#right.
+    component := box addTextLabel:(resources string:'Module:') adjust:#right.
+    component width:0.4.
     box yPosition:y.
     component := box addComboBoxOn:moduleHolder tabable:true.
     component list:knownContainers.
@@ -3220,8 +3220,8 @@
 
     box addVerticalSpace.
     y := box yPosition.
-    component := box addTextLabel:(resources string:'Package:').
-    component width:0.4; adjust:#right.
+    component := box addTextLabel:(resources string:'Package:') adjust:#right.
+    component width:0.4.
     box yPosition:y.
     packageBoxComponent := component := box addComboBoxOn:packageHolder tabable:true.
 "/    component := box addInputFieldOn:packageHolder tabable:true.
@@ -3231,8 +3231,8 @@
 
     box addVerticalSpace.
     y := box yPosition.
-    component := box addTextLabel:(resources string:'Filename:').
-    component width:0.4; adjust:#right.
+    component := box addTextLabel:(resources string:'Filename:') adjust:#right.
+    component width:0.4.
     box yPosition:y.
 
     forNewContainer ifTrue:[
@@ -3248,8 +3248,8 @@
     box addVerticalSpace.
 
     notice notNil ifTrue:[
-        component := box addTextLabel:notice.
-        component adjust:#left; borderWidth:0.
+        component := box addTextLabel:notice adjust:#left.
+        component borderWidth:0.
     ].
 
     box addVerticalSpace.
@@ -3442,22 +3442,22 @@
     box := DialogBox new.
     box label:title.
 
-    component := box addTextLabel:boxText withCRs.
-    component adjust:#left; borderWidth:0.
+    component := box addTextLabel:boxText withCRs adjust:#left.
+    component borderWidth:0.
     box addVerticalSpace.
     box addVerticalSpace.
 
     y := box yPosition.
-    component := box addTextLabel:(resources string:'Revision:').
-    component width:0.4; adjust:#right.
+    component := box addTextLabel:(resources string:'Revision:') adjust:#right.
+    component width:0.4.
     box yPosition:y.
     component := box addComboBoxOn:revisionHolder tabable:true.
     component list:items.
     component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
 
     y := box yPosition.
-    component := box addTextLabel:(resources string:'or Tag:').
-    component width:0.4; adjust:#right.
+    component := box addTextLabel:(resources string:'or Tag:') adjust:#right.
+    component width:0.4.
     box yPosition:y.
     component := box addComboListOn:tagHolder tabable:true.
     component list:tagList.
@@ -3948,11 +3948,11 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.294 2013-08-29 10:26:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.295 2014-01-05 13:18:37 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.294 2013-08-29 10:26:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.295 2014-01-05 13:18:37 cg Exp $'
 !
 
 version_HG