Changeset 5280

Show
Ignore:
Timestamp:
08/27/08 16:18:11 (3 months ago)
Author:
magi@…
Message:

Toolkit 5.2.6 release.

Location:
branches/5.2
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/5.2/WebContent/release-notes.html

    r5200 r5280  
    124124  <tr><td>[<a href="http://dev.itmill.com/changeset/5147">5147</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/1733">1733</a> (<i>Add Toolkit and application version information to debug-window</i>) , version information is now printed on clients "DebugConsole"</td></tr> 
    125125  <tr><td>[<a href="http://dev.itmill.com/changeset/5150">5150</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/1926">1926</a> (random layout issues with Safari + Splitpanel)</td></tr> 
    126   <tr><td>[<a href="http://dev.itmill.com/changeset/5152">5152</a>]:</td><td>Refactored inner class not to contain reference to main object</td></tr> 
    127126  <tr><td>[<a href="http://dev.itmill.com/changeset/5155">5155</a>]:</td><td>Fixed #<a href="http://dev.itmill.com/ticket/1953">1953</a> (<i>IGridlayout fails to render rows with colspanned rows properly</i>)  IGridlayout fails to render rows with colspanned rows properly</td></tr> 
    128127  <tr><td>[<a href="http://dev.itmill.com/changeset/5156">5156</a>]:</td><td>Fix for invalid css value for textfield width</td></tr> 
    … …  
    157156  <tr><td>[<a href="http://dev.itmill.com/changeset/5197">5197</a>]:</td><td>Minor changes for tabIndex definition.</td></tr> 
    158157  <tr><td>[<a href="http://dev.itmill.com/changeset/5198">5198</a>]:</td><td>TabIndex definition fix for Select</td></tr> 
     158  <tr><td>[<a href="http://dev.itmill.com/changeset/5201">5201</a>]:</td><td>Fixed height/width typo in ITextField</td></tr> 
     159  <tr><td>[<a href="http://dev.itmill.com/changeset/5202">5202</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/1987">1987</a> (bad variable names caused exceptions -> all sub windows not rendered)</td></tr> 
     160  <tr><td>[<a href="http://dev.itmill.com/changeset/5203">5203</a>]:</td><td>Fixed used space calculation for ExpandLayout</td></tr> 
     161  <tr><td>[<a href="http://dev.itmill.com/changeset/5204">5204</a>]:</td><td>addItem(Object[],Object) now ignores generated columns. Fixes #<a href="http://dev.itmill.com/ticket/1967">1967</a> (<i>Table with generated column does not allow adding items as object vectors</i>) .</td></tr> 
     162  <tr><td>[<a href="http://dev.itmill.com/changeset/5205">5205</a>]:</td><td>Cursor position updated as needed after each addComponent(). Fixes #<a href="http://dev.itmill.com/ticket/1972">1972</a> (<i>GridLayout fails to keep track of current position</i>) </td></tr> 
     163  <tr><td>[<a href="http://dev.itmill.com/changeset/5207">5207</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/1988">1988</a> (Window moving weirdness with undefined width)</td></tr> 
     164  <tr><td>[<a href="http://dev.itmill.com/changeset/5210">5210</a>]:</td><td>cleaning WebContent/ITMILL directory</td></tr> 
     165  <tr><td>[<a href="http://dev.itmill.com/changeset/5211">5211</a>]:</td><td>cleaning WebContent directory</td></tr> 
     166  <tr><td>[<a href="http://dev.itmill.com/changeset/5212">5212</a>]:</td><td>added test case</td></tr> 
     167  <tr><td>[<a href="http://dev.itmill.com/changeset/5213">5213</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/1969">1969</a> (<i>Changes in TabSheets subcomponents forces TabSheet re-rendering</i>) </td></tr> 
     168  <tr><td>[<a href="http://dev.itmill.com/changeset/5214">5214</a>]:</td><td>Faulty if-clause caused ill-placed popup in some cases. Fixes #<a href="http://dev.itmill.com/ticket/1886">1886</a> (<i>Lower part of Popup Datefield sometimes out of screen</i>) </td></tr> 
     169  <tr><td>[<a href="http://dev.itmill.com/changeset/5216">5216</a>]:</td><td>Filtering no longer reacts to shift/ctrl/alt, fixes #<a href="http://dev.itmill.com/ticket/1947">1947</a> (<i>Combobox should ignore all modifier keys when filtering</i>) </td></tr> 
     170  <tr><td>[<a href="http://dev.itmill.com/changeset/5221">5221</a>]:</td><td>Now implements ValueChangeNotifier. Fixes #<a href="http://dev.itmill.com/ticket/1978">1978</a> (<i>Generated table columns not updated when a BeanItem changes</i>) . </td></tr> 
     171  <tr><td>[<a href="http://dev.itmill.com/changeset/5224">5224</a>]:</td><td>setContainerDataSource() now accepts null. Fixes #<a href="http://dev.itmill.com/ticket/1971">1971</a> (<i>Tree.setContainerDataSource() should accept null.</i>) .</td></tr> 
     172  <tr><td>[<a href="http://dev.itmill.com/changeset/5232">5232</a>]:</td><td>Displayed empty if value==null even if nullselection is not allowed. Fixes #<a href="http://dev.itmill.com/ticket/1996">1996</a> (<i>NativeSelect w/ nullselect disabled, null value 'rendered' wrong</i>) </td></tr> 
     173  <tr><td>[<a href="http://dev.itmill.com/changeset/5233">5233</a>]:</td><td>Unified constructors + getter required, setter not; fixes #<a href="http://dev.itmill.com/ticket/1998">1998</a> (<i>BeanItem bug&constructor inconsist</i>)  and really-fixes #<a href="http://dev.itmill.com/ticket/1076">1076</a> (<i>BeanItem fails if getter not defined, was "FeatureBrowser does not start with TK5</i>) </td></tr> 
     174  <tr><td>[<a href="http://dev.itmill.com/changeset/5234">5234</a>]:</td><td>Fixes #<a href="http://dev.itmill.com/ticket/1995">1995</a> (<i>Cannot add items to IndexedContainer when using filters</i>) : Cannot add items to IndexedContainer when using filters</td></tr> 
     175  <tr><td>[<a href="http://dev.itmill.com/changeset/5235">5235</a>]:</td><td>Fixes #<a href="http://dev.itmill.com/ticket/2000">2000</a> (<i>AbstractComponent parses size "100" incorrectly</i>)  : AbstractComponent parses size "100" incorrectly</td></tr> 
     176  <tr><td>[<a href="http://dev.itmill.com/changeset/5239">5239</a>]:</td><td>Separate scrollbars for overly-wide errormessages and descriptions. Fixes #<a href="http://dev.itmill.com/ticket/1898">1898</a> (<i>StackTrace error messages look broken</i>) </td></tr> 
     177  <tr><td>[<a href="http://dev.itmill.com/changeset/5242">5242</a>]:</td><td>Fixes for #<a href="http://dev.itmill.com/ticket/2002">2002</a> (<i>Component error handling</i>)  and #<a href="http://dev.itmill.com/ticket/1642">1642</a> (<i>CommunicationManager exceptions should throw also TerminalError</i>)  - improved exception handling in CommunicationManager</td></tr> 
     178  <tr><td>[<a href="http://dev.itmill.com/changeset/5243">5243</a>]:</td><td>setPageLength() no longer resets scroll position (fixes #<a href="http://dev.itmill.com/ticket/1952">1952</a> (<i>Setting Table page length resets current scroll position</i>) ), setCurrentPageFirst*() resets page buffer.</td></tr> 
     179  <tr><td>[<a href="http://dev.itmill.com/changeset/5248">5248</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/2008">2008</a> (<i>Client side select not updated properly</i>) , client side did not update selection in some situations</td></tr> 
     180  <tr><td>[<a href="http://dev.itmill.com/changeset/5249">5249</a>]:</td><td>Fixes #<a href="http://dev.itmill.com/ticket/1230">1230</a> (<i>AbstractSelect.select(null) causes NPE in HashMap</i>)  - NPE in AbstractSelect.select and allow selecting null -> NullSelectionItem</td></tr> 
     181  <tr><td>[<a href="http://dev.itmill.com/changeset/5250">5250</a>]:</td><td>Made #<a href="http://dev.itmill.com/ticket/1642">1642</a> (<i>CommunicationManager exceptions should throw also TerminalError</i>)  fix more generic by moving implementation to AbstractComponent</td></tr> 
     182  <tr><td>[<a href="http://dev.itmill.com/changeset/5252">5252</a>]:</td><td>Fixed #<a href="http://dev.itmill.com/ticket/677">677</a> (<i>Components inside a disabled Container are not disabled</i>)  disabling components inside a disabled container</td></tr> 
     183  <tr><td>[<a href="http://dev.itmill.com/changeset/5253">5253</a>]:</td><td>Fixed #<a href="http://dev.itmill.com/ticket/677">677</a> (<i>Components inside a disabled Container are not disabled</i>)  for Form</td></tr> 
     184  <tr><td>[<a href="http://dev.itmill.com/changeset/5254">5254</a>]:</td><td>Fixes #<a href="http://dev.itmill.com/ticket/2005">2005</a> (server-side scrolling of table broken)</td></tr> 
     185  <tr><td>[<a href="http://dev.itmill.com/changeset/5255">5255</a>]:</td><td>#<a href="http://dev.itmill.com/ticket/1986">1986</a> (tabindex for some selects)</td></tr> 
     186  <tr><td>[<a href="http://dev.itmill.com/changeset/5260">5260</a>]:</td><td>fixes #<a href="http://dev.itmill.com/ticket/1973">1973</a> (<i>Table renders layouts incorrectly when changing containers</i>) , changed cache row fetching to be more lazy - no re-fetching for rendered rows, but may affect one extra fetch in some situations.</td></tr> 
     187  <tr><td>[<a href="http://dev.itmill.com/changeset/5261">5261</a>]:</td><td>Fixes #<a href="http://dev.itmill.com/ticket/1975">1975</a> (<i>Extending theme from JAR fails with custom layouts</i>)  - CustomLayout template can be specified in java</td></tr> 
     188  <tr><td>[<a href="http://dev.itmill.com/changeset/5277">5277</a>]:</td><td>enabled editable mode in table (broken since [<a href="http://dev.itmill.com/changeset/5243">5243</a>]</td></tr> 
    159189</table> 
    160190 

  • branches/5.2/build/merge/merge-5.2.6.cfg

    r5200 r5280  
    603603#Added Accordion example to Feature Browser for #1944. 
    604604------------------------------------------------------------------------ 
    605 r5152 | matti.tahvonen@itmill.com | 2008-08-06 16:53:37 +0300 (ke, 06 elo    2008) | 1 line 
    606  
    607 Refactored inner class not to contain reference to main object 
     605#r5152 | matti.tahvonen@itmill.com | 2008-08-06 16:53:37 +0300 (ke, 06 elo    2008) | 1 line 
     606# 
     607#Refactored inner class not to contain reference to main object 
    608608------------------------------------------------------------------------ 
    609609#r5153 | matti.tahvonen@itmill.com | 2008-08-07 12:02:09 +0300 (to, 07 elo    2008) | 1 line 
    … …  
    780780TabIndex definition fix for Select 
    781781------------------------------------------------------------------------ 
     782r5201 | artur.signell@itmill.com | 2008-08-18 11:17:22 +0300 (ma, 18 elo    2008) | 1 line 
     783 
     784Fixed height/width typo in ITextField 
     785------------------------------------------------------------------------ 
     786r5202 | matti.tahvonen@itmill.com | 2008-08-18 11:33:00 +0300 (ma, 18 elo    2008) | 1 line 
     787 
     788fixes #1987 (bad variable names caused exceptions -> all sub windows not rendered) 
     789------------------------------------------------------------------------ 
     790r5203 | artur.signell@itmill.com | 2008-08-18 13:14:30 +0300 (ma, 18 elo    2008) | 1 line 
     791 
     792Fixed used space calculation for ExpandLayout 
     793------------------------------------------------------------------------ 
     794r5204 | marc.englund@itmill.com | 2008-08-18 13:15:11 +0300 (ma, 18 elo    2008) | 1 line 
     795 
     796addItem(Object[],Object) now ignores generated columns. Fixes #1967. 
     797------------------------------------------------------------------------ 
     798r5205 | marc.englund@itmill.com | 2008-08-18 15:13:07 +0300 (ma, 18 elo    2008) | 1 line 
     799 
     800Cursor position updated as needed after each addComponent(). Fixes #1972 
     801------------------------------------------------------------------------ 
     802r5207 | matti.tahvonen@itmill.com | 2008-08-18 16:27:36 +0300 (ma, 18 elo    2008) | 1 line 
     803 
     804fixes #1988 (Window moving weirdness with undefined width) 
     805------------------------------------------------------------------------ 
     806#r5209 | matti.tahvonen@itmill.com | 2008-08-19 10:30:42 +0300 (ti, 19 elo    2008) | 1 line 
     807# 
     808#styles for test #1919 
     809------------------------------------------------------------------------ 
     810r5210 | matti.tahvonen@itmill.com | 2008-08-19 10:36:08 +0300 (ti, 19 elo    2008) | 1 line 
     811 
     812cleaning WebContent/ITMILL directory 
     813------------------------------------------------------------------------ 
     814r5211 | matti.tahvonen@itmill.com | 2008-08-19 10:43:39 +0300 (ti, 19 elo    2008) | 1 line 
     815 
     816cleaning WebContent directory 
     817------------------------------------------------------------------------ 
     818r5212 | matti.tahvonen@itmill.com | 2008-08-19 12:56:00 +0300 (ti, 19 elo    2008) | 1 line 
     819 
     820added test case 
     821------------------------------------------------------------------------ 
     822r5213 | matti.tahvonen@itmill.com | 2008-08-19 13:19:20 +0300 (ti, 19 elo    2008) | 1 line 
     823 
     824fixes #1969 
     825------------------------------------------------------------------------ 
     826r5214 | marc.englund@itmill.com | 2008-08-19 14:26:22 +0300 (ti, 19 elo    2008) | 1 line 
     827 
     828Faulty if-clause caused ill-placed popup in some cases. Fixes #1886 
     829------------------------------------------------------------------------ 
     830r5216 | marc.englund@itmill.com | 2008-08-19 15:55:48 +0300 (ti, 19 elo    2008) | 1 line 
     831 
     832Filtering no longer reacts to shift/ctrl/alt, fixes #1947 
     833------------------------------------------------------------------------ 
     834#r5217 | joonas.lehtinen@itmill.com | 2008-08-19 19:33:36 +0300 (ti, 19 elo    2008) | 1 line 
     835# 
     836#Fixes IOrderedLayout #1977 and #1966 
     837------------------------------------------------------------------------ 
     838#r5218 | marc.englund@itmill.com | 2008-08-20 08:43:14 +0300 (ke, 20 elo    2008) | 1 line 
     839# 
     840#un-java5-ified 
     841------------------------------------------------------------------------ 
     842#r5219 | matti.tahvonen@itmill.com | 2008-08-20 08:48:27 +0300 (ke, 20 elo    2008) | 1 line 
     843# 
     844#added a test case 
     845------------------------------------------------------------------------ 
     846r5221 | marc.englund@itmill.com | 2008-08-20 10:44:17 +0300 (ke, 20 elo    2008) | 1 line 
     847 
     848Now implements ValueChangeNotifier. Fixes #1978.  
     849------------------------------------------------------------------------ 
     850#r5222 | matti.tahvonen@itmill.com | 2008-08-20 10:55:56 +0300 (ke, 20 elo    2008) | 1 line 
     851# 
     852#added null check to live after gwt 1.5 upgrade 
     853------------------------------------------------------------------------ 
     854# Ei: API-muutos 
     855#r5223 | marc.englund@itmill.com | 2008-08-20 11:47:27 +0300 (ke, 20 elo    2008) | 1 line 
     856# 
     857#WidgetSet.createWidget() now returns Paintable, to indicate that that's required. Fixes #1974. 
     858------------------------------------------------------------------------ 
     859r5224 | marc.englund@itmill.com | 2008-08-20 12:39:18 +0300 (ke, 20 elo    2008) | 1 line 
     860 
     861setContainerDataSource() now accepts null. Fixes #1971. 
     862------------------------------------------------------------------------ 
     863#r5225 | artur.signell@itmill.com | 2008-08-21 08:21:20 +0300 (to, 21 elo    2008) | 1 line 
     864# 
     865#Testcase for #1995 
     866------------------------------------------------------------------------ 
     867#r5228 | artur.signell@itmill.com | 2008-08-21 09:56:06 +0300 (to, 21 elo    2008) | 1 line 
     868# 
     869#Removed annotation  
     870------------------------------------------------------------------------ 
     871#r5229 | artur.signell@itmill.com | 2008-08-21 09:59:16 +0300 (to, 21 elo    2008) | 1 line 
     872# 
     873#Removed annotation 
     874------------------------------------------------------------------------ 
     875#r5230 | artur.signell@itmill.com | 2008-08-21 10:04:51 +0300 (to, 21 elo    2008) | 1 line 
     876# 
     877#Fixed #1995 testcase 
     878------------------------------------------------------------------------ 
     879r5232 | marc.englund@itmill.com | 2008-08-21 12:43:07 +0300 (to, 21 elo    2008) | 1 line 
     880 
     881Displayed empty if value==null even if nullselection is not allowed. Fixes #1996 
     882------------------------------------------------------------------------ 
     883r5233 | marc.englund@itmill.com | 2008-08-21 13:18:44 +0300 (to, 21 elo    2008) | 1 line 
     884 
     885Unified constructors + getter required, setter not; fixes #1998 and really-fixes #1076 
     886------------------------------------------------------------------------ 
     887r5234 | joonas.lehtinen@itmill.com | 2008-08-21 13:28:00 +0300 (to, 21 elo    2008) | 1 line 
     888 
     889Fixes #1995: Cannot add items to IndexedContainer when using filters 
     890------------------------------------------------------------------------ 
     891r5235 | joonas.lehtinen@itmill.com | 2008-08-21 14:00:07 +0300 (to, 21 elo    2008) | 1 line 
     892 
     893Fixes #2000 : AbstractComponent parses size "100" incorrectly 
     894------------------------------------------------------------------------ 
     895#r5236 | joonas.lehtinen@itmill.com | 2008-08-21 14:28:23 +0300 (to, 21 elo    2008) | 1 line 
     896# 
     897#Fixes #1940: TextField without caption, but with error, inside fixed width ordered layout shows scrollbar 
     898------------------------------------------------------------------------ 
     899#r5237 | joonas.lehtinen@itmill.com | 2008-08-21 14:40:29 +0300 (to, 21 elo    2008) | 1 line 
     900# 
     901#Test for #2001 
     902------------------------------------------------------------------------ 
     903#r5238 | jouni.koivuviita@itmill.com | 2008-08-21 14:59:09 +0300 (to, 21 elo    2008) | 5 lines 
     904# 
     905#API changes: 
     906#Window.setResizable(boolean resizability) now allows to disable end-user sub-window resizing. 
     907#Window.center() allows to request a sub-window to be centered on screen. 
     908# 
     909#Improved theming capabilities for IWindow: window borders are now calculated dynamically for every sub-window instance, previously only one final static was specified. 
     910------------------------------------------------------------------------ 
     911r5239 | marc.englund@itmill.com | 2008-08-21 16:31:12 +0300 (to, 21 elo    2008) | 1 line 
     912 
     913Separate scrollbars for overly-wide errormessages and descriptions. Fixes #1898 
     914------------------------------------------------------------------------ 
     915#r5240 | risto.yrjana@itmill.com | 2008-08-21 16:36:43 +0300 (to, 21 elo    2008) | 1 line 
     916# 
     917#Copied PopupView from incubator to trunk 
     918------------------------------------------------------------------------ 
     919r5242 | artur.signell@itmill.com | 2008-08-22 10:25:23 +0300 (pe, 22 elo    2008) | 1 line 
     920 
     921Fixes for #2002 and #1642 - improved exception handling in CommunicationManager 
     922------------------------------------------------------------------------ 
     923r5243 | marc.englund@itmill.com | 2008-08-22 10:51:09 +0300 (pe, 22 elo    2008) | 1 line 
     924 
     925setPageLength() no longer resets scroll position (fixes #1952), setCurrentPageFirst*() resets page buffer. 
     926------------------------------------------------------------------------ 
     927#r5244 | joonas.lehtinen@itmill.com | 2008-08-22 12:55:15 +0300 (pe, 22 elo    2008) | 1 line 
     928# 
     929#Test for #1904 
     930------------------------------------------------------------------------ 
     931#r5245 | joonas.lehtinen@itmill.com | 2008-08-22 12:57:20 +0300 (pe, 22 elo    2008) | 1 line 
     932# 
     933#Fixed #1904 : IOrderedLayout spacing and margincs should be specifiable in CSS 
     934------------------------------------------------------------------------ 
     935#r5246 | artur.signell@itmill.com | 2008-08-22 15:51:34 +0300 (pe, 22 elo    2008) | 1 line 
     936# 
     937##1230 Test case 
     938------------------------------------------------------------------------ 
     939#r5247 | joonas.lehtinen@itmill.com | 2008-08-22 16:29:06 +0300 (pe, 22 elo    2008) | 1 line 
     940# 
     941#Testcase for #1970 
     942------------------------------------------------------------------------ 
     943r5248 | matti.tahvonen@itmill.com | 2008-08-25 08:42:18 +0300 (ma, 25 elo    2008) | 1 line 
     944 
     945fixes #2008, client side did not update selection in some situations 
     946------------------------------------------------------------------------ 
     947r5249 | artur.signell@itmill.com | 2008-08-25 08:50:59 +0300 (ma, 25 elo    2008) | 1 line 
     948 
     949Fixes #1230 - NPE in AbstractSelect.select and allow selecting null -> NullSelectionItem 
     950------------------------------------------------------------------------ 
     951r5250 | artur.signell@itmill.com | 2008-08-25 08:59:54 +0300 (ma, 25 elo    2008) | 1 line 
     952 
     953Made #1642 fix more generic by moving implementation to AbstractComponent 
     954------------------------------------------------------------------------ 
     955#r5251 | artur.signell@itmill.com | 2008-08-25 11:02:49 +0300 (ma, 25 elo    2008) | 1 line 
     956# 
     957#Ticket test cases 
     958------------------------------------------------------------------------ 
     959r5252 | artur.signell@itmill.com | 2008-08-25 11:42:23 +0300 (ma, 25 elo    2008) | 1 line 
     960 
     961Fixed #677 disabling components inside a disabled container 
     962------------------------------------------------------------------------ 
     963r5253 | artur.signell@itmill.com | 2008-08-25 11:50:11 +0300 (ma, 25 elo    2008) | 1 line 
     964 
     965Fixed #677 for Form 
     966------------------------------------------------------------------------ 
     967r5254 | marc.englund@itmill.com | 2008-08-25 12:21:00 +0300 (ma, 25 elo    2008) | 1 line 
     968 
     969Fixes #2005 (server-side scrolling of table broken) 
     970------------------------------------------------------------------------ 
     971r5255 | matti.tahvonen@itmill.com | 2008-08-25 12:59:50 +0300 (ma, 25 elo    2008) | 1 line 
     972 
     973#1986 (tabindex for some selects) 
     974------------------------------------------------------------------------ 
     975#r5256 | matti.tahvonen@itmill.com | 2008-08-25 13:01:53 +0300 (ma, 25 elo    2008) | 1 line 
     976# 
     977#updated test case 
     978------------------------------------------------------------------------ 
     979#r5257 | matti.tahvonen@itmill.com | 2008-08-25 13:51:28 +0300 (ma, 25 elo    2008) | 1 line 
     980# 
     981#added test case 
     982------------------------------------------------------------------------ 
     983#r5259 | matti.tahvonen@itmill.com | 2008-08-25 13:53:27 +0300 (ma, 25 elo    2008) | 1 line 
     984# 
     985#removed annotation 
     986------------------------------------------------------------------------ 
     987r5260 | matti.tahvonen@itmill.com | 2008-08-25 14:04:16 +0300 (ma, 25 elo    2008) | 1 line 
     988 
     989fixes #1973, changed cache row fetching to be more lazy - no re-fetching for rendered rows, but may affect one extra fetch in some situations. 
     990------------------------------------------------------------------------ 
     991r5261 | artur.signell@itmill.com | 2008-08-25 14:15:55 +0300 (ma, 25 elo    2008) | 1 line 
     992 
     993Fixes #1975 - CustomLayout template can be specified in java 
     994------------------------------------------------------------------------ 
     995r5277 | matti.tahvonen@itmill.com | 2008-08-27 14:31:14 +0300 (ke, 27 elo~~~ 2008) | 1 line 
     996 
     997enabled editable mode in table (broken since [5243] 
     998------------------------------------------------------------------------ 

  • branches/5.2/build/merge/merge-5.2.6.sh

    r5200 r5280  
    55./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 
    66 
    7 # Silly empty conflict 
    8 cp WebContent/ITMILL/themes/default/button/button.css.merge-right.r5012 WebContent/ITMILL/themes/default/button/button.css 
     7# Use the right range, but omit the last line in the block. 
     8sed -i -e "/^<<<</,/^====/ d" -e "/\/\* Dis/,/^>>>>>>/ d" WebContent/ITMILL/themes/default/button/button.css 
    99svn resolved WebContent/ITMILL/themes/default/button/button.css 
     10 
    1011./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5013 
     12 
     13# Again the button.css. Remove the entire conflict area. 
     14sed -i -e "/^<<<</,/^>>>>/ d" WebContent/ITMILL/themes/default/button/button.css 
     15svn resolved WebContent/ITMILL/themes/default/button/button.css 
     16 
     17./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5015 
     18 
     19# Again the button.css. Use the right range, but omit the last line in the block. 
     20sed -i -e "/^<<<</,/^====/ d" -e "/\/\* Dis/,/^>>>>>>/ d" WebContent/ITMILL/themes/default/button/button.css 
     21svn resolved WebContent/ITMILL/themes/default/button/button.css 
     22 
    1123./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5024 
    1224./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5077 
    1325./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5078 
    14 # Silly empty conflict 
    15 cp src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java.merge-right.r5104 src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java 
     26 
     27# Use the right range, but add also empty lines around the block (use c instead of d). 
     28sed -i -e "/^<<<</,/^====/ c \ " -e "/^>>>>>>/ c \ " src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java   
    1629svn resolved src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java 
    1730./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5105 
    1831 
    19 # Silly empty conflict 
    20 cp src/com/itmill/toolkit/terminal/gwt/client/ui/ToolkitOverlay.java.merge-right.r5152 src/com/itmill/toolkit/terminal/gwt/client/ui/ToolkitOverlay.java 
    21 svn resolved src/com/itmill/toolkit/terminal/gwt/client/ui/ToolkitOverlay.java 
    22  
    23 ./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5153 
    24  
    25 # Silly empty conflict 
    26 cp src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java.merge-right.r5155 src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java 
    27 svn resolved src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java 
    28  
    2932./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5156 
    3033 
    31 echo "Make fix to 5161 manually! See the merge script for instructions." 
    32 exit 1 
    33  
    34 jed src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java 
    35 # The updateFromUIDL should look as follows. 
    36 # The updateComponent() must have ...(,,true) parameter. The 
    37 # handleMargins() is probably not so relevant, but should have the 
    38 # below form. 
    39  
    40 #    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { 
    41 # 
    42 #        this.client = client; 
    43 # 
    44 #        // Ensure correct implementation 
    45 #        if (client.updateComponent(this, uidl, true)) { 
    46 #            return; 
    47 #        } 
    48 # 
    49 #        // Handle layout margins 
    50 #        if (margins.getBitMask() != uidl.getIntAttribute("margins")) { 
    51 #            handleMargins(uidl); 
    52 #        } 
    53 # 
    54 #        // 
    55 #        hasComponentSpacing = uidl.getBooleanAttribute("spacing"); 
     34sed -i -e '/^    public void updateFromUIDL/,/^>>>>>>>/ c\ 
     35    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {\ 
     36\ 
     37        this.client = client;\ 
     38\ 
     39        // Ensure correct implementation\ 
     40        if (client.updateComponent(this, uidl, true)) {\ 
     41            return;\ 
     42        }\ 
     43\ 
     44        // Handle layout margins\ 
     45        if (margins.getBitMask() != uidl.getIntAttribute("margins")) {\ 
     46            handleMargins(uidl);' src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java 
    5647svn resolved src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java 
    5748 
    … …  
    6051./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5162 
    6152./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5197 
     53 
     54################# 
     55 
     56# The change is just a comment change, so remove the entire change. 
     57sed -i -e '/^<<<</,/^>>>>/ {d}' src/com/itmill/toolkit/ui/GridLayout.java 
     58svn resolved src/com/itmill/toolkit/ui/GridLayout.java 
     59 
     60./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5206 
     61 
     62# Simply formatting. Remove the entire change. 
     63sed -i -e '/^<<<</,/^>>>>/ {d}' src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java 
     64svn resolved src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java 
     65 
     66./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5215 
     67 
     68# Not had in the first place. Take in the working copy. 
     69sed -i -e "/^<<<</ {d}" -e "/^====/,/^>>>>/ {d}" WebContent/ITMILL/themes/default/common/common.css 
     70svn resolved WebContent/ITMILL/themes/default/common/common.css 
     71 
     72./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5240 
     73 
     74# Just a test file missing, continue. 
     75./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5250 
     76 
     77# Just a test file missing, continue. 
     78./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5253 
     79 
     80# Simply formatting of a held change. Remove the entire change. 
     81sed -i -e '/^<<<</,/^>>>>/ {d}' src/com/itmill/toolkit/ui/Form.java 
     82svn resolved src/com/itmill/toolkit/ui/Form.java 
     83 
     84./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5254 
     85 
     86# Just a test file missing, continue. 
     87./build/bin/batchmerge.py massmerge build/merge/merge-5.2.6.cfg 5262