Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ARODataAnalyzer/src/com/att/aro/main/TimeRangeAnalysisDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ResourceBundle;

import javax.swing.BorderFactory;
Expand Down Expand Up @@ -194,9 +197,8 @@ public void actionPerformed(ActionEvent arg0) {

// Rounding traceEndTime as getEndTimeTextField() to
// handle time comparison
Double traceEndTimeRounded = Double
.valueOf(decimalFormat.format(traceEndTime));
if (startTime < endTime) {
Double traceEndTimeRounded = new BigDecimal(traceEndTime).setScale(2, RoundingMode.HALF_UP).doubleValue();
if (startTime < endTime) {
if (((startTime >= 0.0) && (startTime <= traceEndTimeRounded))
&& ((endTime >= 0.0) && (endTime <= traceEndTimeRounded))) {

Expand Down Expand Up @@ -294,7 +296,13 @@ private JTextField getStartTimeTextField() {
* Returns the start time from the start time field
*/
private Double getTimeValue(JTextField field) throws NumberFormatException {
return Double.parseDouble(field.getText());
Number value= null;
try {
value = decimalFormat.parse(field.getText());
} catch (ParseException e) {
throw new NumberFormatException();
}
return value.doubleValue();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ResourceBundle;

import javax.swing.BorderFactory;
Expand Down Expand Up @@ -215,8 +218,7 @@ public void actionPerformed(ActionEvent arg0) {

// Rounding traceEndTime as getEndTimeTextField() to
// handle time comparison
Double traceEndTimeRounded = Double
.valueOf(DECIMAL_FORMAT.format(traceEndTime));
Double traceEndTimeRounded = new BigDecimal(traceEndTime).setScale(2, RoundingMode.HALF_UP).doubleValue();
if (startTime < endTime) {
if (((startTime >= 0.0) && (startTime <= traceEndTimeRounded))
&& ((endTime >= 0.0) && (endTime <= traceEndTimeRounded))) {
Expand Down Expand Up @@ -318,7 +320,13 @@ private JTextField getStartTimeTextField() {
* Returns the start time from the start time field
*/
private Double getTimeValue(JTextField field) throws NumberFormatException {
return Double.parseDouble(field.getText());
Number value= null;
try {
value = DECIMAL_FORMAT.parse(field.getText());
} catch (ParseException e) {
throw new NumberFormatException();
}
return value.doubleValue();
}

/**
Expand Down