Revision 44740 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
29 29
   JLabel lblFieldName = new JLabel();
30 30
   JTextField txtFieldName = new JTextField();
31 31
   JLabel lblFieldType = new JLabel();
32
   JComboBox cboFieldType = new JComboBox();
33 32
   JTabbedPane tabAditionalFields = new JTabbedPane();
34 33
   JLabel lblSize = new JLabel();
35 34
   JTextField txtSize = new JTextField();
......
44 43
   JTextField txtVirtualField = new JTextField();
45 44
   JLabel lblScale = new JLabel();
46 45
   JTextField txtScale = new JTextField();
46
   JComboBox cboRelationType = new JComboBox();
47 47
   JLabel lblGeometryType = new JLabel();
48 48
   JLabel lblGeometrySubtype = new JLabel();
49 49
   JLabel lblCRS = new JLabel();
......
110 110
   JCheckBox chkIsAutomatic = new JCheckBox();
111 111
   JLabel lblAllowNulls = new JLabel();
112 112
   JCheckBox chkAllowNulls = new JCheckBox();
113
   JComboBox cboFieldType = new JComboBox();
114
   JButton btnFieldType = new JButton();
113 115

  
114 116
   /**
115 117
    * Default constructor
......
216 218
      lblFieldType.setText("_Field_type");
217 219
      jpanel1.add(lblFieldType,cc.xy(2,4));
218 220

  
219
      cboFieldType.setName("cboFieldType");
220
      jpanel1.add(cboFieldType,cc.xy(4,4));
221

  
222 221
      tabAditionalFields.setName("tabAditionalFields");
223 222
      tabAditionalFields.addTab("_Basic_fields",null,createPanel1());
224 223
      tabAditionalFields.addTab("_Geometry",null,createPanel3());
......
229 228
      jpanel1.add(tabAditionalFields,cc.xywh(2,8,3,1));
230 229

  
231 230
      jpanel1.add(createPanel17(),cc.xy(4,6));
231
      jpanel1.add(createPanel18(),cc.xy(4,4));
232 232
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9 });
233 233
      return jpanel1;
234 234
   }
......
236 236
   public JPanel createPanel1()
237 237
   {
238 238
      JPanel jpanel1 = new JPanel();
239
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU: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:2DLU:NONE,CENTER:DEFAULT:NONE");
239
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU: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:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE");
240 240
      CellConstraints cc = new CellConstraints();
241 241
      jpanel1.setLayout(formlayout1);
242 242

  
......
281 281
      txtScale.setName("txtScale");
282 282
      jpanel1.add(txtScale,cc.xy(4,6));
283 283

  
284
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12 });
284
      JLabel jlabel1 = new JLabel();
285
      jlabel1.setText("_Relation_type");
286
      jpanel1.add(jlabel1,cc.xy(2,14));
287

  
288
      cboRelationType.setName("cboRelationType");
289
      jpanel1.add(cboRelationType,cc.xy(4,14));
290

  
291
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14 });
285 292
      return jpanel1;
286 293
   }
287 294

  
......
760 767
      return jpanel1;
761 768
   }
762 769

  
770
   public JPanel createPanel18()
771
   {
772
      JPanel jpanel1 = new JPanel();
773
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
774
      CellConstraints cc = new CellConstraints();
775
      jpanel1.setLayout(formlayout1);
776

  
777
      cboFieldType.setName("cboFieldType");
778
      jpanel1.add(cboFieldType,cc.xy(1,1));
779

  
780
      btnFieldType.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featuretype/picker-datatype.png"));
781
      btnFieldType.setName("btnFieldType");
782
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
783
      btnFieldType.setBorder(emptyborder1);
784
      jpanel1.add(btnFieldType,cc.xy(3,1));
785

  
786
      addFillComponents(jpanel1,new int[]{ 2 },new int[0]);
787
      return jpanel1;
788
   }
789

  
763 790
   /**
764 791
    * Initializer
765 792
    */

Also available in: Unified diff