Revision 44006 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
12 12
import javax.swing.ImageIcon;
13 13
import javax.swing.JButton;
14 14
import javax.swing.JComboBox;
15
import javax.swing.JEditorPane;
16 15
import javax.swing.JFrame;
17 16
import javax.swing.JLabel;
18 17
import javax.swing.JList;
......
29 28
{
30 29
   JTabbedPane tabExpressionBuilder = new JTabbedPane();
31 30
   JList lstSimpleElement = new JList();
31
   JTree treeElements = new JTree();
32 32
   JTextArea txtExpression = new JTextArea();
33 33
   JButton btnEq = new JButton();
34 34
   JButton btnNeq = new JButton();
......
38 38
   JButton btnDiv = new JButton();
39 39
   JButton btnParentOpen = new JButton();
40 40
   JButton btnParentClose = new JButton();
41
   JTree treeElements = new JTree();
42
   JEditorPane txtDescription = new JEditorPane();
43 41
   JTextField txtGroupElement = new JTextField();
44 42
   JButton btnGroupElementInsert = new JButton();
45 43
   JButton btnSimpleElementInsert = new JButton();
......
49 47
   JButton btnSimpleElementTimeLimit = new JButton();
50 48
   JTextField txtSimpleElementFilter = new JTextField();
51 49
   JButton btnSimpleElementFilter = new JButton();
50
   JPanel pnlDescription = new JPanel();
52 51
   JPanel pnlScriptEditorContainer = new JPanel();
53 52
   JComboBox cboPickerScripts = new JComboBox();
54 53
   JButton btnPickerRemove = new JButton();
......
171 170
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
172 171
      jpanel1.add(jscrollpane1,cc.xy(4,8));
173 172

  
174
      jpanel1.add(createPanel2(),cc.xywh(2,2,5,1));
175 173
      treeElements.setName("treeElements");
176 174
      JScrollPane jscrollpane2 = new JScrollPane();
177 175
      jscrollpane2.setViewportView(treeElements);
......
179 177
      jscrollpane2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
180 178
      jpanel1.add(jscrollpane2,cc.xywh(2,4,1,6));
181 179

  
182
      txtDescription.setEditable(false);
183
      txtDescription.setName("txtDescription");
184
      JScrollPane jscrollpane3 = new JScrollPane();
185
      jscrollpane3.setViewportView(txtDescription);
186
      jscrollpane3.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
187
      jscrollpane3.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
188
      jpanel1.add(jscrollpane3,cc.xywh(6,4,1,6));
189

  
180
      jpanel1.add(createPanel2(),cc.xywh(2,2,5,1));
190 181
      jpanel1.add(createPanel4(),cc.xy(4,4));
191 182
      jpanel1.add(createPanel5(),cc.xy(4,9));
192 183
      jpanel1.add(createPanel6(),cc.xy(4,6));
184
      pnlDescription.setBackground(new Color(255,255,255));
185
      pnlDescription.setForeground(new Color(255,255,255));
186
      pnlDescription.setName("pnlDescription");
187
      jpanel1.add(pnlDescription,cc.xywh(6,4,1,6));
188

  
193 189
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7,8,9 });
194 190
      return jpanel1;
195 191
   }
......
201 197
      CellConstraints cc = new CellConstraints();
202 198
      jpanel1.setLayout(formlayout1);
203 199

  
200
      txtExpression.setLineWrap(true);
204 201
      txtExpression.setName("txtExpression");
205 202
      txtExpression.setRows(2);
206 203
      JScrollPane jscrollpane1 = new JScrollPane();
207 204
      jscrollpane1.setViewportView(txtExpression);
208 205
      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
209
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
206
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
210 207
      jpanel1.add(jscrollpane1,cc.xy(1,1));
211 208

  
212 209
      jpanel1.add(createPanel3(),cc.xy(3,1));

Also available in: Unified diff