Revision 46876

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureTypePanelView.xml
108 108
                      </at>
109 109
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
110 110
                     </super>
111
                     <at name="id">embedded.156628010</at>
111
                     <at name="id">embedded.1247906093</at>
112 112
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:GROW(0.1),CENTER:2DLU:NONE,FILL:DEFAULT:GROW(0.8),CENTER:2DLU:NONE</at>
113 113
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
114 114
                     <at name="components">
......
279 279
                               </object>
280 280
                              </at>
281 281
                              <at name="name">txtLabel</at>
282
                              <at name="width">1189</at>
282
                              <at name="width">1463</at>
283 283
                              <at name="height">22</at>
284 284
                             </object>
285 285
                            </at>
......
335 335
                              <at name="scrollableTracksViewportHeight">true</at>
336 336
                              <at name="scrollableTracksViewportWidth">true</at>
337 337
                              <at name="name">txtDescription</at>
338
                              <at name="width">1187</at>
338
                              <at name="width">1461</at>
339 339
                              <at name="scollBars">
340 340
                               <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
341 341
                                <at name="name">scollBars</at>
......
449 449
                           </at>
450 450
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
451 451
                          </super>
452
                          <at name="id">embedded.442617926</at>
452
                          <at name="id">embedded.876169053</at>
453 453
                          <at name="rowspecs">FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
454 454
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
455 455
                          <at name="components">
......
548 548
                                </at>
549 549
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
550 550
                               </super>
551
                               <at name="id">embedded.446168185</at>
551
                               <at name="id">embedded.743164628</at>
552 552
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
553 553
                               <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
554 554
                               <at name="components">
......
598 598
                                         </object>
599 599
                                        </at>
600 600
                                        <at name="name">tblTagsItems</at>
601
                                        <at name="width">1080</at>
601
                                        <at name="width">1354</at>
602 602
                                        <at name="scollBars">
603 603
                                         <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
604 604
                                          <at name="name">scollBars</at>
......
651 651
                                     </at>
652 652
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
653 653
                                    </super>
654
                                    <at name="id">embedded.269922002</at>
654
                                    <at name="id">embedded.892263845</at>
655 655
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:NONE</at>
656 656
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
657 657
                                    <at name="components">
......
961 961
                                </at>
962 962
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
963 963
                               </super>
964
                               <at name="id">embedded.945794282</at>
964
                               <at name="id">embedded.1200136901</at>
965 965
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
966 966
                               <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
967 967
                               <at name="components">
......
983 983
                                     </at>
984 984
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
985 985
                                    </super>
986
                                    <at name="id">embedded.1415190106</at>
986
                                    <at name="id">embedded.962237184</at>
987 987
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
988 988
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
989 989
                                    <at name="components">
......
1267 1267
                                     </at>
1268 1268
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1269 1269
                                    </super>
1270
                                    <at name="id">embedded.37988700</at>
1270
                                    <at name="id">embedded.1641109431</at>
1271 1271
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
1272 1272
                                    <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:12DLU:GROW(1.0)</at>
1273 1273
                                    <at name="components">
......
1436 1436
                                               </at>
1437 1437
                                              </object>
1438 1438
                                             </at>
1439
                                             <at name="componentCount">3</at>
1440
                                             <at name="editable">true</at>
1441
                                             <at name="requestFocusEnabled">false</at>
1439 1442
                                             <at name="name">cboTagsItemName</at>
1440
                                             <at name="width">1016</at>
1443
                                             <at name="width">1290</at>
1441 1444
                                             <at name="items">
1442 1445
                                              <object classname="com.jeta.forms.store.properties.ItemsProperty">
1443 1446
                                               <at name="name">items</at>
......
1499 1502
                                             <at name="editable">true</at>
1500 1503
                                             <at name="requestFocusEnabled">false</at>
1501 1504
                                             <at name="name">cboTagsItemValue</at>
1502
                                             <at name="width">1016</at>
1505
                                             <at name="width">1290</at>
1503 1506
                                             <at name="items">
1504 1507
                                              <object classname="com.jeta.forms.store.properties.ItemsProperty">
1505 1508
                                               <at name="name">items</at>
......
1618 1621
                                              </object>
1619 1622
                                             </at>
1620 1623
                                             <at name="name">lblTagsItemNotesValue</at>
1621
                                             <at name="width">1016</at>
1624
                                             <at name="width">1290</at>
1622 1625
                                             <at name="fill">
1623 1626
                                              <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1624 1627
                                               <at name="name">fill</at>
......
2026 2029
                      </at>
2027 2030
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2028 2031
                     </super>
2029
                     <at name="id">embedded.999540635</at>
2032
                     <at name="id">embedded.1485664025</at>
2030 2033
                     <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE</at>
2031 2034
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
2032 2035
                     <at name="components">
......
2048 2051
                           </at>
2049 2052
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2050 2053
                          </super>
2051
                          <at name="id">embedded.213116387</at>
2054
                          <at name="id">embedded.606226124</at>
2052 2055
                          <at name="rowspecs">FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)</at>
2053 2056
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
2054 2057
                          <at name="components">
......
2147 2150
                                </at>
2148 2151
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2149 2152
                               </super>
2150
                               <at name="id">embedded.563644206</at>
2153
                               <at name="id">embedded.437372407</at>
2151 2154
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
2152 2155
                               <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
2153 2156
                               <at name="components">
......
2197 2200
                                         </object>
2198 2201
                                        </at>
2199 2202
                                        <at name="name">tblFields</at>
2200
                                        <at name="width">1165</at>
2203
                                        <at name="width">1439</at>
2201 2204
                                        <at name="scollBars">
2202 2205
                                         <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
2203 2206
                                          <at name="name">scollBars</at>
......
2250 2253
                                     </at>
2251 2254
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2252 2255
                                    </super>
2253
                                    <at name="id">embedded.743978444</at>
2256
                                    <at name="id">embedded.1669415050</at>
2254 2257
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
2255 2258
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
2256 2259
                                    <at name="components">
......
2560 2563
                                </at>
2561 2564
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2562 2565
                               </super>
2563
                               <at name="id">embedded.239213086</at>
2566
                               <at name="id">embedded.1207654978</at>
2564 2567
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
2565 2568
                               <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
2566 2569
                               <at name="components">
......
2590 2593
                                      <at name="properties">
2591 2594
                                       <object classname="com.jeta.forms.store.support.PropertyMap">
2592 2595
                                        <at name="name">pnlField</at>
2593
                                        <at name="width">1161</at>
2596
                                        <at name="width">1435</at>
2594 2597
                                        <at name="height">331</at>
2595 2598
                                       </object>
2596 2599
                                      </at>
......
2616 2619
                                     </at>
2617 2620
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2618 2621
                                    </super>
2619
                                    <at name="id">embedded.486923314</at>
2622
                                    <at name="id">embedded.1042094998</at>
2620 2623
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
2621 2624
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
2622 2625
                                    <at name="components">
......
3171 3174
                      </at>
3172 3175
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3173 3176
                     </super>
3174
                     <at name="id">embedded.1779807134</at>
3177
                     <at name="id">embedded.1874422604</at>
3175 3178
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE</at>
3176 3179
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
3177 3180
                     <at name="components">
......
3222 3225
                              </at>
3223 3226
                              <at name="actionCommand">_Validate_features_before_insert</at>
3224 3227
                              <at name="name">chkRulesValidateFeatureBeforeInsert</at>
3225
                              <at name="width">1252</at>
3228
                              <at name="width">1526</at>
3226 3229
                              <at name="text">_Validate_features_before_insert</at>
3227 3230
                              <at name="height">18</at>
3228 3231
                             </object>
......
3278 3281
                              </at>
3279 3282
                              <at name="actionCommand">_Validate_features_at_finish_editing</at>
3280 3283
                              <at name="name">chkRulesValidateFeaturesAtFinishEditing</at>
3281
                              <at name="width">1252</at>
3284
                              <at name="width">1526</at>
3282 3285
                              <at name="text">_Validate_features_at_finish_editing</at>
3283 3286
                              <at name="height">18</at>
3284 3287
                             </object>
......
3333 3336
                               </object>
3334 3337
                              </at>
3335 3338
                              <at name="name">lblRulesDefaultRules</at>
3336
                              <at name="width">1274</at>
3339
                              <at name="width">1548</at>
3337 3340
                              <at name="text">_Default_rules</at>
3338 3341
                              <at name="height">17</at>
3339 3342
                             </object>
......
3388 3391
                               </object>
3389 3392
                              </at>
3390 3393
                              <at name="name">lblRulesCustomRules</at>
3391
                              <at name="width">1274</at>
3394
                              <at name="width">1548</at>
3392 3395
                              <at name="text">_Custom_rules</at>
3393 3396
                              <at name="height">17</at>
3394 3397
                             </object>
......
3415 3418
                           </at>
3416 3419
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3417 3420
                          </super>
3418
                          <at name="id">embedded.1563469470</at>
3421
                          <at name="id">embedded.394939728</at>
3419 3422
                          <at name="rowspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:GROW(1.0)</at>
3420 3423
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
3421 3424
                          <at name="components">
......
3437 3440
                                </at>
3438 3441
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3439 3442
                               </super>
3440
                               <at name="id">embedded.567473336</at>
3443
                               <at name="id">embedded.845345190</at>
3441 3444
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
3442 3445
                               <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
3443 3446
                               <at name="components">
......
3487 3490
                                         </object>
3488 3491
                                        </at>
3489 3492
                                        <at name="name">tblRules</at>
3490
                                        <at name="width">1165</at>
3493
                                        <at name="width">1439</at>
3491 3494
                                        <at name="scollBars">
3492 3495
                                         <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
3493 3496
                                          <at name="name">scollBars</at>
......
3540 3543
                                     </at>
3541 3544
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3542 3545
                                    </super>
3543
                                    <at name="id">embedded.1251785122</at>
3546
                                    <at name="id">embedded.2090991861</at>
3544 3547
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
3545 3548
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
3546 3549
                                    <at name="components">
......
3850 3853
                                </at>
3851 3854
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3852 3855
                               </super>
3853
                               <at name="id">embedded.428956694</at>
3856
                               <at name="id">embedded.1757557273</at>
3854 3857
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
3855 3858
                               <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE</at>
3856 3859
                               <at name="components">
......
3872 3875
                                     </at>
3873 3876
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3874 3877
                                    </super>
3875
                                    <at name="id">embedded.882849742</at>
3878
                                    <at name="id">embedded.1543869058</at>
3876 3879
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
3877 3880
                                    <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
3878 3881
                                    <at name="components">
......
4222 4225
                                              </object>
4223 4226
                                             </at>
4224 4227
                                             <at name="name">txtRuleName</at>
4225
                                             <at name="width">1003</at>
4228
                                             <at name="width">1277</at>
4226 4229
                                             <at name="height">22</at>
4227 4230
                                            </object>
4228 4231
                                           </at>
......
4276 4279
                                              </object>
4277 4280
                                             </at>
4278 4281
                                             <at name="name">chkRuleCheckAtFinishEditing</at>
4279
                                             <at name="width">1003</at>
4282
                                             <at name="width">1277</at>
4280 4283
                                             <at name="height">15</at>
4281 4284
                                            </object>
4282 4285
                                           </at>
......
4330 4333
                                              </object>
4331 4334
                                             </at>
4332 4335
                                             <at name="name">chkRuleCheckAtUpdate</at>
4333
                                             <at name="width">1003</at>
4336
                                             <at name="width">1277</at>
4334 4337
                                             <at name="height">15</at>
4335 4338
                                            </object>
4336 4339
                                           </at>
......
4384 4387
                                              </object>
4385 4388
                                             </at>
4386 4389
                                             <at name="name">txtRuleDescription</at>
4387
                                             <at name="width">1003</at>
4390
                                             <at name="width">1277</at>
4388 4391
                                             <at name="height">22</at>
4389 4392
                                            </object>
4390 4393
                                           </at>
......
4410 4413
                                          </at>
4411 4414
                                          <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
4412 4415
                                         </super>
4413
                                         <at name="id">embedded.931290554</at>
4416
                                         <at name="id">embedded.600695241</at>
4414 4417
                                         <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
4415 4418
                                         <at name="colspecs">FILL:200PX:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
4416 4419
                                         <at name="components">
......
4462 4465
                                                  <at name="scrollableTracksViewportHeight">true</at>
4463 4466
                                                  <at name="scrollableTracksViewportWidth">true</at>
4464 4467
                                                  <at name="name">txtRuleValidation</at>
4465
                                                  <at name="width">946</at>
4468
                                                  <at name="width">1220</at>
4466 4469
                                                  <at name="scollBars">
4467 4470
                                                   <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
4468 4471
                                                    <at name="name">scollBars</at>
......
4515 4518
                                               </at>
4516 4519
                                               <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
4517 4520
                                              </super>
4518
                                              <at name="id">embedded.1084867003</at>
4521
                                              <at name="id">embedded.921940704</at>
4519 4522
                                              <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
4520 4523
                                              <at name="colspecs">FILL:DEFAULT:NONE</at>
4521 4524
                                              <at name="components">
......
5002 5005
                                     </at>
5003 5006
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
5004 5007
                                    </super>
5005
                                    <at name="id">embedded.616069498</at>
5008
                                    <at name="id">embedded.1425948479</at>
5006 5009
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,FILL:2DLU:GROW(1.0)</at>
5007 5010
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
5008 5011
                                    <at name="components">
......
5554 5557
              </at>
5555 5558
             </object>
5556 5559
            </at>
5557
            <at name="width">1317</at>
5560
            <at name="width">1591</at>
5558 5561
            <at name="tabCount">3</at>
5559 5562
            <at name="height">835</at>
5560 5563
           </object>
......
5581 5584
         </at>
5582 5585
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
5583 5586
        </super>
5584
        <at name="id">embedded.700672725</at>
5587
        <at name="id">embedded.993481612</at>
5585 5588
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
5586 5589
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
5587 5590
        <at name="components">
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultAggregateController.java
110 110
        this.currentRow = -1;
111 111
        this.newItem = null;
112 112
        this.setEditing(false);
113
        this.itemController.setAggregateModel(model);
113 114
    }
114 115

  
115 116
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureAttributePanelView.java
664 664
      lblAttrTagsItemValue.setText("_Value");
665 665
      grdAttrTagsItemView.add(lblAttrTagsItemValue,cc.xy(1,3));
666 666

  
667
      cboAttrTagsItemName.setEditable(true);
667 668
      cboAttrTagsItemName.setName("cboAttrTagsItemName");
669
      cboAttrTagsItemName.setRequestFocusEnabled(false);
668 670
      grdAttrTagsItemView.add(cboAttrTagsItemName,cc.xy(3,1));
669 671

  
670 672
      cboAttrTagsItemValue.setEditable(true);
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/featurerule/FeatureRuleController.java
13 13
import org.gvsig.fmap.dal.swing.DALSwingLocator;
14 14
import org.gvsig.fmap.dal.swing.DataSwingManager;
15 15
import org.gvsig.fmap.dal.swing.expressionevaluator.FeatureStoreElement;
16
import org.gvsig.fmap.dal.swing.impl.featuretype.AggregateController;
16 17
import org.gvsig.fmap.dal.swing.impl.featuretype.AggregateController.AggregateItemController;
17 18
import org.gvsig.tools.swing.api.ToolsSwingLocator;
18 19
import org.gvsig.tools.swing.api.ToolsSwingManager;
......
35 36
    private ExpressionPickerController pickervalidation;
36 37
    private FeatureStoreElement featureStoreElement;
37 38
    private boolean ruleIsAExpression;
39
    private AggregateController.AggregateModel aggregateModel;
38 40

  
39 41
    public FeatureRuleController(
40 42
            JTextComponent txtRuleName,
......
151 153
    public boolean isEnabled() {
152 154
        return this.txtRuleName.isEnabled();
153 155
    }
154
    
156

  
157
    @Override
158
    public void setAggregateModel(AggregateController.AggregateModel model) {
159
        this.aggregateModel = model;
160
    }
161
        
155 162
}
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureAttributePanel.java
30 30
import javax.swing.event.ListSelectionEvent;
31 31
import javax.swing.text.JTextComponent;
32 32
import org.apache.commons.io.FilenameUtils;
33
import org.apache.commons.lang3.ArrayUtils;
33 34
import org.apache.commons.lang3.StringUtils;
34 35
import org.apache.commons.lang3.tuple.ImmutablePair;
35 36
import org.apache.commons.lang3.tuple.Pair;
......
55 56
import org.gvsig.fmap.dal.DataTypes;
56 57
import org.gvsig.fmap.dal.SQLBuilder;
57 58
import org.gvsig.fmap.dal.StoresRepository;
59
import org.gvsig.fmap.dal.complements.RelatedFeatures;
60
import static org.gvsig.fmap.dal.complements.RelatedFeatures.DAL_RELATED_TABLE;
61
import static org.gvsig.fmap.dal.complements.RelatedFeatures.DAL_RELATED_UNIQUE_FIELD_NAME;
58 62
import org.gvsig.fmap.dal.exception.DataException;
59 63
import org.gvsig.fmap.dal.expressionevaluator.DALExpressionBuilder;
60 64
import org.gvsig.fmap.dal.expressionevaluator.FeatureAttributeEmulatorExpression;
......
95 99
import org.gvsig.tools.dataTypes.DataTypesManager;
96 100
import org.gvsig.tools.dynobject.DynField;
97 101
import org.gvsig.tools.dynobject.DynObjectValueItem;
102
import org.gvsig.tools.dynobject.Tags;
98 103
import org.gvsig.tools.i18n.I18nManager;
99 104
import org.gvsig.tools.locator.ReferenceNotRegisteredException;
100 105
import org.gvsig.tools.swing.api.ListElement;
......
613 618
                    doTableChanged();
614 619
                    this.pickerForeignField.set(fieldsAndTable[2]);
615 620
                    this.pickerExpression.set(expression);
621
                } else {
622
                    this.clean();
616 623
                }
617 624
            } catch (Throwable t) {
618 625
                LOGGER.warn("Can't set attribute descriptor in toMany controller",t);
......
632 639
            } else {
633 640
                descriptor.setFeatureAttributeEmulator(exp);
634 641
            }
642
            Tags tags = descriptor.getTags();
643
            if( !tags.has(DAL_RELATED_TABLE) ) {
644
                String tableName =  this.getTableName();
645
                if( StringUtils.isNotBlank(tableName) ) {
646
                    tags.set(DAL_RELATED_TABLE, tableName);                    
647
                }
648
            }
649
            if( !tags.has(DAL_RELATED_UNIQUE_FIELD_NAME) ) {
650
                String tableName = tags.getString(DAL_RELATED_TABLE, null);
651
                if( StringUtils.isNotBlank(tableName) ) {
652
                    try {
653
                        StoresRepository repository = DALLocator.getDataManager().getStoresRepository();
654
                        FeatureType ft = repository.getFeatureType(tableName);
655
                        FeatureAttributeDescriptor[] pk = ft.getPrimaryKey();
656
                        if( !ArrayUtils.isEmpty(pk) && pk.length==1 ) {
657
                            tags.set(DAL_RELATED_UNIQUE_FIELD_NAME, pk[0].getName());
658
                        }
659
                    } catch(Throwable t) {
660
                        LOGGER.warn("Can't get primary key of table '"+tableName+"'.",t);
661
                    }
662
                }
663
            }
635 664
        }
636 665
        
637 666
        public int getRelationType() {
......
1184 1213
                break;
1185 1214
        }
1186 1215

  
1216
        this.rdbRelationNone.setEnabled(enabled);
1217
        this.rdbRelationToOne.setEnabled(enabled && !this.isVirtualField());
1218
        this.rdbRelationToMany.setEnabled(enabled && (this.isVirtualField() || this.getDataType().getType()==DataTypes.LIST));
1219
        
1187 1220
        if( this.rdbRelationNone.isSelected() ) {
1188 1221
            this.pickerVirtualFieldGetter.setEnabled(enabled);
1189 1222
            this.toOneController.setEnabled(false);
1190 1223
            this.toManyController.setEnabled(false);
1191
            this.toManyController.setEnabled(false);
1192 1224
        } else if( this.rdbRelationToOne.isSelected() ) {
1193 1225
            this.pickerVirtualFieldGetter.setEnabled(enabled);
1194 1226
            this.toManyController.setEnabled(false);
1195 1227
            if( this.isVirtualField() ) {
1196 1228
                this.rdbRelationNone.setSelected(true);
1197 1229
            } else {
1230
                this.toOneController.setEditable(enabled);
1198 1231
                this.toOneController.setEnabled(enabled);
1199 1232
            }
1200 1233
        } else if( this.rdbRelationToMany.isSelected() ) {
......
1203 1236
            } else {
1204 1237
                this.pickerVirtualFieldGetter.setEnabled(false);
1205 1238
                this.toOneController.setEnabled(false);
1239
                this.toManyController.setEditable(enabled);
1206 1240
                this.toManyController.setEnabled(enabled);
1207 1241
            }
1208 1242
        }
......
1692 1726
            case DynField.RELATION_TYPE_NONE:
1693 1727
                this.rdbRelationNone.setSelected(true);
1694 1728
                this.rdbRelationToOne.setSelected(false);
1695
                this.rdbRelationToMany.setSelected(false);
1696
                this.toOneController.clean();
1697
                this.toManyController.clean();
1729
                this.rdbRelationToMany.setSelected(false); 
1730
                  // No los borramos, solo quedan deshabilitados, para no peder la informacion que contengan
1731
//                this.toOneController.clean(); 
1732
//                this.toManyController.clean();
1698 1733
                break;
1699 1734
            case DynField.RELATION_TYPE_IDENTITY:
1700 1735
            case DynField.RELATION_TYPE_COLLABORATION:
1701 1736
                this.rdbRelationNone.setSelected(false);
1702 1737
                this.rdbRelationToOne.setSelected(true);
1703 1738
                this.rdbRelationToMany.setSelected(false);
1704
                this.toManyController.clean();
1739
//                this.toManyController.clean();
1705 1740
                break;
1706 1741
            case DynField.RELATION_TYPE_COMPOSITION:
1707 1742
            case DynField.RELATION_TYPE_AGGREGATE:
......
1710 1745
                this.rdbRelationToMany.setSelected(true);
1711 1746
                this.pickerVirtualFieldGetter.setEnabled(false);
1712 1747
//                this.pickerVirtualFieldGetter.set(null);
1713
                this.toOneController.clean();
1748
//                this.toOneController.clean();
1714 1749
                break;
1715 1750
              
1716 1751
        }
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureTypePanelView.java
339 339
      lblTagsItemValue.setText("_Value");
340 340
      grdTagsItemView.add(lblTagsItemValue,cc.xy(1,3));
341 341

  
342
      cboTagsItemName.setEditable(true);
342 343
      cboTagsItemName.setName("cboTagsItemName");
344
      cboTagsItemName.setRequestFocusEnabled(false);
343 345
      grdTagsItemView.add(cboTagsItemName,cc.xy(3,1));
344 346

  
345 347
      cboTagsItemValue.setEditable(true);
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/tags/TagController.java
8 8
import javax.swing.JComboBox;
9 9
import javax.swing.JLabel;
10 10
import org.apache.commons.lang3.StringUtils;
11
import org.gvsig.fmap.dal.swing.impl.featuretype.AggregateController;
11 12
import org.gvsig.fmap.dal.swing.impl.featuretype.AggregateController.AggregateItemController;
12 13
import org.gvsig.tools.ToolsLocator;
13 14
import org.gvsig.tools.dynobject.DynField;
15
import org.gvsig.tools.dynobject.DynField_v2;
16
import org.gvsig.tools.dynobject.DynMethod;
14 17
import org.gvsig.tools.swing.api.ToolsSwingLocator;
15 18
import org.gvsig.tools.swing.api.ToolsSwingManager;
16 19
import org.gvsig.tools.util.LabeledValue;
......
20 23
 *
21 24
 * @author gvSIG Team
22 25
 */
26
@SuppressWarnings("UseSpecificCatch")
23 27
public class TagController implements AggregateItemController<Tag> {
24 28

  
25 29
    private final JComboBox cboName;
26 30
    private final JComboBox cboValue;
27 31
    private final JLabel lblDescription;
28 32
    private final UnmodifiableBasicMap<String, DynField> tagDefinitions;
33
    private TagsModel tagsModel;
29 34

  
30 35
    public TagController(
31 36
            JComboBox cboName,
......
74 79
            if( tagname.equalsIgnoreCase(tagDefinition.getName()) ) {
75 80
                this.lblDescription.setText("<html>"+tagDefinition.getDescription()+"<html>");
76 81
                DefaultComboBoxModel model = new DefaultComboBoxModel();
77
                LabeledValue[] values = tagDefinition.getAvailableValues();
82
                LabeledValue[] values;
83
                if( tagDefinition instanceof DynField_v2 ) {
84
                    DynMethod method = ((DynField_v2)tagDefinition).getAvailableValuesMethod();
85
                    try {
86
                        values = (LabeledValue[]) method.invoke(null, new Object[] { this.tagsModel.getTags() });
87
                    } catch(Throwable t) {
88
                        values = null;
89
                    }
90
                    if( values == null ) {
91
                        values = tagDefinition.getAvailableValues();
92
                    }
93
                } else {
94
                    values = tagDefinition.getAvailableValues();
95
                }
96
                 
78 97
                if( values != null ) {
79 98
                    for (LabeledValue value : values) {
80 99
                        model.addElement(value);
......
127 146
    public boolean isEnabled() {
128 147
        return this.cboName.isEnabled();
129 148
    }
149

  
150
    @Override
151
    public void setAggregateModel(AggregateController.AggregateModel model) {
152
        this.tagsModel = (TagsModel) model;
153
    }
130 154
    
131 155
}
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/tags/TagsModel.java
8 8
import org.gvsig.fmap.dal.swing.impl.featuretype.AggregateController;
9 9
import org.gvsig.tools.ToolsLocator;
10 10
import org.gvsig.tools.dynobject.Tags;
11
import org.gvsig.tools.dynobject.impl.DefaultTags;
11 12
import org.gvsig.tools.i18n.I18nManager;
12 13

  
13 14
/**
......
19 20
    implements AggregateController.AggregateModel<Tag>
20 21
    {
21 22

  
22
    private List<Tag> tags;
23
    private List<Tag> tagList;
23 24
    private final String[] columnNames;
24 25
    
25 26
    public TagsModel(Tags tags) {
......
31 32
        };
32 33
    }
33 34
    
35
    public final Tags getTags() {
36
        Tags theTags = new DefaultTags();
37
        for (Tag tag : this.tagList) {
38
            theTags.set(tag.getName(), tag.getValue());
39
        }
40
        return theTags;
41
    }
42
    
34 43
    public final void setTags(Tags tags) {
35
        this.tags = new ArrayList<>();
44
        this.tagList = new ArrayList<>();
36 45
        if( tags == null ) {
37 46
            return;
38 47
        }
......
40 49
            Tag tag = new Tag();
41 50
            tag.setName(tagName);
42 51
            tag.setValue(tags.get(tagName));
43
            this.tags.add(tag);
52
            this.tagList.add(tag);
44 53
        }
45 54
    }
46 55
    
......
48 57
    public void fetch(Object container) {
49 58
        Tags theTags = (Tags) container;
50 59
        theTags.removeAll();
51
        for (Tag tag : this.tags) {
60
        for (Tag tag : this.tagList) {
52 61
            theTags.set(tag.getName(), tag.getValue());
53 62
        }
54 63
    }
55 64
    
56 65
    @Override
57 66
    public int getRowCount() {
58
        return this.tags.size();
67
        return this.tagList.size();
59 68
    }
60 69

  
61 70
    @Override
......
70 79
    
71 80
    @Override
72 81
    public Object getValueAt(int rowIndex, int columnIndex) {
73
        Tag tag = this.tags.get(rowIndex);
82
        Tag tag = this.tagList.get(rowIndex);
74 83
        switch(columnIndex) {
75 84
            case 0:
76 85
                return tag.getName();
......
88 97

  
89 98
    @Override
90 99
    public int addItem(Tag item) {
91
        this.tags.add(item);
100
        this.tagList.add(item);
92 101
        this.fireTableDataChanged();
93
        return this.tags.size()-1;
102
        return this.tagList.size()-1;
94 103
    }
95 104

  
96 105
    @Override
......
100 109

  
101 110
    @Override
102 111
    public Tag get(int position) {
103
        return tags.get(position);
112
        return tagList.get(position);
104 113
    }
105 114

  
106 115
    @Override
107 116
    public Iterator<Tag> iterator() {
108
        return tags.iterator();
117
        return tagList.iterator();
109 118
    }
110 119

  
111 120
}
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureAttributePanelView.xml
134 134
             </object>
135 135
            </at>
136 136
            <at name="name">txtFieldName</at>
137
            <at name="width">1322</at>
137
            <at name="width">1517</at>
138 138
            <at name="height">22</at>
139 139
           </object>
140 140
          </at>
......
283 283
                      </at>
284 284
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
285 285
                     </super>
286
                     <at name="id">embedded.33363039</at>
286
                     <at name="id">embedded.1171084715</at>
287 287
                     <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:3PX:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
288 288
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
289 289
                     <at name="components">
......
393 393
                               </object>
394 394
                              </at>
395 395
                              <at name="name">txtSize</at>
396
                              <at name="width">1225</at>
396
                              <at name="width">1420</at>
397 397
                              <at name="height">22</at>
398 398
                             </object>
399 399
                            </at>
......
568 568
                               </object>
569 569
                              </at>
570 570
                              <at name="name">txtPrecision</at>
571
                              <at name="width">1225</at>
571
                              <at name="width">1420</at>
572 572
                              <at name="toolTipText">_Number_of_digits_used_to_represent_the_number_Includes_the_digits_of_the_integer_part_and_the_digits_of_the_decimal_part</at>
573 573
                              <at name="height">22</at>
574 574
                             </object>
......
623 623
                               </object>
624 624
                              </at>
625 625
                              <at name="name">txtDefaultValue</at>
626
                              <at name="width">1225</at>
626
                              <at name="width">1420</at>
627 627
                              <at name="height">22</at>
628 628
                             </object>
629 629
                            </at>
......
737 737
                               </object>
738 738
                              </at>
739 739
                              <at name="name">cboDataProfile</at>
740
                              <at name="width">1225</at>
740
                              <at name="width">1420</at>
741 741
                              <at name="items">
742 742
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
743 743
                                <at name="name">items</at>
......
857 857
                               </object>
858 858
                              </at>
859 859
                              <at name="name">txtScale</at>
860
                              <at name="width">1225</at>
860
                              <at name="width">1420</at>
861 861
                              <at name="toolTipText">_Number_of_decimal_digits_used_to_represent_the_number</at>
862 862
                              <at name="height">22</at>
863 863
                             </object>
......
973 973
                               </object>
974 974
                              </at>
975 975
                              <at name="name">txtDisplaySize</at>
976
                              <at name="width">1225</at>
976
                              <at name="width">1420</at>
977 977
                              <at name="toolTipText">_Number_of_bytes_required_to_store_the_data_in_this_field_Leave_it_empty_or_zero_to_be_automatically_calculated_This_value_is_dependent_on_the_type_of_layer</at>
978 978
                              <at name="height">22</at>
979 979
                             </object>
......
1088 1088
                               </object>
1089 1089
                              </at>
1090 1090
                              <at name="name">txtDefaultFormat</at>
1091
                              <at name="width">1225</at>
1091
                              <at name="width">1420</at>
1092 1092
                              <at name="height">22</at>
1093 1093
                             </object>
1094 1094
                            </at>
......
1142 1142
                               </object>
1143 1143
                              </at>
1144 1144
                              <at name="name">lblVirtualFieldSep</at>
1145
                              <at name="width">1353</at>
1145
                              <at name="width">1548</at>
1146 1146
                              <at name="text">_Virtual_field</at>
1147 1147
                              <at name="height">17</at>
1148 1148
                             </object>
......
1258 1258
                              </at>
1259 1259
                              <at name="actionCommand">Campo virtual</at>
1260 1260
                              <at name="name">chkVirtualField</at>
1261
                              <at name="width">1225</at>
1261
                              <at name="width">1420</at>
1262 1262
                              <at name="rolloverEnabled">true</at>
1263 1263
                              <at name="height">15</at>
1264 1264
                             </object>
......
1405 1405
                           </at>
1406 1406
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1407 1407
                          </super>
1408
                          <at name="id">embedded.1571352266</at>
1408
                          <at name="id">embedded.1763969168</at>
1409 1409
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1410 1410
                          <at name="colspecs">FILL:200PX:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1411 1411
                          <at name="components">
......
1517 1517
                                    </object>
1518 1518
                                   </at>
1519 1519
                                   <at name="name">txtVirtualFieldGetter</at>
1520
                                   <at name="width">1151</at>
1520
                                   <at name="width">1346</at>
1521 1521
                                   <at name="height">22</at>
1522 1522
                                  </object>
1523 1523
                                 </at>
......
1749 1749
                           </at>
1750 1750
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1751 1751
                          </super>
1752
                          <at name="id">embedded.1129307143</at>
1752
                          <at name="id">embedded.1319449565</at>
1753 1753
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1754 1754
                          <at name="colspecs">FILL:200PX:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1755 1755
                          <at name="components">
......
1861 1861
                                    </object>
1862 1862
                                   </at>
1863 1863
                                   <at name="name">txtVirtualFieldSetter</at>
1864
                                   <at name="width">1151</at>
1864
                                   <at name="width">1346</at>
1865 1865
                                   <at name="height">22</at>
1866 1866
                                  </object>
1867 1867
                                 </at>
......
2093 2093
                           </at>
2094 2094
                          </object>
2095 2095
                         </at>
2096
                         <at name="name"></at>
2096
                         <at name="name"/>
2097 2097
                         <at name="fill">
2098 2098
                          <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
2099 2099
                           <at name="name">fill</at>
......
2251 2251
                      </at>
2252 2252
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2253 2253
                     </super>
2254
                     <at name="id">embedded.1711462091</at>
2254
                     <at name="id">embedded.510052370</at>
2255 2255
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
2256 2256
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
2257 2257
                     <at name="components">
......
2481 2481
                               </object>
2482 2482
                              </at>
2483 2483
                              <at name="name">cboGeometryType</at>
2484
                              <at name="width">1239</at>
2484
                              <at name="width">1434</at>
2485 2485
                              <at name="items">
2486 2486
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
2487 2487
                                <at name="name">items</at>
......
2540 2540
                               </object>
2541 2541
                              </at>
2542 2542
                              <at name="name">cboGeometrySubtype</at>
2543
                              <at name="width">1239</at>
2543
                              <at name="width">1434</at>
2544 2544
                              <at name="items">
2545 2545
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
2546 2546
                                <at name="name">items</at>
......
2571 2571
                           </at>
2572 2572
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2573 2573
                          </super>
2574
                          <at name="id">embedded.918365140</at>
2574
                          <at name="id">embedded.1030057395</at>
2575 2575
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
2576 2576
                          <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
2577 2577
                          <at name="components">
......
2683 2683
                                    </object>
2684 2684
                                   </at>
2685 2685
                                   <at name="name">txtCRS</at>
2686
                                   <at name="width">1211</at>
2686
                                   <at name="width">1406</at>
2687 2687
                                   <at name="height">22</at>
2688 2688
                                  </object>
2689 2689
                                 </at>
......
2904 2904
                      </at>
2905 2905
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2906 2906
                     </super>
2907
                     <at name="id">embedded.1253704399</at>
2907
                     <at name="id">embedded.881092178</at>
2908 2908
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
2909 2909
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
2910 2910
                     <at name="components">
......
3017 3017
                              <at name="editable">true</at>
3018 3018
                              <at name="requestFocusEnabled">false</at>
3019 3019
                              <at name="name">cboDateFormat</at>
3020
                              <at name="width">1273</at>
3020
                              <at name="width">1468</at>
3021 3021
                              <at name="items">
3022 3022
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
3023 3023
                                <at name="name">items</at>
......
3108 3108
                           </at>
3109 3109
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3110 3110
                          </super>
3111
                          <at name="id">embedded.1103413750</at>
3111
                          <at name="id">embedded.2119823832</at>
3112 3112
                          <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
3113 3113
                          <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
3114 3114
                          <at name="components">
......
3278 3278
                                    </object>
3279 3279
                                   </at>
3280 3280
                                   <at name="name">txtIntervalStart</at>
3281
                                   <at name="width">1205</at>
3281
                                   <at name="width">1400</at>
3282 3282
                                   <at name="height">22</at>
3283 3283
                                  </object>
3284 3284
                                 </at>
......
3456 3456
                                    </object>
3457 3457
                                   </at>
3458 3458
                                   <at name="name">txtIntervalEnd</at>
3459
                                   <at name="width">1205</at>
3459
                                   <at name="width">1400</at>
3460 3460
                                   <at name="height">22</at>
3461 3461
                                  </object>
3462 3462
                                 </at>
......
3570 3570
                           </at>
3571 3571
                          </object>
3572 3572
                         </at>
3573
                         <at name="name"></at>
3573
                         <at name="name"/>
3574 3574
                         <at name="fill">
3575 3575
                          <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
3576 3576
                           <at name="name">fill</at>
......
3680 3680
                      </at>
3681 3681
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3682 3682
                     </super>
3683
                     <at name="id">embedded.666375927</at>
3683
                     <at name="id">embedded.911873456</at>
3684 3684
                     <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE</at>
3685 3685
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
3686 3686
                     <at name="components">
......
3702 3702
                           </at>
3703 3703
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3704 3704
                          </super>
3705
                          <at name="id">embedded.1516932446</at>
3705
                          <at name="id">embedded.116075541</at>
3706 3706
                          <at name="rowspecs">FILL:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
3707 3707
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
3708 3708
                          <at name="components">
......
3751 3751
                                     </at>
3752 3752
                                    </object>
3753 3753
                                   </at>
3754
                                   <at name="name"></at>
3754
                                   <at name="name"/>
3755 3755
                                   <at name="lineDefinition">
3756 3756
                                    <object classname="com.jeta.forms.store.properties.CompoundLineProperty">
3757 3757
                                     <at name="name">lineDefinition</at>
......
3801 3801
                                </at>
3802 3802
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3803 3803
                               </super>
3804
                               <at name="id">embedded.1808887109</at>
3804
                               <at name="id">embedded.174230041</at>
3805 3805
                               <at name="rowspecs">FILL:DEFAULT:NONE</at>
3806 3806
                               <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
3807 3807
                               <at name="components">
......
3823 3823
                                     </at>
3824 3824
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3825 3825
                                    </super>
3826
                                    <at name="id">embedded.600695016</at>
3826
                                    <at name="id">embedded.1697107617</at>
3827 3827
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
3828 3828
                                    <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
3829 3829
                                    <at name="components">
......
4110 4110
                                     </at>
4111 4111
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
4112 4112
                                    </super>
4113
                                    <at name="id">embedded.587371060</at>
4113
                                    <at name="id">embedded.2041878254</at>
4114 4114
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
4115 4115
                                    <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0)</at>
4116 4116
                                    <at name="components">
......
4279 4279
                                               </at>
4280 4280
                                              </object>
4281 4281
                                             </at>
4282
                                             <at name="componentCount">3</at>
4283
                                             <at name="editable">true</at>
4284
                                             <at name="requestFocusEnabled">false</at>
4282 4285
                                             <at name="name">cboAttrTagsItemName</at>
4283
                                             <at name="width">1190</at>
4286
                                             <at name="width">1385</at>
4284 4287
                                             <at name="items">
4285 4288
                                              <object classname="com.jeta.forms.store.properties.ItemsProperty">
4286 4289
                                               <at name="name">items</at>
......
4342 4345
                                             <at name="editable">true</at>
4343 4346
                                             <at name="requestFocusEnabled">false</at>
4344 4347
                                             <at name="name">cboAttrTagsItemValue</at>
4345
                                             <at name="width">1190</at>
4348
                                             <at name="width">1385</at>
4346 4349
                                             <at name="items">
4347 4350
                                              <object classname="com.jeta.forms.store.properties.ItemsProperty">
4348 4351
                                               <at name="name">items</at>
......
4461 4464
                                              </object>
4462 4465
                                             </at>
4463 4466
                                             <at name="name">lblAttrTagsItemNotesValue</at>
4464
                                             <at name="width">1190</at>
4467
                                             <at name="width">1385</at>
4465 4468
                                             <at name="fill">
4466 4469
                                              <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
4467 4470
                                               <at name="name">fill</at>
......
4671 4674
                                </at>
4672 4675
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
4673 4676
                               </super>
4674
                               <at name="id">embedded.R7eb9a76bD184d1bab227NS7fe5</at>
4677
                               <at name="id">embedded.1496996406</at>
4675 4678
                               <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
4676 4679
                               <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
4677 4680
                               <at name="components">
......
4721 4724
                                         </object>
4722 4725
                                        </at>
4723 4726
                                        <at name="name">tblAttrTagsItems</at>
4724
                                        <at name="width">1256</at>
4727
                                        <at name="width">1451</at>
4725 4728
                                        <at name="scollBars">
4726 4729
                                         <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
4727 4730
                                          <at name="name">scollBars</at>
4728 4731
                                          <at name="verticalpolicy">20</at>
4729 4732
                                          <at name="horizontalpolicy">30</at>
4733
                                          <at name="border">
4734
                                           <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
4735
                                            <super classname="com.jeta.forms.store.properties.BorderProperty">
4736
                                             <at name="name">border</at>
4737
                                            </super>
4738
                                            <at name="borders">
4739
                                             <object classname="java.util.LinkedList">
4740
                                              <item >
4741
                                               <at name="value">
4742
                                                <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
4743
                                                 <super classname="com.jeta.forms.store.properties.BorderProperty">
4744
                                                  <at name="name">border</at>
4745
                                                 </super>
4746
                                                </object>
4747
                                               </at>
4748
                                              </item>
4749
                                             </object>
4750
                                            </at>
4751
                                           </object>
4752
                                          </at>
4730 4753
                                         </object>
4731 4754
                                        </at>
4732 4755
                                        <at name="height">32</at>
......
4754 4777
                                     </at>
4755 4778
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
4756 4779
                                    </super>
4757
                                    <at name="id">embedded.Z7eb9a76bG184d1bab227DQ7fe4</at>
4780
                                    <at name="id">embedded.1576880018</at>
4758 4781
                                    <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
4759 4782
                                    <at name="colspecs">FILL:DEFAULT:NONE</at>
4760 4783
                                    <at name="components">
......
4890 4913
                                          </at>
4891 4914
                                         </object>
4892 4915
                                        </at>
4893
                                        <at name="name"></at>
4916
                                        <at name="name"/>
4894 4917
                                        <at name="fill">
4895 4918
                                         <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
4896 4919
                                          <at name="name">fill</at>
......
4901 4924
                                          <at name="name">scollBars</at>
4902 4925
                                          <at name="verticalpolicy">21</at>
4903 4926
                                          <at name="horizontalpolicy">31</at>
4927
                                          <at name="border">
4928
                                           <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
4929
                                            <super classname="com.jeta.forms.store.properties.BorderProperty">
4930
                                             <at name="name">border</at>
4931
                                            </super>
4932
                                            <at name="borders">
4933
                                             <object classname="java.util.LinkedList">
4934
                                              <item >
4935
                                               <at name="value">
4936
                                                <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
4937
                                                 <super classname="com.jeta.forms.store.properties.BorderProperty">
4938
                                                  <at name="name">border</at>
4939
                                                 </super>
4940
                                                </object>
4941
                                               </at>
4942
                                              </item>
4943
                                             </object>
4944
                                            </at>
4945
                                           </object>
4946
                                          </at>
4904 4947
                                         </object>
4905 4948
                                        </at>
4906 4949
                                       </object>
......
4969 5012
                                     <at name="name">scollBars</at>
4970 5013
                                     <at name="verticalpolicy">21</at>
4971 5014
                                     <at name="horizontalpolicy">31</at>
5015
                                     <at name="border">
5016
                                      <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
5017
                                       <super classname="com.jeta.forms.store.properties.BorderProperty">
5018
                                        <at name="name">border</at>
5019
                                       </super>
5020
                                       <at name="borders">
5021
                                        <object classname="java.util.LinkedList">
5022
                                         <item >
5023
                                          <at name="value">
5024
                                           <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
5025
                                            <super classname="com.jeta.forms.store.properties.BorderProperty">
5026
                                             <at name="name">border</at>
5027
                                            </super>
5028
                                           </object>
5029
                                          </at>
5030
                                         </item>
5031
                                        </object>
5032
                                       </at>
5033
                                      </object>
5034
                                     </at>
4972 5035
                                    </object>
4973 5036
                                   </at>
4974 5037
                                  </object>
......
5108 5171
                           </at>
5109 5172
                          </object>
5110 5173
                         </at>
5111
                         <at name="name"></at>
5174
                         <at name="name"/>
5112 5175
                         <at name="fill">
5113 5176
                          <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
5114 5177
                           <at name="name">fill</at>
......
5209 5272
                      </at>
5210 5273
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
5211 5274
                     </super>
5212
                     <at name="id">embedded.114469777</at>
5275
                     <at name="id">embedded.671043993</at>
5213 5276
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
5214 5277
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
5215 5278
                     <at name="components">
......
5445 5508
                               </object>
5446 5509
                              </at>
5447 5510
                              <at name="name">lblRelationNone</at>
5448
                              <at name="width">1328</at>
5511
                              <at name="width">1523</at>
5449 5512
                              <at name="text">_None</at>
5450 5513
                              <at name="fill">
5451 5514
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
5505 5568
                               </object>
5506 5569
                              </at>
5507 5570
                              <at name="name">lblRelationToOne</at>
5508
                              <at name="width">1328</at>
5571
                              <at name="width">1523</at>
5509 5572
                              <at name="text">_To_one_1</at>
5510 5573
                              <at name="fill">
5511 5574
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
5565 5628
                               </object>
5566 5629
                              </at>
5567 5630
                              <at name="name">lblRelationToMany</at>
5568
                              <at name="width">1328</at>
5631
                              <at name="width">1523</at>
5569 5632
                              <at name="text">_To_many_N</at>
5570 5633
                              <at name="fill">
5571 5634
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
5865 5928
                               </object>
5866 5929
                              </at>
5867 5930
                              <at name="name">chkRelationToOneIsClosedList</at>
5868
                              <at name="width">1238</at>
5931
                              <at name="width">1433</at>
5869 5932
                              <at name="rolloverEnabled">true</at>
5870 5933
                              <at name="height">15</at>
5871 5934
                             </object>
......
5920 5983
                               </object>
5921 5984
                              </at>
5922 5985
                              <at name="name">cboRelationToOneType</at>
5923
                              <at name="width">1238</at>
5986
                              <at name="width">1433</at>
5924 5987
                              <at name="items">
5925 5988
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
5926 5989
                                <at name="name">items</at>
......
6159 6222
                               </object>
6160 6223
                              </at>
6161 6224
                              <at name="name">cboRelationToManyType</at>
6162
                              <at name="width">1238</at>
6225
                              <at name="width">1433</at>
6163 6226
                              <at name="items">
6164 6227
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
6165 6228
                                <at name="name">items</at>
......
6250 6313
                           </at>
6251 6314
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
6252 6315
                          </super>
6253
                          <at name="id">embedded.1944485669</at>
6316
                          <at name="id">embedded.614012882</at>
6254 6317
                          <at name="rowspecs">CENTER:DEFAULT:GROW(1.0)</at>
6255 6318
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:12DLU:GROW(1.0)</at>
6256 6319
                          <at name="components">
......
6303 6366
                                   <at name="editable">true</at>
6304 6367
                                   <at name="requestFocusEnabled">false</at>
6305 6368
                                   <at name="name">cboRelationToOneTableName</at>
6306
                                   <at name="width">397</at>
6369
                                   <at name="width">462</at>
6307 6370
                                   <at name="items">
6308 6371
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
6309 6372
                                     <at name="name">items</at>
......
6365 6428
                                   <at name="editable">true</at>
6366 6429
                                   <at name="requestFocusEnabled">false</at>
6367 6430
                                   <at name="name">cboRelationToOneCodeName</at>
6368
                                   <at name="width">398</at>
6431
                                   <at name="width">463</at>
6369 6432
                                   <at name="items">
6370 6433
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
6371 6434
                                     <at name="name">items</at>
......
6486 6549
                                   <at name="background" object="color">225,225,225</at>
6487 6550
                                   <at name="editable">false</at>
6488 6551
                                   <at name="name">txtRelationToOneMyFieldName</at>
6489
                                   <at name="width">396</at>
6552
                                   <at name="width">461</at>
6490 6553
                                   <at name="height">22</at>
6491 6554
                                  </object>
6492 6555
                                 </at>
......
6539 6602
                                     </at>
6540 6603
                                    </object>
6541 6604
                                   </at>
6542
                                   <at name="name"></at>
6543 6605
                                   <at name="width">2</at>
6606
                                   <at name="name"/>
6544 6607
                                   <at name="text">.</at>
6545 6608
                                   <at name="fill">
6546 6609
                                    <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
6654 6717
                           </at>
6655 6718
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
6656 6719
                          </super>
6657
                          <at name="id">embedded.1035058076</at>
6720
                          <at name="id">embedded.1771607788</at>
6658 6721
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
6659 6722
                          <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
6660 6723
                          <at name="components">
......
6704 6767
                                    </object>
6705 6768
                                   </at>
6706 6769
                                   <at name="name">cboRelationToOneFormula</at>
6707
                                   <at name="width">1164</at>
6770
                                   <at name="width">1359</at>
6708 6771
                                   <at name="items">
6709 6772
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
6710 6773
                                     <at name="name">items</at>
......
7003 7066
                           </at>
7004 7067
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
7005 7068
                          </super>
7006
                          <at name="id">embedded.1785672932</at>
7069
                          <at name="id">embedded.922149755</at>
7007 7070
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
7008 7071
                          <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:12DLU:GROW(1.0)</at>
7009 7072
                          <at name="components">
......
7056 7119
                                   <at name="editable">true</at>
7057 7120
                                   <at name="requestFocusEnabled">false</at>
7058 7121
                                   <at name="name">cboRelationToManyTableName</at>
7059
                                   <at name="width">397</at>
7122
                                   <at name="width">462</at>
7060 7123
                                   <at name="items">
7061 7124
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
7062 7125
                                     <at name="name">items</at>
......
7118 7181
                                   <at name="editable">true</at>
7119 7182
                                   <at name="requestFocusEnabled">false</at>
7120 7183
                                   <at name="name">cboRelationToManyForeignFieldName</at>
7121
                                   <at name="width">397</at>
7184
                                   <at name="width">462</at>
7122 7185
                                   <at name="items">
7123 7186
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
7124 7187
                                     <at name="name">items</at>
......
7180 7243
                                   <at name="editable">true</at>
7181 7244
                                   <at name="requestFocusEnabled">false</at>
7182 7245
                                   <at name="name">cboRelationToManyMyFieldName</at>
7183
                                   <at name="width">397</at>
7246
                                   <at name="width">462</at>
7184 7247
                                   <at name="items">
7185 7248
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
7186 7249
                                     <at name="name">items</at>
......
7298 7361
                                     </at>
7299 7362
                                    </object>
7300 7363
                                   </at>
7301
                                   <at name="name"></at>
7302 7364
                                   <at name="width">2</at>
7365
                                   <at name="name"/>
7303 7366
                                   <at name="text">.</at>
7304 7367
                                   <at name="fill">
7305 7368
                                    <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
7413 7476
                           </at>
7414 7477
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
7415 7478
                          </super>
7416
                          <at name="id">embedded.79965050</at>
7479
                          <at name="id">embedded.67409698</at>
7417 7480
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
7418 7481
                          <at name="colspecs">FILL:12DLU:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
7419 7482
                          <at name="components">
......
7463 7526
                                    </object>
7464 7527
                                   </at>
7465 7528
                                   <at name="name">txtRelationToManyExpression</at>
7466
                                   <at name="width">1164</at>
7529
                                   <at name="width">1359</at>
7467 7530
                                   <at name="height">22</at>
7468 7531
                                  </object>
7469 7532
                                 </at>
......
7757 7820
                           </at>
7758 7821
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
7759 7822
                          </super>
7760
                          <at name="id">embedded.1152979903</at>
7823
                          <at name="id">embedded.1660894139</at>
7761 7824
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
7762 7825
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
7763 7826
                          <at name="components">
......
7810 7873
                                   <at name="editable">true</at>
7811 7874
                                   <at name="requestFocusEnabled">false</at>
7812 7875
                                   <at name="name">cboRelationRepository</at>
7813
                                   <at name="width">1233</at>
7876
                                   <at name="width">1428</at>
7814 7877
                                   <at name="items">
7815 7878
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
7816 7879
                                     <at name="name">items</at>
......
7924 7987
                           </at>
7925 7988
                          </object>
7926 7989
                         </at>
7927
                         <at name="name"></at>
7990
                         <at name="name"/>
7928 7991
                         <at name="fill">
7929 7992
                          <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
7930 7993
                           <at name="name">fill</at>
......
8085 8148
                      </at>
8086 8149
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
8087 8150
                     </super>
8088
                     <at name="id">embedded.2096791796</at>
8151
                     <at name="id">embedded.1576137235</at>
8089 8152
                     <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
8090 8153
                     <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
8091 8154
                     <at name="components">
......
8170 8233
                                        </at>
8171 8234
                                        <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
8172 8235
                                       </super>
8173
                                       <at name="id">embedded.1020185097</at>
8236
                                       <at name="id">embedded.745443762</at>
8174 8237
                                       <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
8175 8238
                                       <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:12DLU:GROW(1.0),FILL:4DLU:NONE</at>
8176 8239
                                       <at name="components">
......
8343 8406
                                                <at name="editable">true</at>
8344 8407
                                                <at name="requestFocusEnabled">false</at>
8345 8408
                                                <at name="name">cboGroup</at>
8346
                                                <at name="width">1190</at>
8409
                                                <at name="width">1385</at>
8347 8410
                                                <at name="items">
8348 8411
                                                 <object classname="com.jeta.forms.store.properties.ItemsProperty">
8349 8412
                                                  <at name="name">items</at>
......
8402 8465
                                                 </object>
8403 8466
                                                </at>
8404 8467
                                                <at name="name">txtOrder</at>
8405
                                                <at name="width">1190</at>
8468
                                                <at name="width">1385</at>
8406 8469
                                                <at name="height">22</at>
8407 8470
                                               </object>
8408 8471
                                              </at>
......
8516 8579
                                                 </object>
8517 8580
                                                </at>
8518 8581
                                                <at name="name">chkHidden</at>
8519
                                                <at name="width">1190</at>
8582
                                                <at name="width">1385</at>
8520 8583
                                                <at name="height">15</at>
8521 8584
                                               </object>
8522 8585
                                              </at>
......
8630 8693
                                                 </object>
8631 8694
                                                </at>
8632 8695
                                                <at name="name">txtLabel</at>
8633
                                                <at name="width">1190</at>
8696
                                                <at name="width">1385</at>
8634 8697
                                                <at name="height">22</at>
8635 8698
                                               </object>
8636 8699
                                              </at>
......
8747 8810
                                                <at name="scrollableTracksViewportHeight">true</at>
8748 8811
                                                <at name="scrollableTracksViewportWidth">true</at>
8749 8812
                                                <at name="name">txtDescription</at>
8750
                                                <at name="width">1188</at>
8813
                                                <at name="width">1383</at>
8751 8814
                                                <at name="scollBars">
8752 8815
                                                 <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
8753 8816
                                                  <at name="name">scollBars</at>
......
8800 8863
                                             </at>
8801 8864
                                            </object>
8802 8865
                                           </at>
8803
                                           <at name="name"></at>
8866
                                           <at name="name"/>
8804 8867
                                           <at name="fill">
8805 8868
                                            <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
8806 8869
                                             <at name="name">fill</at>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff