Revision 45739 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

View differences:

DefaultFeatureAttributePanelView.java
70 70
   JComboBox cboTagsName = new JComboBox();
71 71
   JLabel lblTagsValue = new JLabel();
72 72
   JComboBox cboTagsValue = new JComboBox();
73
   JLabel lbTagsLabelDescription = new JLabel();
74
   JLabel lblTagsDescription = new JLabel();
73 75
   JButton btnTagsAdd = new JButton();
74 76
   JButton btnTagsUpdate = new JButton();
75 77
   JButton btnTagsRemove = new JButton();
76
   JLabel lbTagsLabelDescription = new JLabel();
77
   JLabel lblTagsDescription = new JLabel();
78 78
   JCheckBox chkIsForeingKey = new JCheckBox();
79 79
   JLabel lblForeingKeyTableName = new JLabel();
80 80
   JLabel lblForeingKeyCodeName = new JLabel();
......
104 104
   JTextField txtAvailableValuesLabel = new JTextField();
105 105
   JLabel lblAvailableValuesValue = new JLabel();
106 106
   JTextField txtAvailableValuesValue = new JTextField();
107
   JLabel lblValuesFilter = new JLabel();
107 108
   JButton btnAvailableValuesAdd = new JButton();
108 109
   JButton btnAvailableValuesUpdate = new JButton();
109 110
   JButton btnAvailableValuesRemove = new JButton();
110 111
   JButton btnAvailableValuesRemoveAll = new JButton();
112
   JTextField txtValuesFilter = new JTextField();
113
   JButton btnValuesFilter = new JButton();
114
   JButton btnValuesFilterHistory = new JButton();
115
   JButton btnValuesFilterBookmarks = new JButton();
111 116
   JLabel lblIsPrimaryKey = new JLabel();
112 117
   JCheckBox chkIsPrimaryKey = new JCheckBox();
113 118
   JLabel lblIsAutomatic = new JLabel();
......
231 236
      tabAditionalFields.addTab("_Visualization",null,createPanel10());
232 237
      jpanel1.add(tabAditionalFields,cc.xywh(2,8,3,1));
233 238

  
234
      jpanel1.add(createPanel14(),cc.xy(4,6));
235
      jpanel1.add(createPanel15(),cc.xy(4,4));
239
      jpanel1.add(createPanel15(),cc.xy(4,6));
240
      jpanel1.add(createPanel16(),cc.xy(4,4));
236 241
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9 });
237 242
      return jpanel1;
238 243
   }
......
318 323

  
319 324
      btnVirtualFieldBookmarks.setActionCommand("...");
320 325
      btnVirtualFieldBookmarks.setName("btnVirtualFieldBookmarks");
321
      btnVirtualFieldBookmarks.setOpaque(false);
322 326
      btnVirtualFieldBookmarks.setText("...");
323 327
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
324 328
      btnVirtualFieldBookmarks.setBorder(emptyborder1);
......
329 333

  
330 334
      btnVirtualFieldHistory.setActionCommand("...");
331 335
      btnVirtualFieldHistory.setName("btnVirtualFieldHistory");
332
      btnVirtualFieldHistory.setOpaque(false);
333 336
      btnVirtualFieldHistory.setText("...");
334 337
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
335 338
      btnVirtualFieldHistory.setBorder(emptyborder2);
......
337 340

  
338 341
      btnVirtualField.setActionCommand("...");
339 342
      btnVirtualField.setName("btnVirtualField");
340
      btnVirtualField.setOpaque(false);
341 343
      btnVirtualField.setText("...");
342 344
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
343 345
      btnVirtualField.setBorder(emptyborder3);
......
386 388

  
387 389
      btnCRS.setActionCommand("...");
388 390
      btnCRS.setName("btnCRS");
389
      btnCRS.setOpaque(false);
390 391
      btnCRS.setText("...");
391 392
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
392 393
      btnCRS.setBorder(emptyborder1);
......
444 445

  
445 446
      btnIntervalStart.setActionCommand("...");
446 447
      btnIntervalStart.setName("btnIntervalStart");
447
      btnIntervalStart.setOpaque(false);
448 448
      btnIntervalStart.setText("...");
449 449
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
450 450
      btnIntervalStart.setBorder(emptyborder1);
......
452 452

  
453 453
      btnIntervalEnd.setActionCommand("...");
454 454
      btnIntervalEnd.setName("btnIntervalEnd");
455
      btnIntervalEnd.setOpaque(false);
456 455
      btnIntervalEnd.setText("...");
457 456
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
458 457
      btnIntervalEnd.setBorder(emptyborder2);
......
497 496
      cboTagsValue.setRequestFocusEnabled(false);
498 497
      jpanel1.add(cboTagsValue,cc.xy(4,6));
499 498

  
500
      jpanel1.add(createPanel8(),cc.xywh(6,2,1,5));
501 499
      lbTagsLabelDescription.setName("lbTagsLabelDescription");
502 500
      lbTagsLabelDescription.setText("_Description");
503 501
      jpanel1.add(lbTagsLabelDescription,cc.xy(2,8));
......
505 503
      lblTagsDescription.setName("lblTagsDescription");
506 504
      jpanel1.add(lblTagsDescription,cc.xy(4,8));
507 505

  
506
      jpanel1.add(createPanel8(),new CellConstraints(6,2,1,5,CellConstraints.DEFAULT,CellConstraints.TOP));
508 507
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7,8,9 });
509 508
      return jpanel1;
510 509
   }
......
512 511
   public JPanel createPanel8()
513 512
   {
514 513
      JPanel jpanel1 = new JPanel();
515
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)");
514
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:NONE");
516 515
      CellConstraints cc = new CellConstraints();
517 516
      jpanel1.setLayout(formlayout1);
518 517

  
......
581 580

  
582 581
      btnForeingKeyFormula.setActionCommand("...");
583 582
      btnForeingKeyFormula.setName("btnForeingKeyFormula");
584
      btnForeingKeyFormula.setOpaque(false);
585 583
      btnForeingKeyFormula.setText("...");
586 584
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
587 585
      btnForeingKeyFormula.setBorder(emptyborder1);
......
589 587

  
590 588
      btnForeingKeyFormulaHistory.setActionCommand("...");
591 589
      btnForeingKeyFormulaHistory.setName("btnForeingKeyFormulaHistory");
592
      btnForeingKeyFormulaHistory.setOpaque(false);
593 590
      btnForeingKeyFormulaHistory.setText("...");
594 591
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
595 592
      btnForeingKeyFormulaHistory.setBorder(emptyborder2);
......
597 594

  
598 595
      btnForeingKeyFormulaBookmarks.setActionCommand("...");
599 596
      btnForeingKeyFormulaBookmarks.setName("btnForeingKeyFormulaBookmarks");
600
      btnForeingKeyFormulaBookmarks.setOpaque(false);
601 597
      btnForeingKeyFormulaBookmarks.setText("...");
602 598
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
603 599
      btnForeingKeyFormulaBookmarks.setBorder(emptyborder3);
......
680 676
   public JPanel createPanel12()
681 677
   {
682 678
      JPanel jpanel1 = new JPanel();
683
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE","CENTER:2DLU:NONE,FILL:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
679
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
684 680
      CellConstraints cc = new CellConstraints();
685 681
      jpanel1.setLayout(formlayout1);
686 682

  
687 683
      lblAvailableValues.setName("lblAvailableValues");
688 684
      lblAvailableValues.setText("_List_of_values");
689
      jpanel1.add(lblAvailableValues,cc.xywh(2,2,5,1));
685
      jpanel1.add(lblAvailableValues,cc.xywh(2,6,5,1));
690 686

  
691 687
      lstAvailableValues.setName("lstAvailableValues");
692 688
      JScrollPane jscrollpane1 = new JScrollPane();
693 689
      jscrollpane1.setViewportView(lstAvailableValues);
694 690
      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
695 691
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
696
      jpanel1.add(jscrollpane1,new CellConstraints(2,4,3,1,CellConstraints.DEFAULT,CellConstraints.FILL));
692
      jpanel1.add(jscrollpane1,new CellConstraints(2,8,3,1,CellConstraints.DEFAULT,CellConstraints.FILL));
697 693

  
698 694
      lblAvailableValuesLabel.setName("lblAvailableValuesLabel");
699 695
      lblAvailableValuesLabel.setText("_Label");
700
      jpanel1.add(lblAvailableValuesLabel,cc.xy(2,6));
696
      jpanel1.add(lblAvailableValuesLabel,cc.xy(2,10));
701 697

  
702 698
      txtAvailableValuesLabel.setName("txtAvailableValuesLabel");
703
      jpanel1.add(txtAvailableValuesLabel,cc.xy(4,6));
699
      jpanel1.add(txtAvailableValuesLabel,cc.xy(4,10));
704 700

  
705 701
      lblAvailableValuesValue.setName("lblAvailableValuesValue");
706 702
      lblAvailableValuesValue.setText("_Value");
707
      jpanel1.add(lblAvailableValuesValue,cc.xy(2,8));
703
      jpanel1.add(lblAvailableValuesValue,cc.xy(2,12));
708 704

  
709 705
      txtAvailableValuesValue.setName("txtAvailableValuesValue");
710
      jpanel1.add(txtAvailableValuesValue,cc.xy(4,8));
706
      jpanel1.add(txtAvailableValuesValue,cc.xy(4,12));
711 707

  
712
      jpanel1.add(createPanel13(),cc.xywh(6,4,1,5));
713
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7,8,9 });
708
      lblValuesFilter.setName("lblValuesFilter");
709
      lblValuesFilter.setText("_Filter_for_values");
710
      jpanel1.add(lblValuesFilter,cc.xywh(2,2,5,1));
711

  
712
      jpanel1.add(createPanel13(),new CellConstraints(6,8,1,5,CellConstraints.DEFAULT,CellConstraints.TOP));
713
      jpanel1.add(createPanel14(),cc.xywh(2,4,5,1));
714
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13 });
714 715
      return jpanel1;
715 716
   }
716 717

  
......
748 749
   public JPanel createPanel14()
749 750
   {
750 751
      JPanel jpanel1 = new JPanel();
752
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
753
      CellConstraints cc = new CellConstraints();
754
      jpanel1.setLayout(formlayout1);
755

  
756
      txtValuesFilter.setName("txtValuesFilter");
757
      jpanel1.add(txtValuesFilter,cc.xy(1,1));
758

  
759
      btnValuesFilter.setActionCommand("...");
760
      btnValuesFilter.setName("btnValuesFilter");
761
      btnValuesFilter.setText("...");
762
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
763
      btnValuesFilter.setBorder(emptyborder1);
764
      jpanel1.add(btnValuesFilter,cc.xy(3,1));
765

  
766
      btnValuesFilterHistory.setActionCommand("...");
767
      btnValuesFilterHistory.setName("btnValuesFilterHistory");
768
      btnValuesFilterHistory.setText("...");
769
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
770
      btnValuesFilterHistory.setBorder(emptyborder2);
771
      jpanel1.add(btnValuesFilterHistory,cc.xy(5,1));
772

  
773
      btnValuesFilterBookmarks.setActionCommand("...");
774
      btnValuesFilterBookmarks.setName("btnValuesFilterBookmarks");
775
      btnValuesFilterBookmarks.setText("...");
776
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
777
      btnValuesFilterBookmarks.setBorder(emptyborder3);
778
      jpanel1.add(btnValuesFilterBookmarks,cc.xy(7,1));
779

  
780
      addFillComponents(jpanel1,new int[]{ 2,4,6 },new int[0]);
781
      return jpanel1;
782
   }
783

  
784
   public JPanel createPanel15()
785
   {
786
      JPanel jpanel1 = new JPanel();
751 787
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
752 788
      CellConstraints cc = new CellConstraints();
753 789
      jpanel1.setLayout(formlayout1);
......
777 813
      return jpanel1;
778 814
   }
779 815

  
780
   public JPanel createPanel15()
816
   public JPanel createPanel16()
781 817
   {
782 818
      JPanel jpanel1 = new JPanel();
783 819
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
......
789 825

  
790 826
      btnFieldType.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featuretype/picker-datatype.png"));
791 827
      btnFieldType.setName("btnFieldType");
792
      btnFieldType.setOpaque(false);
793 828
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
794 829
      btnFieldType.setBorder(emptyborder1);
795 830
      jpanel1.add(btnFieldType,cc.xy(3,1));

Also available in: Unified diff