Revision 44008 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/DefaultJExpressionBuilder.java
DefaultJExpressionBuilder.java | ||
---|---|---|
22 | 22 |
import javax.swing.JLabel; |
23 | 23 |
import javax.swing.JList; |
24 | 24 |
import javax.swing.JOptionPane; |
25 |
import javax.swing.JScrollPane; |
|
25 | 26 |
import javax.swing.JTree; |
26 | 27 |
import javax.swing.SwingUtilities; |
27 | 28 |
import javax.swing.event.ListSelectionEvent; |
... | ... | |
80 | 81 |
private JEditorPane txtDescription; |
81 | 82 |
private ImageIcon defaultIconGroup; |
82 | 83 |
private ImageIcon defaultIconElement; |
84 |
private JScrollPane scrDescription; |
|
83 | 85 |
|
84 | 86 |
private class ElementsTreeModel implements TreeModel { |
85 | 87 |
|
... | ... | |
202 | 204 |
this.defaultIconElement = theme.get("expressionbuilder-element"); |
203 | 205 |
|
204 | 206 |
this.txtDescription = new JEditorPane(); |
207 |
this.scrDescription = new JScrollPane(this.txtDescription); |
|
205 | 208 |
|
206 | 209 |
toolsSwingManager.setDefaultPopupMenu(this.txtExpression); |
207 | 210 |
toolsSwingManager.setDefaultPopupMenu(this.txtGroupElement); |
... | ... | |
537 | 540 |
this.txtDescription.setContentType("text/html"); |
538 | 541 |
this.txtDescription.setText(html.toString()); |
539 | 542 |
this.txtDescription.setCaretPosition(0); |
540 |
newInfoPanel = this.txtDescription;
|
|
543 |
newInfoPanel = this.scrDescription;
|
|
541 | 544 |
} else { |
542 | 545 |
newInfoPanel = aditionalPanel.asJComponent(); |
543 | 546 |
} |
... | ... | |
559 | 562 |
this.txtGroupElement.setText(group.getName()); |
560 | 563 |
this.txtSimpleElementFilter.setText(""); |
561 | 564 |
this.txtDescription.setText(""); |
562 |
if( this.infoPanel != this.txtDescription ) {
|
|
565 |
if( this.infoPanel != this.scrDescription ) {
|
|
563 | 566 |
this.pnlDescription.removeAll(); |
564 |
this.pnlDescription.add(this.txtDescription, BorderLayout.CENTER); |
|
567 |
this.pnlDescription.add(this.scrDescription, BorderLayout.CENTER); |
|
568 |
this.pnlDescription.revalidate(); |
|
565 | 569 |
this.pnlDescription.repaint(); |
566 |
this.infoPanel = this.txtDescription;
|
|
570 |
this.infoPanel = this.scrDescription;
|
|
567 | 571 |
} |
568 | 572 |
if (group instanceof SimpleElement) { |
569 | 573 |
this.btnGroupElementInsert.setEnabled(true); |
Also available in: Unified diff