From 178f59ef7b8ccad288b3fc7c1fecfecb4eab2253 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Fri, 1 Sep 2017 23:06:45 -0700 Subject: [PATCH] Move the exception to the correct package. --- .../org/nwapw/abacus/{number => function}/DomainException.java | 2 +- .../kotlin/org/nwapw/abacus/function/applicable/Applicable.kt | 2 +- .../org/nwapw/abacus/function/applicable/ReducerApplicable.kt | 2 +- core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java | 2 +- fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) rename core/src/main/java/org/nwapw/abacus/{number => function}/DomainException.java (93%) diff --git a/core/src/main/java/org/nwapw/abacus/number/DomainException.java b/core/src/main/java/org/nwapw/abacus/function/DomainException.java similarity index 93% rename from core/src/main/java/org/nwapw/abacus/number/DomainException.java rename to core/src/main/java/org/nwapw/abacus/function/DomainException.java index 51a1769..a7a449c 100644 --- a/core/src/main/java/org/nwapw/abacus/number/DomainException.java +++ b/core/src/main/java/org/nwapw/abacus/function/DomainException.java @@ -1,4 +1,4 @@ -package org.nwapw.abacus.number; +package org.nwapw.abacus.function; /** * Exception thrown if the function parameters do not match diff --git a/core/src/main/kotlin/org/nwapw/abacus/function/applicable/Applicable.kt b/core/src/main/kotlin/org/nwapw/abacus/function/applicable/Applicable.kt index dce1129..ed8bb91 100644 --- a/core/src/main/kotlin/org/nwapw/abacus/function/applicable/Applicable.kt +++ b/core/src/main/kotlin/org/nwapw/abacus/function/applicable/Applicable.kt @@ -1,6 +1,6 @@ package org.nwapw.abacus.function.applicable -import org.nwapw.abacus.number.DomainException +import org.nwapw.abacus.function.DomainException import org.nwapw.abacus.plugin.NumberImplementation /** diff --git a/core/src/main/kotlin/org/nwapw/abacus/function/applicable/ReducerApplicable.kt b/core/src/main/kotlin/org/nwapw/abacus/function/applicable/ReducerApplicable.kt index 9a80edc..54340a4 100644 --- a/core/src/main/kotlin/org/nwapw/abacus/function/applicable/ReducerApplicable.kt +++ b/core/src/main/kotlin/org/nwapw/abacus/function/applicable/ReducerApplicable.kt @@ -1,6 +1,6 @@ package org.nwapw.abacus.function.applicable -import org.nwapw.abacus.number.DomainException +import org.nwapw.abacus.function.DomainException import org.nwapw.abacus.plugin.NumberImplementation import org.nwapw.abacus.tree.Reducer diff --git a/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java b/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java index 3d3269e..39cf091 100755 --- a/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java +++ b/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java @@ -5,7 +5,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nwapw.abacus.Abacus; import org.nwapw.abacus.config.Configuration; -import org.nwapw.abacus.number.DomainException; +import org.nwapw.abacus.function.DomainException; import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.plugin.StandardPlugin; import org.nwapw.abacus.tree.TreeNode; diff --git a/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java index 45cdf76..8b05f3f 100644 --- a/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java +++ b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java @@ -14,6 +14,7 @@ import org.nwapw.abacus.Abacus; import org.nwapw.abacus.config.Configuration; import org.nwapw.abacus.function.Documentation; import org.nwapw.abacus.function.DocumentationType; +import org.nwapw.abacus.function.DomainException; import org.nwapw.abacus.number.*; import org.nwapw.abacus.plugin.ClassFinder; import org.nwapw.abacus.plugin.PluginListener;