From fb11f604704afe3e2a6f822b444d5c0a6c15f99c Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Fri, 29 Jul 2022 13:04:13 +0200 Subject: [PATCH] ide: fix #932: Use our own BigDecimal in Sequence Chart. It caused an exception when the filter button was clicked on the seqchart window. --- .../src/org/omnetpp/common/eventlog/FilterEventLogDialog.java | 2 +- .../sequencechart/editors/SequenceChartContributor.java | 2 +- .../sequencechart/widgets/ISequenceChartStyleProvider.java | 3 +-- .../sequencechart/widgets/SequenceChartStyleProvider.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/org.omnetpp.common/src/org/omnetpp/common/eventlog/FilterEventLogDialog.java b/ui/org.omnetpp.common/src/org/omnetpp/common/eventlog/FilterEventLogDialog.java index 39874006e4..b6c6dbedda 100644 --- a/ui/org.omnetpp.common/src/org/omnetpp/common/eventlog/FilterEventLogDialog.java +++ b/ui/org.omnetpp.common/src/org/omnetpp/common/eventlog/FilterEventLogDialog.java @@ -9,7 +9,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -66,6 +65,7 @@ import org.omnetpp.common.ui.GenericTreeLabelProvider; import org.omnetpp.common.ui.GenericTreeNode; import org.omnetpp.common.util.StringUtils; +import org.omnetpp.common.util.BigDecimal; import org.omnetpp.common.util.UIUtils; import org.omnetpp.eventlog.EventLogEntry; import org.omnetpp.eventlog.IEventLog; diff --git a/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/editors/SequenceChartContributor.java b/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/editors/SequenceChartContributor.java index 0432373ff8..d053fe56a6 100644 --- a/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/editors/SequenceChartContributor.java +++ b/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/editors/SequenceChartContributor.java @@ -2539,7 +2539,7 @@ private void redrawSequenceChart() { } private void setNonLinearMinimumTimelineCoordinateDeltaText() { - java.math.BigDecimal value = new java.math.BigDecimal(100 * getNonLinearMinimumTimelineCoordinateDelta()); + BigDecimal value = new BigDecimal(100 * getNonLinearMinimumTimelineCoordinateDelta()); value = value.round(new MathContext(3)); minimumLabel.setText("Relative minimum distance to maximum distance: " + value + "%"); } diff --git a/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/ISequenceChartStyleProvider.java b/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/ISequenceChartStyleProvider.java index d3a5a3bb80..064c7efd55 100644 --- a/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/ISequenceChartStyleProvider.java +++ b/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/ISequenceChartStyleProvider.java @@ -1,9 +1,8 @@ package org.omnetpp.sequencechart.widgets; -import java.math.BigDecimal; - import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; +import org.omnetpp.common.util.BigDecimal; import org.omnetpp.common.eventlog.EventLogInput; import org.omnetpp.common.eventlog.ModuleTreeItem; import org.omnetpp.eventlog.IEvent; diff --git a/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/SequenceChartStyleProvider.java b/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/SequenceChartStyleProvider.java index 441cd697e1..c09580c344 100644 --- a/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/SequenceChartStyleProvider.java +++ b/ui/org.omnetpp.sequencechart/src/org/omnetpp/sequencechart/widgets/SequenceChartStyleProvider.java @@ -1,6 +1,5 @@ package org.omnetpp.sequencechart.widgets; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -12,6 +11,7 @@ import org.omnetpp.common.eventlog.EventLogInput; import org.omnetpp.common.eventlog.ModuleTreeItem; import org.omnetpp.common.util.Pair; +import org.omnetpp.common.util.BigDecimal; import org.omnetpp.eventlog.FilteredMessageDependency; import org.omnetpp.eventlog.IEvent; import org.omnetpp.eventlog.IEventLog;