Changeset 5374

Show
Ignore:
Timestamp:
09/08/08 11:56:07 (2 months ago)
Author:
artur.signell@…
Message:

Fixed widths in old test cases

Location:
trunk/src/com/itmill/toolkit/tests/tickets
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/com/itmill/toolkit/tests/tickets/Ticket1878.java

    r5326 r5374  
    102102        createLayout(l1, 
    103103                new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL), 
    104                 "1000", "150", "100%", null, true); 
     104                "1000px", "150px", "100%", null, true); 
    105105        createLayout(l1, 
    106106                new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL), 
    107                 "1000", "150", "50", null, false); 
     107                "1000px", "150px", "50px", null, false); 
    108108        GridLayout l2 = new GridLayout(6, 1); 
    109109        createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
    110                 "200", "500", true); 
    111         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
    112                 "200", "500", "100%", null, true); 
    113         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
    114                 "150", "500", true); 
    115         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
    116                 "150", "500", "100%", null, true); 
    117         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
    118                 "100", "500", true); 
    119         createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
    120                 "100", "500", "100%", null, true); 
     110                "200px", "500px", true); 
     111        createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
     112                "200px", "500px", "100%", null, true); 
     113        createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
     114                "150px", "500px", true); 
     115        createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
     116                "150px", "500px", "100%", null, true); 
     117        createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
     118                "100px", "500px", true); 
     119        createLayout(l2, new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL), 
     120                "100px", "500px", "100%", null, true); 
    121121        layout.addComponent(l1); 
    122122        layout.addComponent(l2); 
    … …  
    129129 
    130130        GridLayout l1 = new GridLayout(1, 3); 
    131         createLayout(l1, new GridLayout(8, 1), "1000", "150", "100%", null, 
     131        createLayout(l1, new GridLayout(8, 1), "1000px", "150px", "100%", null, 
    132132                true); 
    133         createLayout(l1, new GridLayout(8, 1), "1000", "150", "50", null, false); 
     133        createLayout(l1, new GridLayout(8, 1), "1000px", "150px", "50px", null, 
     134                false); 
    134135        GridLayout l2 = new GridLayout(6, 1); 
    135         createLayout(l2, new GridLayout(1, 8), "200", "500", true); 
    136         createLayout(l2, new GridLayout(1, 8), "200", "500", "100%", null, true); 
    137         createLayout(l2, new GridLayout(1, 8), "150", "500", true); 
    138         createLayout(l2, new GridLayout(1, 8), "150", "500", "100%", null, true); 
    139         createLayout(l2, new GridLayout(1, 8), "100", "500", true); 
    140         createLayout(l2, new GridLayout(1, 8), "100", "500", "100%", null, true); 
     136        createLayout(l2, new GridLayout(1, 8), "200px", "500px", true); 
     137        createLayout(l2, new GridLayout(1, 8), "200px", "500px", "100%", null, 
     138                true); 
     139        createLayout(l2, new GridLayout(1, 8), "150px", "500px", true); 
     140        createLayout(l2, new GridLayout(1, 8), "150px", "500px", "100%", null, 
     141                true); 
     142        createLayout(l2, new GridLayout(1, 8), "100px", "500px", true); 
     143        createLayout(l2, new GridLayout(1, 8), "100px", "500px", "100%", null, 
     144                true); 
    141145        layout.addComponent(l1); 
    142146        layout.addComponent(l2); 
    … …  
    150154        GridLayout l1 = new GridLayout(1, 3); 
    151155        createLayout(l1, new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL), 
    152                 "1000", "150", "100", null, true); 
     156                "1000px", "150px", "100px", null, true); 
    153157        createLayout(l1, new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL), 
    154                 "1000", "150", "50", null, false); 
     158                "1000px", "150px", "50px", null, false); 
    155159 
    156160        GridLayout l2 = new GridLayout(6, 1); 
    157161        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    158                 "200", "500", true); 
    159         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    160                 "200", "500", "100%", null, true); 
    161         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    162                 "150", "500", true); 
    163         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    164                 "150", "500", "100%", null, true); 
    165         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    166                 "100", "500", true); 
    167         createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    168                 "100", "500", "100%", null, true); 
     162                "200px", "500px", true); 
     163        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     164                "200px", "500px", "100%", null, true); 
     165        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     166                "150px", "500px", true); 
     167        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     168                "150px", "500px", "100%", null, true); 
     169        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     170                "100px", "500px", true); 
     171        createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     172                "100px", "500px", "100%", null, true); 
    169173        layout.addComponent(l1); 
    170174        layout.addComponent(l2); 
    … …  
    219223        Random r = new Random(); 
    220224        GridLayout l1 = new GridLayout(1, 3); 
    221         form = createForm(l1, "200", "500"); 
     225        form = createForm(l1, "200px", "500px"); 
    222226        BeanItem item = new BeanItem(new FormObject()); 
    223227        form.setItemDataSource(item); 
    … …  
    238242        // createLayout(l1, new 
    239243        // ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL), 
    240         // "1000", "150", "50", null, false); 
     244        // "1000px", "150px", "50px", null, false); 
    241245 
    242246        // GridLayout l2 = new GridLayout(6, 1); 
    243247        // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    244         // "200", "500", true); 
    245         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    246         // "200", "500", "100%", null, true); 
    247         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    248         // "150", "500", true); 
    249         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    250         // "150", "500", "100%", null, true); 
    251         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    252         // "100", "500", true); 
    253         // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
    254         // "100", "500", "100%", null, true); 
     248        // "200px", "500px", true); 
     249        // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     250        // "200px", "500px", "100%", null, true); 
     251        // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     252        // "150px", "500px", true); 
     253        // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     254        // "150px", "500px", "100%", null, true); 
     255        // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     256        // "100px", "500px", true); 
     257        // createLayout(l2, new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL), 
     258        // "100px", "500px", "100%", null, true); 
    255259        layout.addComponent(l1); 
    256260        // layout.addComponent(l2); 

  • trunk/src/com/itmill/toolkit/tests/tickets/Ticket2029.java

    r5317 r5374  
    1919        // setTheme("tests-tickets"); 
    2020        Panel p = new Panel("1000x150"); 
    21         p.setWidth("1000"); 
    22         p.setHeight("150"); 
     21        p.setWidth("1000px"); 
     22        p.setHeight("150px"); 
    2323 
    2424        OrderedLayout layout = new OrderedLayout(