Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2013-02-18 18:18:03
|
Revision: 8277
http://fudaa.svn.sourceforge.net/fudaa/?rev=8277&view=rev
Author: deniger
Date: 2013-02-18 18:17:46 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
variables
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-15 16:20:05 UTC (rev 8276)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-18 18:17:46 UTC (rev 8277)
@@ -55,8 +55,9 @@
* @version $Id: CtuluExprGUI.java,v 1.9 2006-09-19 14:36:55 deniger Exp $
*/
private final class InfoUpdater implements ListSelectionListener {
+
/**
- *
+ *
*/
private final BuLabel lb_;
@@ -168,7 +169,6 @@
private static final class VariableModel extends AbstractListModel implements ComboBoxModel {
final List l_;
-
Object selected_;
VariableModel(final List _l) {
@@ -207,7 +207,7 @@
@Override
public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
- final boolean _isSelected, final boolean _cellHasFocus) {
+ final boolean _isSelected, final boolean _cellHasFocus) {
final Component c = super.getListCellRendererComponent(_list, _value, _index, _isSelected, _cellHasFocus);
if (_value == null) {
return c;
@@ -223,21 +223,21 @@
buf.append("</td></tr><tr><td>");
if (expr_.containsDescFor(name)) {
buf.append(CtuluLib.getS("Desc")).append("</td><td>: ").append(expr_.getDesc(name))
- .append("</td></tr><tr><td>");
+ .append("</td></tr><tr><td>");
}
buf.append(CtuluLib.getS("Valeur courante")).append("</td><td>: ").append(CtuluLibString.ESPACE).append(
- v.getValue());
+ v.getValue());
buf.append("</td></tr></table></body></html>");
setToolTipText(buf.toString());
return c;
}
}
- static class TableCellRenderer extends DefaultTableCellRenderer {
+ static class TableCellRenderer extends DefaultTableCellRenderer {
@Override
public Component getTableCellRendererComponent(final JTable _table, final Object _value, final boolean _isSelected,
- final boolean _hasFocus, final int _row, final int _column) {
+ final boolean _hasFocus, final int _row, final int _column) {
final Component r = super.getTableCellRendererComponent(_table, _value, _isSelected, _hasFocus, _row, _column);
if (_value == null) {
setText(CtuluLib.getS("Pr\xE9ciser une valeur"));
@@ -264,44 +264,26 @@
return ((Variable) _o1).getName().compareTo(((Variable) _o2).getName());
}
}
-
-
-
private boolean isValid_;
-
BuButton btEvaluate_;
-
final BuButton btValid_;
-
final transient CtuluExpr expr_;
-
final VariableModel fctModel_;
-
final transient ListSelectionModel fctSelected_;
-
final VariableModel model_;
-
final VariableModel cstModel_;
-
BuTextField tfResult_;
-
final BuTextArea txt_;
-
final BuLabel txtError_;
-
transient Variable[] varToSet_;
-
final transient ListSelectionModel varSelected_;
-
final transient ListSelectionModel cstSelected_;
-
final ValueTableModel tModel_;
-
final BuTable table_;
/**
* Construit a partir de l'expression par default.
- *
+ *
* @param _expr l'expression
*/
public CtuluExprGUI(final CtuluExpr _expr) {
@@ -412,28 +394,26 @@
cstSelected_.addListSelectionListener(listener);
varSelected_.addListSelectionListener(listener);
listVar.addFocusListener(new FocusListener() {
-
@Override
- public void focusLost(final FocusEvent _e) {}
+ public void focusLost(final FocusEvent _e) {
+ }
@Override
public void focusGained(final FocusEvent _e) {
listener.updateVar();
}
-
});
listCst.addFocusListener(new FocusListener() {
-
@Override
- public void focusLost(final FocusEvent _e) {}
+ public void focusLost(final FocusEvent _e) {
+ }
@Override
public void focusGained(final FocusEvent _e) {
listener.updateCst();
}
-
});
}
@@ -442,7 +422,6 @@
_listFct.setModel(fctModel_);
fctSelected_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
_listFct.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(final MouseEvent _e) {
if (_e.getClickCount() >= 2) {
@@ -454,24 +433,20 @@
private void initCstVar(final BuEmptyList _listVar, final BuEmptyList _listCst) {
_listVar.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(final MouseEvent _e) {
if (_e.getClickCount() >= 2) {
insertVar(model_, varSelected_);
}
}
-
});
_listCst.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(final MouseEvent _e) {
if (_e.getClickCount() >= 2) {
insertVar(cstModel_, cstSelected_);
}
}
-
});
_listVar.setModel(model_);
_listCst.setModel(cstModel_);
@@ -484,6 +459,10 @@
return isValid_;
}
+ public BuTextArea getTxtArea() {
+ return txt_;
+ }
+
private void updateBt() {
btValid_.setEnabled(true);
if (btEvaluate_ != null) {
@@ -501,7 +480,7 @@
} else {
txtError_.setForeground(Color.RED);
txtError_.setText(expr_.getParser().getError(0)
- + (expr_.getParser().getNbError() > 0 ? "..." : CtuluLibString.EMPTY_STRING));
+ + (expr_.getParser().getNbError() > 0 ? "..." : CtuluLibString.EMPTY_STRING));
txtError_.setToolTipText(expr_.getParser().getHtmlError());
}
btValid_.setEnabled(false);
@@ -596,9 +575,9 @@
}
public String getExprText() {
- String txt = txt_.getText();
- txt=txt.replace('\r', ' ');
- txt=txt.replace('\n', ' ');
+ String txt = txt_.getText();
+ txt = txt.replace('\r', ' ');
+ txt = txt.replace('\n', ' ');
return txt;
}
@@ -611,5 +590,4 @@
public void removeUpdate(final DocumentEvent _e) {
updateBt();
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-22 15:59:34
|
Revision: 8293
http://fudaa.svn.sourceforge.net/fudaa/?rev=8293&view=rev
Author: deniger
Date: 2013-02-22 15:59:22 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
correction tests unitaires
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-22 07:33:37 UTC (rev 8292)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java 2013-02-22 15:59:22 UTC (rev 8293)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ctulu.editor;
+import com.memoire.bu.*;
import java.awt.Color;
import java.awt.Component;
import java.awt.LayoutManager;
@@ -21,7 +22,6 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-
import javax.swing.AbstractListModel;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultListCellRenderer;
@@ -34,15 +34,11 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
-
-import org.nfunk.jep.Variable;
-
-import com.memoire.bu.*;
-
import org.fudaa.ctulu.CtuluExpr;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.table.CtuluTable;
+import org.nfunk.jep.Variable;
/**
* @author Fred Deniger
@@ -67,41 +63,41 @@
InfoUpdater(final BuLabel _lb) {
lb_ = _lb;
}
-
+
public void updateCst() {
Variable v = null;
if (!cstSelected_.isSelectionEmpty()) {
v = (Variable) cstModel_.getElementAt(cstSelected_.getMaxSelectionIndex());
-
+
}
updateTxt(v);
}
-
+
public void updateVar() {
Variable v = null;
if (!varSelected_.isSelectionEmpty()) {
v = (Variable) model_.getElementAt(varSelected_.getMaxSelectionIndex());
-
+
}
updateTxt(v);
}
-
+
@Override
public void valueChanged(final ListSelectionEvent _e) {
-
+
if (_e.getSource() == cstSelected_) {
updateCst();
}
if (_e.getSource() == varSelected_) {
updateVar();
}
-
+
}
-
+
private void updateTxt(final Variable _v) {
String txt = CtuluLibString.ESPACE;
if (_v != null) {
-
+
final String name = _v.getName();
if (expr_.containsDescFor(name)) {
txt = name + ": " + expr_.getDesc(name);
@@ -112,14 +108,14 @@
lb_.setText(txt);
}
}
-
+
class ValueTableModel extends AbstractTableModel {
-
+
protected void fireChanged() {
super.fireTableRowsDeleted(0, getRowCount());
super.fireTableRowsInserted(0, getRowCount());
}
-
+
@Override
public Class getColumnClass(final int _columnIndex) {
if (_columnIndex == 0) {
@@ -127,22 +123,22 @@
}
return Double.class;
}
-
+
@Override
public int getColumnCount() {
return 2;
}
-
+
@Override
public String getColumnName(final int _column) {
return CtuluLibString.ESPACE;
}
-
+
@Override
public int getRowCount() {
return varToSet_ == null ? 0 : varToSet_.length;
}
-
+
@Override
public Object getValueAt(final int _rowIndex, final int _columnIndex) {
if (_columnIndex == 0) {
@@ -150,12 +146,12 @@
}
return varToSet_[_rowIndex].getValue();
}
-
+
@Override
public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
return _columnIndex == 1;
}
-
+
@Override
public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
if (_value == null || _value.equals(varToSet_[_rowIndex].getValue())) {
@@ -165,35 +161,35 @@
clearResult();
}
}
-
+
private static final class VariableModel extends AbstractListModel implements ComboBoxModel {
-
+
final List l_;
Object selected_;
-
+
VariableModel(final List _l) {
l_ = _l;
}
-
+
protected void fireAllChanged() {
super.fireIntervalAdded(this, 0, getSize());
}
-
+
@Override
public Object getElementAt(final int _index) {
return l_.get(_index);
}
-
+
@Override
public Object getSelectedItem() {
return selected_;
}
-
+
@Override
public int getSize() {
return l_.size();
}
-
+
@Override
public void setSelectedItem(final Object _anItem) {
if (selected_ != _anItem) {
@@ -202,9 +198,9 @@
}
}
}
-
+
class VarRenderer extends DefaultListCellRenderer {
-
+
@Override
public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
final boolean _isSelected, final boolean _cellHasFocus) {
@@ -232,9 +228,9 @@
return c;
}
}
-
+
static class TableCellRenderer extends DefaultTableCellRenderer {
-
+
@Override
public Component getTableCellRendererComponent(final JTable _table, final Object _value, final boolean _isSelected,
final boolean _hasFocus, final int _row, final int _column) {
@@ -252,7 +248,7 @@
* @version $Id: CtuluExprGUI.java,v 1.9 2006-09-19 14:36:55 deniger Exp $
*/
public static class VariableComparator implements Comparator {
-
+
@Override
public int compare(final Object _o1, final Object _o2) {
if (_o1 == _o2) {
@@ -325,7 +321,7 @@
add(top);
final BuLabel lb = new BuLabel(CtuluLibString.ESPACE);
add(lb);
-
+
var = new BuPanel(lay);
var.add(new BuLabel(CtuluLib.getS("Constantes")));
listCst.setVisibleRowCount(3);
@@ -351,7 +347,7 @@
scroll.setPreferredHeight(prefH);
var.add(scroll);
top.add(var);
-
+
txt_ = new BuTextArea();
txt_.getDocument().addDocumentListener(this);
txt_.setColumns(30);
@@ -397,26 +393,26 @@
@Override
public void focusLost(final FocusEvent _e) {
}
-
+
@Override
public void focusGained(final FocusEvent _e) {
listener.updateVar();
-
+
}
});
listCst.addFocusListener(new FocusListener() {
@Override
public void focusLost(final FocusEvent _e) {
}
-
+
@Override
public void focusGained(final FocusEvent _e) {
listener.updateCst();
-
+
}
});
}
-
+
private void initFctList(final BuEmptyList _listFct) {
_listFct.setVisibleRowCount(3);
_listFct.setModel(fctModel_);
@@ -430,7 +426,7 @@
}
});
}
-
+
private void initCstVar(final BuEmptyList _listVar, final BuEmptyList _listCst) {
_listVar.addMouseListener(new MouseAdapter() {
@Override
@@ -451,25 +447,31 @@
_listVar.setModel(model_);
_listCst.setModel(cstModel_);
}
-
+
public boolean isExprValide() {
if (btValid_.isEnabled()) {
valideExpr();
}
return isValid_;
}
-
+
public BuTextArea getTxtArea() {
return txt_;
}
-
+
private void updateBt() {
btValid_.setEnabled(true);
if (btEvaluate_ != null) {
btEvaluate_.setEnabled(true);
}
}
-
+
+ public void setError(String msg) {
+ txtError_.setForeground(Color.RED);
+ txtError_.setToolTipText(msg);
+ txtError_.setText(msg);
+ }
+
public final void valideExpr() {
expr_.getParser().parseExpression(getExprText());
isValid_ = !expr_.getParser().hasError();
@@ -478,8 +480,7 @@
txtError_.setText(CtuluLib.getS("Valide"));
txtError_.setToolTipText(txtError_.getText());
} else {
- txtError_.setForeground(Color.RED);
- txtError_.setText(expr_.getParser().getError(0)
+ setError(expr_.getParser().getError(0)
+ (expr_.getParser().getNbError() > 0 ? "..." : CtuluLibString.EMPTY_STRING));
txtError_.setToolTipText(expr_.getParser().getHtmlError());
}
@@ -496,16 +497,16 @@
varToSet_ = newVar;
tModel_.fireChanged();
}
-
+
expr_.findUsedVar();
}
-
+
protected void clearResult() {
if (tfResult_ != null) {
tfResult_.setText(CtuluLibString.EMPTY_STRING);
}
}
-
+
String containsNullValue() {
final StringBuffer buf = new StringBuffer();
boolean aie = false;
@@ -522,7 +523,7 @@
}
return aie ? buf.toString() : null;
}
-
+
@Override
public void actionPerformed(final ActionEvent _e) {
if (_e.getSource() == btValid_) {
@@ -551,7 +552,7 @@
}
}
}
-
+
protected void insertFct() {
txt_.insert(fctModel_.getElementAt(fctSelected_.getMaxSelectionIndex()) + "(", txt_.getCaretPosition());
final int pos = txt_.getCaretPosition();
@@ -559,33 +560,37 @@
txt_.setCaretPosition(pos);
txt_.requestFocus();
}
-
+
+ public void setButtonValidVisible(boolean b) {
+ btValid_.setVisible(b);
+ }
+
protected void insertVar(final VariableModel _var, final ListSelectionModel _select) {
txt_.insert(((Variable) _var.getElementAt(_select.getMaxSelectionIndex())).getName(), txt_.getCaretPosition());
txt_.requestFocus();
}
-
+
@Override
public void changedUpdate(final DocumentEvent _e) {
updateBt();
}
-
+
public final CtuluExpr getExpr() {
return expr_;
}
-
+
public String getExprText() {
String txt = txt_.getText();
txt = txt.replace('\r', ' ');
txt = txt.replace('\n', ' ');
return txt;
}
-
+
@Override
public void insertUpdate(final DocumentEvent _e) {
updateBt();
}
-
+
@Override
public void removeUpdate(final DocumentEvent _e) {
updateBt();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X