Revision 44873 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/featurequery/DefaultFeatureQueryCalculatedColumnsPanelView.java

View differences:

DefaultFeatureQueryCalculatedColumnsPanelView.java
31 31
   JLabel lblName = new JLabel();
32 32
   JLabel lblType = new JLabel();
33 33
   JLabel lblExpression = new JLabel();
34
   JButton btnColumnExpression = new JButton();
35
   JButton btnColumnExpressionHistory = new JButton();
36
   JButton btnColumnExpressionBookmarks = new JButton();
37 34
   JTextField txtColumnName = new JTextField();
38 35
   JButton btnColumnDataType = new JButton();
39 36
   JComboBox cboColumnDataType = new JComboBox();
......
46 43
   JTextField txtColumnPrecision = new JTextField();
47 44
   JLabel lblScale = new JLabel();
48 45
   JTextField txtColumnScale = new JTextField();
46
   JButton btnColumnExpression = new JButton();
47
   JButton btnColumnExpressionHistory = new JButton();
48
   JButton btnColumnExpressionBookmarks = new JButton();
49 49

  
50 50
   /**
51 51
    * Default constructor
......
196 196
   public JPanel createPanel2()
197 197
   {
198 198
      JPanel jpanel1 = new JPanel();
199
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,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,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:4DLU:NONE,CENTER:DEFAULT:NONE");
199
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:4DLU:NONE,CENTER:DEFAULT:NONE");
200 200
      CellConstraints cc = new CellConstraints();
201 201
      jpanel1.setLayout(formlayout1);
202 202

  
......
212 212
      lblExpression.setText("_Expression");
213 213
      jpanel1.add(lblExpression,new CellConstraints(1,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
214 214

  
215
      btnColumnExpression.setActionCommand("...");
216
      btnColumnExpression.setName("btnColumnExpression");
217
      btnColumnExpression.setText("...");
218
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
219
      btnColumnExpression.setBorder(emptyborder1);
220
      jpanel1.add(btnColumnExpression,new CellConstraints(5,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
221

  
222
      btnColumnExpressionHistory.setActionCommand("...");
223
      btnColumnExpressionHistory.setName("btnColumnExpressionHistory");
224
      btnColumnExpressionHistory.setText("...");
225
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
226
      btnColumnExpressionHistory.setBorder(emptyborder2);
227
      jpanel1.add(btnColumnExpressionHistory,new CellConstraints(7,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
228

  
229
      btnColumnExpressionBookmarks.setActionCommand("...");
230
      btnColumnExpressionBookmarks.setName("btnColumnExpressionBookmarks");
231
      btnColumnExpressionBookmarks.setText("...");
232
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
233
      btnColumnExpressionBookmarks.setBorder(emptyborder3);
234
      jpanel1.add(btnColumnExpressionBookmarks,new CellConstraints(9,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
235

  
236 215
      txtColumnName.setName("txtColumnName");
237
      jpanel1.add(txtColumnName,cc.xywh(3,1,7,1));
216
      jpanel1.add(txtColumnName,cc.xywh(3,1,3,1));
238 217

  
239 218
      btnColumnDataType.setActionCommand("...");
240 219
      btnColumnDataType.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-more.png"));
241 220
      btnColumnDataType.setName("btnColumnDataType");
242
      EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2);
243
      btnColumnDataType.setBorder(emptyborder4);
244
      jpanel1.add(btnColumnDataType,cc.xy(9,3));
221
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
222
      btnColumnDataType.setBorder(emptyborder1);
223
      jpanel1.add(btnColumnDataType,cc.xy(5,3));
245 224

  
246 225
      cboColumnDataType.setName("cboColumnDataType");
247
      jpanel1.add(cboColumnDataType,cc.xywh(3,3,5,1));
226
      jpanel1.add(cboColumnDataType,cc.xywh(3,3,2,1));
248 227

  
249
      jpanel1.add(createPanel3(),cc.xywh(1,13,9,1));
228
      jpanel1.add(createPanel3(),cc.xywh(1,13,5,1));
250 229
      txtColumnExpression.setName("txtColumnExpression");
251 230
      JScrollPane jscrollpane1 = new JScrollPane();
252 231
      jscrollpane1.setViewportView(txtColumnExpression);
......
255 234
      jpanel1.add(jscrollpane1,cc.xy(3,11));
256 235

  
257 236
      txtColumnSize.setName("txtColumnSize");
258
      jpanel1.add(txtColumnSize,cc.xywh(3,5,7,1));
237
      jpanel1.add(txtColumnSize,cc.xywh(3,5,3,1));
259 238

  
260 239
      lblSize.setName("lblSize");
261 240
      lblSize.setText("_Size");
......
266 245
      jpanel1.add(lblPrecision,cc.xy(1,7));
267 246

  
268 247
      txtColumnPrecision.setName("txtColumnPrecision");
269
      jpanel1.add(txtColumnPrecision,cc.xywh(3,7,7,1));
248
      jpanel1.add(txtColumnPrecision,cc.xywh(3,7,3,1));
270 249

  
271 250
      lblScale.setName("lblScale");
272 251
      lblScale.setText("_Scale");
273 252
      jpanel1.add(lblScale,cc.xy(1,9));
274 253

  
275 254
      txtColumnScale.setName("txtColumnScale");
276
      jpanel1.add(txtColumnScale,cc.xywh(3,9,7,1));
255
      jpanel1.add(txtColumnScale,cc.xywh(3,9,3,1));
277 256

  
278
      addFillComponents(jpanel1,new int[]{ 2,4,5,6,7,8,9 },new int[]{ 2,4,6,8,10,12,13 });
257
      jpanel1.add(createPanel4(),cc.xy(5,11));
258
      addFillComponents(jpanel1,new int[]{ 2,4,5 },new int[]{ 2,4,6,8,10,12,13 });
279 259
      return jpanel1;
280 260
   }
281 261

  
......
306 286
      return jpanel1;
307 287
   }
308 288

  
289
   public JPanel createPanel4()
290
   {
291
      JPanel jpanel1 = new JPanel();
292
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)");
293
      CellConstraints cc = new CellConstraints();
294
      jpanel1.setLayout(formlayout1);
295

  
296
      btnColumnExpression.setActionCommand("...");
297
      btnColumnExpression.setName("btnColumnExpression");
298
      btnColumnExpression.setText("...");
299
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
300
      btnColumnExpression.setBorder(emptyborder1);
301
      jpanel1.add(btnColumnExpression,cc.xy(1,1));
302

  
303
      btnColumnExpressionHistory.setActionCommand("...");
304
      btnColumnExpressionHistory.setName("btnColumnExpressionHistory");
305
      btnColumnExpressionHistory.setText("...");
306
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
307
      btnColumnExpressionHistory.setBorder(emptyborder2);
308
      jpanel1.add(btnColumnExpressionHistory,cc.xy(1,3));
309

  
310
      btnColumnExpressionBookmarks.setActionCommand("...");
311
      btnColumnExpressionBookmarks.setName("btnColumnExpressionBookmarks");
312
      btnColumnExpressionBookmarks.setText("...");
313
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
314
      btnColumnExpressionBookmarks.setBorder(emptyborder3);
315
      jpanel1.add(btnColumnExpressionBookmarks,cc.xy(1,5));
316

  
317
      addFillComponents(jpanel1,new int[0],new int[]{ 2,4,6 });
318
      return jpanel1;
319
   }
320

  
309 321
   /**
310 322
    * Initializer
311 323
    */

Also available in: Unified diff