Revision 42079
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.ui/src/main/java/org/gvsig/gui/beans/swing/JNumberSpinner.java | ||
---|---|---|
32 | 32 |
import javax.swing.JSpinner; |
33 | 33 |
import javax.swing.SpinnerNumberModel; |
34 | 34 |
import javax.swing.text.NumberFormatter; |
35 |
|
|
35 | 36 |
import org.apache.commons.lang3.StringUtils; |
36 | 37 |
import org.slf4j.Logger; |
37 | 38 |
import org.slf4j.LoggerFactory; |
38 | 39 |
|
39 | 40 |
public class JNumberSpinner extends JSpinner { |
40 | 41 |
|
42 |
/** |
|
43 |
* |
|
44 |
*/ |
|
45 |
private static final long serialVersionUID = 8614785196224519553L; |
|
46 |
|
|
41 | 47 |
private static final Logger logger = LoggerFactory.getLogger(JNumberSpinner.class); |
42 | 48 |
|
43 | 49 |
private boolean fireChanges; |
44 |
private List actionListeners = new ArrayList();
|
|
50 |
private List<ActionListener> actionListeners = new ArrayList<ActionListener>();
|
|
45 | 51 |
|
52 |
private final int defaultColumns = 10; |
|
53 |
|
|
46 | 54 |
public JNumberSpinner() { |
47 | 55 |
super(new SpinnerNumberModel(0.0, Double.NEGATIVE_INFINITY, Double.MAX_VALUE, 1.0)); |
48 |
init(-1,0);
|
|
56 |
init(defaultColumns,0);
|
|
49 | 57 |
} |
50 | 58 |
|
51 | 59 |
public JNumberSpinner(int currentValue) { |
52 | 60 |
super(new SpinnerNumberModel(currentValue, Integer.MIN_VALUE, Integer.MAX_VALUE, 1)); |
53 |
init(-1,0);
|
|
61 |
init(defaultColumns,0);
|
|
54 | 62 |
} |
55 | 63 |
|
56 | 64 |
public JNumberSpinner(int currentValue, int columns) { |
... | ... | |
63 | 71 |
init(columns,0); |
64 | 72 |
} |
65 | 73 |
|
66 |
public JNumberSpinner(String currentValue, int columns, int minValue, int maxValue, int step) { |
|
74 |
/* |
|
75 |
* @deprecated use {@link #JNumberSpinner(int, int, int, int, int)} instead. |
|
76 |
*/ |
|
77 |
@Deprecated |
|
78 |
public JNumberSpinner(String currentValue, int columns, int minValue, int maxValue, int step) { |
|
67 | 79 |
super(new SpinnerNumberModel()); |
68 | 80 |
|
69 | 81 |
Number value; |
... | ... | |
102 | 114 |
|
103 | 115 |
public JNumberSpinner(double currentValue) { |
104 | 116 |
super(new SpinnerNumberModel(currentValue, Double.NEGATIVE_INFINITY, Double.MAX_VALUE, 1.0)); |
105 |
init(-1,4);
|
|
117 |
init(defaultColumns,4);
|
|
106 | 118 |
} |
107 | 119 |
|
120 |
/* |
|
121 |
* @deprecated use {@link #JNumberSpinner(double, int, double, double, double)} instead. |
|
122 |
*/ |
|
123 |
@Deprecated |
|
108 | 124 |
public JNumberSpinner(String currentValue, int columns, double minValue, double maxValue, double step) { |
109 | 125 |
this( |
110 | 126 |
currentValue, |
... | ... | |
116 | 132 |
); |
117 | 133 |
} |
118 | 134 |
|
135 |
/* |
|
136 |
* @deprecated use {@link #JNumberSpinner(double currentValue, int columns, |
|
137 |
* double minValue, double maxValue, double step, int decimals)} instead. |
|
138 |
*/ |
|
139 |
@Deprecated |
|
119 | 140 |
public JNumberSpinner(String currentValue, int columns, double minValue, double maxValue, double step, int decimals) { |
120 | 141 |
super(new SpinnerNumberModel()); |
121 | 142 |
|
... | ... | |
131 | 152 |
} |
132 | 153 |
} |
133 | 154 |
init( |
134 |
value == null ? 0 : value, |
|
155 |
value == null ? 0.0 : value,
|
|
135 | 156 |
columns, |
136 | 157 |
new Double(minValue), |
137 | 158 |
new Double(maxValue), |
... | ... | |
171 | 192 |
this.fireChanges = true; |
172 | 193 |
|
173 | 194 |
} |
195 |
|
|
196 |
@Deprecated |
|
174 | 197 |
private void init(Number currentValue, int columns, Comparable minValue, Comparable maxValue, Number step, int decimals) { |
175 | 198 |
|
176 | 199 |
JSpinner.NumberEditor editor = (JSpinner.NumberEditor) this.getEditor(); |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.ui/src/main/java/org/gvsig/gui/beans/swing/cellrenderers/NumberTableCellRenderer.java | ||
---|---|---|
86 | 86 |
|
87 | 87 |
JPanel content = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0)); |
88 | 88 |
content.setBackground(table.getBackground()); |
89 |
|
|
89 |
|
|
90 | 90 |
int decimals = 0; |
91 | 91 |
if( this.acceptsDoubles ) { |
92 | 92 |
decimals = 3; |
93 |
}
|
|
94 |
txt = new JNumberSpinner("",6, 0.0,80.0,1.0,decimals);
|
|
93 |
} |
|
94 |
txt = new JNumberSpinner(0.0,6, 0.0,80.0,1.0,decimals);
|
|
95 | 95 |
// Validator valid = acceptsDoubles ? ValidatingTextField.DOUBLE_VALIDATOR : ValidatingTextField.INTEGER_VALIDATOR; |
96 | 96 |
// txt = new JIncrementalNumberField("", 6,valid, ValidatingTextField.NUMBER_CLEANER, 0, 80, 1); |
97 | 97 |
// if (acceptsDoubles) { |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SimpleFill.java | ||
---|---|---|
207 | 207 |
aux.addComponent(Messages.getText("outline")+":", |
208 | 208 |
aux2); |
209 | 209 |
aux.addComponent(Messages.getText("outline_opacity"), sldOutlineTransparency); |
210 |
txtOutlineWidth = new JNumberSpinner("", 25, 0, Double.MAX_VALUE, 1);
|
|
210 |
txtOutlineWidth = new JNumberSpinner(0.0, 25, 0.0, Double.MAX_VALUE, 1.0, 2);
|
|
211 | 211 |
aux.addComponent(Messages.getText("outline_width"), txtOutlineWidth); |
212 | 212 |
myTab.add(aux); |
213 | 213 |
|
... | ... | |
286 | 286 |
public boolean canManageSymbol(ISymbol symbol){ |
287 | 287 |
return symbol instanceof ISimpleFillSymbol; |
288 | 288 |
} |
289 |
|
|
289 |
|
|
290 | 290 |
public void actionPerformed(ActionEvent e) { |
291 | 291 |
Object s = e.getSource(); |
292 | 292 |
|
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SymbolSelector.java | ||
---|---|---|
675 | 675 |
Messages.getText("color")+":", jcc1); |
676 | 676 |
jPanelOptions.addComponent( |
677 | 677 |
Messages.getText("size")+":", |
678 |
txtSize = new JNumberSpinner(3.0, 3, 0, Double.MAX_VALUE, 1)); |
|
678 |
txtSize = new JNumberSpinner(3.0, 3, 0, Double.MAX_VALUE, 1, 2));
|
|
679 | 679 |
jPanelOptions.addComponent(Messages.getText("units")+":", |
680 | 680 |
cmbUnits = new JComboBoxUnits()); |
681 | 681 |
jPanelOptions.addComponent("", |
682 | 682 |
cmbReferenceSystem = new JComboBoxUnitsReferenceSystem()); |
683 | 683 |
jPanelOptions.addComponent( |
684 | 684 |
Messages.getText("angle")+ " (" +Messages.getText("degree")+"):", |
685 |
txtAngle = new JNumberSpinner()); |
|
685 |
txtAngle = new JNumberSpinner(0.0, 3, -180.0, 180.0, 1.0, 2));
|
|
686 | 686 |
|
687 | 687 |
|
688 | 688 |
} else if (shapeType.isTypeOf(Geometry.TYPES.CURVE) || shapeType.isTypeOf(Geometry.TYPES.MULTICURVE)) { |
... | ... | |
691 | 691 |
Messages.getText("color")+":", jcc1); |
692 | 692 |
jPanelOptions.addComponent( |
693 | 693 |
Messages.getText("width")+":", |
694 |
txtSize = new JNumberSpinner(3.0, 3, 0, Double.MAX_VALUE, 1)); |
|
694 |
txtSize = new JNumberSpinner(3.0, 3, 0, Double.MAX_VALUE, 1, 2));
|
|
695 | 695 |
jPanelOptions.addComponent(Messages.getText("units")+":", |
696 | 696 |
cmbUnits = new JComboBoxUnits()); |
697 | 697 |
jPanelOptions.addComponent("", |
... | ... | |
705 | 705 |
Messages.getText("outline_color")+":", jcc2); |
706 | 706 |
jPanelOptions.addComponent( |
707 | 707 |
Messages.getText("outline_width"), |
708 |
txtWidth = new JNumberSpinner(3.0, 3, 0, Double.MAX_VALUE, 1)); |
|
708 |
txtWidth = new JNumberSpinner(3.0, 3, 0, Double.MAX_VALUE, 1, 2));
|
|
709 | 709 |
jPanelOptions.addComponent(Messages.getText("units")+":", |
710 | 710 |
cmbUnits = new JComboBoxUnits()); |
711 | 711 |
jPanelOptions.addComponent("", |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/MarkerFill.java | ||
---|---|---|
166 | 166 |
aux3.addComponent(Messages.getText("outline")+":", |
167 | 167 |
aux2); |
168 | 168 |
aux3.addComponent(Messages.getText("outline_opacity")+":", sldOutlineTransparency); |
169 |
txtOutlineWidth = new JNumberSpinner("", 25, 0, Double.MAX_VALUE, 1);
|
|
169 |
txtOutlineWidth = new JNumberSpinner(0.0, 25, 0.0, Double.MAX_VALUE, 1.0, 2);
|
|
170 | 170 |
aux3.addComponent(Messages.getText("outline_width")+":", txtOutlineWidth); |
171 | 171 |
myTab2.add(aux3); |
172 | 172 |
|
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SimpleMarker.java | ||
---|---|---|
161 | 161 |
jccColor ); |
162 | 162 |
|
163 | 163 |
// marker width |
164 |
txtSize = new JNumberSpinner(5, 25);
|
|
164 |
txtSize = new JNumberSpinner(5.0, 25, 0.0, Double.MAX_VALUE, 1.0, 2);
|
|
165 | 165 |
aux.addComponent(Messages.getText("size")+":", |
166 | 166 |
txtSize ); |
167 |
txtSize.setDouble(5);
|
|
167 |
// txtSize.setDouble(5.0);
|
|
168 | 168 |
|
169 | 169 |
// marker xOffset |
170 |
txtXOffset = new JNumberSpinner(0, 25);
|
|
170 |
txtXOffset = new JNumberSpinner(0.0, 25, 0.0, Double.MAX_VALUE, 1.0, 2);
|
|
171 | 171 |
aux.addComponent(Messages.getText("x_offset")+":", |
172 | 172 |
txtXOffset ); |
173 | 173 |
|
174 | 174 |
|
175 | 175 |
// marker width |
176 |
txtYOffset = new JNumberSpinner(0, 25);
|
|
176 |
txtYOffset = new JNumberSpinner(0.0, 25, 0.0, Double.MAX_VALUE, 1.0, 2);
|
|
177 | 177 |
aux.addComponent(Messages.getText("y_offset")+":", |
178 | 178 |
txtYOffset ); |
179 | 179 |
|
Also available in: Unified diff