Revision 44098 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultJExpressionBuilderView.java

View differences:

DefaultJExpressionBuilderView.java
38 38
   JButton btnDiv = new JButton();
39 39
   JButton btnParentOpen = new JButton();
40 40
   JButton btnParentClose = new JButton();
41
   JLabel lblMsg = new JLabel();
42
   JButton btnTip = new JButton();
43
   JLabel lblColumn = new JLabel();
41 44
   JTextField txtGroupElement = new JTextField();
42 45
   JButton btnGroupElementInsert = new JButton();
43 46
   JButton btnSimpleElementInsert = new JButton();
......
149 152

  
150 153
      tabExpressionBuilder.setName("tabExpressionBuilder");
151 154
      tabExpressionBuilder.addTab("_Expression",null,createPanel1());
152
      tabExpressionBuilder.addTab("_Scripts",null,createPanel7());
155
      tabExpressionBuilder.addTab("_Scripts",null,createPanel8());
153 156
      jpanel1.add(tabExpressionBuilder,cc.xy(2,2));
154 157

  
155 158
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3 });
......
178 181
      jpanel1.add(jscrollpane2,cc.xywh(2,4,1,6));
179 182

  
180 183
      jpanel1.add(createPanel2(),cc.xywh(2,2,5,1));
181
      jpanel1.add(createPanel4(),cc.xy(4,4));
182
      jpanel1.add(createPanel5(),cc.xy(4,9));
183
      jpanel1.add(createPanel6(),cc.xy(4,6));
184
      jpanel1.add(createPanel5(),cc.xy(4,4));
185
      jpanel1.add(createPanel6(),cc.xy(4,9));
186
      jpanel1.add(createPanel7(),cc.xy(4,6));
184 187
      pnlDescription.setBackground(new Color(255,255,255));
185 188
      pnlDescription.setForeground(new Color(255,255,255));
186 189
      pnlDescription.setName("pnlDescription");
......
193 196
   public JPanel createPanel2()
194 197
   {
195 198
      JPanel jpanel1 = new JPanel();
196
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","FILL:DEFAULT:NONE");
199
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","FILL:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE");
197 200
      CellConstraints cc = new CellConstraints();
198 201
      jpanel1.setLayout(formlayout1);
199 202

  
......
206 209
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
207 210
      jpanel1.add(jscrollpane1,cc.xy(1,1));
208 211

  
209
      jpanel1.add(createPanel3(),cc.xy(3,1));
210
      addFillComponents(jpanel1,new int[]{ 2,3 },new int[0]);
212
      jpanel1.add(createPanel3(),new CellConstraints(3,1,1,3,CellConstraints.DEFAULT,CellConstraints.TOP));
213
      jpanel1.add(createPanel4(),cc.xy(1,3));
214
      addFillComponents(jpanel1,new int[]{ 2,3 },new int[]{ 2,3 });
211 215
      return jpanel1;
212 216
   }
213 217

  
......
281 285
   public JPanel createPanel4()
282 286
   {
283 287
      JPanel jpanel1 = new JPanel();
288
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
289
      CellConstraints cc = new CellConstraints();
290
      jpanel1.setLayout(formlayout1);
291

  
292
      lblMsg.setName("lblMsg");
293
      jpanel1.add(lblMsg,cc.xy(1,1));
294

  
295
      btnTip.setActionCommand("+");
296
      btnTip.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-tip.png.png"));
297
      btnTip.setName("btnTip");
298
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
299
      btnTip.setBorder(emptyborder1);
300
      jpanel1.add(btnTip,cc.xy(5,1));
301

  
302
      lblColumn.setName("lblColumn");
303
      lblColumn.setText("0");
304
      jpanel1.add(lblColumn,cc.xy(3,1));
305

  
306
      addFillComponents(jpanel1,new int[]{ 2,4 },new int[0]);
307
      return jpanel1;
308
   }
309

  
310
   public JPanel createPanel5()
311
   {
312
      JPanel jpanel1 = new JPanel();
284 313
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
285 314
      CellConstraints cc = new CellConstraints();
286 315
      jpanel1.setLayout(formlayout1);
......
301 330
      return jpanel1;
302 331
   }
303 332

  
304
   public JPanel createPanel5()
333
   public JPanel createPanel6()
305 334
   {
306 335
      JPanel jpanel1 = new JPanel();
307 336
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:PREF:NONE");
......
343 372
      return jpanel1;
344 373
   }
345 374

  
346
   public JPanel createPanel6()
375
   public JPanel createPanel7()
347 376
   {
348 377
      JPanel jpanel1 = new JPanel();
349 378
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
......
364 393
      return jpanel1;
365 394
   }
366 395

  
367
   public JPanel createPanel7()
396
   public JPanel createPanel8()
368 397
   {
369 398
      JPanel jpanel1 = new JPanel();
370 399
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
......
374 403
      pnlScriptEditorContainer.setName("pnlScriptEditorContainer");
375 404
      jpanel1.add(pnlScriptEditorContainer,cc.xy(2,2));
376 405

  
377
      jpanel1.add(createPanel8(),cc.xy(2,4));
406
      jpanel1.add(createPanel9(),cc.xy(2,4));
378 407
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3,4,5 });
379 408
      return jpanel1;
380 409
   }
381 410

  
382
   public JPanel createPanel8()
411
   public JPanel createPanel9()
383 412
   {
384 413
      JPanel jpanel1 = new JPanel();
385 414
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");

Also available in: Unified diff