deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed to finish edit before reading values from text fields

Browse source
This commit is contained in:
nifi 2009-03-12 17:52:20 +00:00
parent 99b9e80de9
commit 473a10caf2
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tools/cooja/java/se/sics/cooja/dialogs/AddMoteDialog.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: AddMoteDialog.java,v 1.6 2009/02/18 13:55:24 fros4943 Exp $ * $Id: AddMoteDialog.java,v 1.7 2009/03/12 17:52:20 nifi Exp $
*/ */
package se.sics.cooja.dialogs; package se.sics.cooja.dialogs;
@ -449,9 +449,22 @@ public class AddMoteDialog extends JDialog {
dispose(); dispose();
} else if (e.getActionCommand().equals("add")) { } else if (e.getActionCommand().equals("add")) {
try { try {
newMotes = new Vector<Mote>(); // Validate input
try {
numberOfMotesField.commitEdit();
startX.commitEdit();
endX.commitEdit();
startY.commitEdit();
endY.commitEdit();
startZ.commitEdit();
endZ.commitEdit();
} catch (ParseException error) {
numberOfMotesField.requestFocusInWindow();
return;
}
// Create new motes // Create new motes
newMotes = new Vector<Mote>();
int motesToAdd = ((Number) numberOfMotesField.getValue()).intValue(); int motesToAdd = ((Number) numberOfMotesField.getValue()).intValue();
while (newMotes.size() < motesToAdd) { while (newMotes.size() < motesToAdd) {
Mote newMote = moteType.generateMote(simulation); Mote newMote = moteType.generateMote(simulation);
@ -469,7 +482,7 @@ public class AddMoteDialog extends JDialog {
} }
Positioner positioner = Positioner.generateInterface(positionerClass, Positioner positioner = Positioner.generateInterface(positionerClass,
((Number) numberOfMotesField.getValue()).intValue(), motesToAdd,
((Number) startX.getValue()).doubleValue(), ((Number) endX ((Number) startX.getValue()).doubleValue(), ((Number) endX
.getValue()).doubleValue(), ((Number) startY.getValue()) .getValue()).doubleValue(), ((Number) startY.getValue())
.doubleValue(), ((Number) endY.getValue()).doubleValue(), .doubleValue(), ((Number) endY.getValue()).doubleValue(),
@ -545,13 +558,13 @@ public class AddMoteDialog extends JDialog {
dispose(); dispose();
} catch (OutOfMemoryError e2) { } catch (OutOfMemoryError e2) {
newMotes = null;
JOptionPane.showMessageDialog( JOptionPane.showMessageDialog(
AddMoteDialog.this, AddMoteDialog.this,
"Out of memory!\nException message: \"" + e2.getMessage() + "\"\n\n" + "Out of memory!\nException message: \"" + e2.getMessage() + "\"\n\n" +
"Reduce number of nodes or start COOJA with more memory (\">ant run_bigmem\").", "Reduce number of nodes or start COOJA with more memory (\">ant run_bigmem\").",
"Not enough heap memory!", JOptionPane.ERROR_MESSAGE "Not enough heap memory!", JOptionPane.ERROR_MESSAGE
); );
newMotes = null;
} }
} }
} }