summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath22
-rw-r--r--.gitlab-ci.yml14
-rw-r--r--.project6
-rw-r--r--.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--pom.xml37
-rwxr-xr-xsrc/org/unitConverter/UnitsDatabase.java (renamed from src/unitConverter/UnitsDatabase.java)18
-rwxr-xr-xsrc/org/unitConverter/converterGUI/DelegateListModel.java (renamed from src/unitConverter/converterGUI/DelegateListModel.java)2
-rwxr-xr-xsrc/org/unitConverter/converterGUI/FilterComparator.java (renamed from src/unitConverter/converterGUI/FilterComparator.java)2
-rwxr-xr-xsrc/org/unitConverter/converterGUI/GridBagBuilder.java (renamed from src/unitConverter/converterGUI/GridBagBuilder.java)2
-rwxr-xr-xsrc/org/unitConverter/converterGUI/UnitConverterGUI.java (renamed from src/unitConverter/converterGUI/UnitConverterGUI.java)18
-rw-r--r--src/org/unitConverter/converterGUI/package-info.java (renamed from src/unitConverter/converterGUI/package-info.java)2
-rwxr-xr-xsrc/org/unitConverter/dimension/BaseDimension.java (renamed from src/unitConverter/dimension/BaseDimension.java)2
-rwxr-xr-xsrc/org/unitConverter/dimension/OtherBaseDimension.java (renamed from src/unitConverter/dimension/OtherBaseDimension.java)2
-rwxr-xr-xsrc/org/unitConverter/dimension/SIBaseDimension.java (renamed from src/unitConverter/dimension/SIBaseDimension.java)2
-rwxr-xr-xsrc/org/unitConverter/dimension/StandardDimensions.java (renamed from src/unitConverter/dimension/StandardDimensions.java)2
-rwxr-xr-xsrc/org/unitConverter/dimension/UnitDimension.java (renamed from src/unitConverter/dimension/UnitDimension.java)2
-rwxr-xr-xsrc/org/unitConverter/dimension/UnitDimensionTest.java (renamed from src/unitConverter/dimension/UnitDimensionTest.java)24
-rwxr-xr-xsrc/org/unitConverter/dimension/package-info.java (renamed from src/unitConverter/dimension/package-info.java)2
-rw-r--r--src/org/unitConverter/package-info.java (renamed from src/unitConverter/package-info.java)2
-rw-r--r--src/org/unitConverter/unit/AbstractUnit.java (renamed from src/unitConverter/unit/AbstractUnit.java)4
-rwxr-xr-xsrc/org/unitConverter/unit/BaseUnit.java (renamed from src/unitConverter/unit/BaseUnit.java)4
-rwxr-xr-xsrc/org/unitConverter/unit/DefaultUnitPrefix.java (renamed from src/unitConverter/unit/DefaultUnitPrefix.java)2
-rw-r--r--src/org/unitConverter/unit/LinearUnit.java (renamed from src/unitConverter/unit/LinearUnit.java)4
-rwxr-xr-xsrc/org/unitConverter/unit/NonlinearUnits.java (renamed from src/unitConverter/unit/NonlinearUnits.java)2
-rw-r--r--src/org/unitConverter/unit/SI.java (renamed from src/unitConverter/unit/SI.java)6
-rwxr-xr-xsrc/org/unitConverter/unit/SIPrefix.java (renamed from src/unitConverter/unit/SIPrefix.java)2
-rwxr-xr-xsrc/org/unitConverter/unit/Unit.java (renamed from src/unitConverter/unit/Unit.java)4
-rwxr-xr-xsrc/org/unitConverter/unit/UnitPrefix.java (renamed from src/unitConverter/unit/UnitPrefix.java)2
-rwxr-xr-xsrc/org/unitConverter/unit/UnitSystem.java (renamed from src/unitConverter/unit/UnitSystem.java)4
-rwxr-xr-xsrc/org/unitConverter/unit/UnitTest.java (renamed from src/unitConverter/unit/UnitTest.java)9
-rw-r--r--src/org/unitConverter/unit/package-info.java (renamed from src/unitConverter/unit/package-info.java)2
32 files changed, 144 insertions, 68 deletions
diff --git a/.classpath b/.classpath
index 145a671..72d7394 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..7c2efb0
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+# attempt at ci
+
+image: maven:3-jdk-8
+
+
+build:
+ stage: build
+ script: "mvn clean -B"
+ script: "mvn compile -B"
+
+
+test:
+ stage: test
+ script: "mvn verify"
diff --git a/.project b/.project
index 656186b..56f686e 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a21537..8445b6b 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -8,4 +8,6 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3aede3b
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.unitConverter</groupId>
+ <artifactId>unitConverter</artifactId>
+ <version>0.1.0</version>
+ <name>Unit Converter</name>
+ <description>A Java unit converter inspired by GNU Units</description>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.unitConverter.converterGUI.UnitConverterGUI</mainClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+ </dependencies>
+</project> \ No newline at end of file
diff --git a/src/unitConverter/UnitsDatabase.java b/src/org/unitConverter/UnitsDatabase.java
index 9f5a6a2..4d41735 100755
--- a/src/unitConverter/UnitsDatabase.java
+++ b/src/org/unitConverter/UnitsDatabase.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter;
+package org.unitConverter;
import java.io.BufferedReader;
import java.io.File;
@@ -27,14 +27,14 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import unitConverter.dimension.UnitDimension;
-import unitConverter.unit.AbstractUnit;
-import unitConverter.unit.BaseUnit;
-import unitConverter.unit.DefaultUnitPrefix;
-import unitConverter.unit.LinearUnit;
-import unitConverter.unit.SI;
-import unitConverter.unit.Unit;
-import unitConverter.unit.UnitPrefix;
+import org.unitConverter.dimension.UnitDimension;
+import org.unitConverter.unit.AbstractUnit;
+import org.unitConverter.unit.BaseUnit;
+import org.unitConverter.unit.DefaultUnitPrefix;
+import org.unitConverter.unit.LinearUnit;
+import org.unitConverter.unit.SI;
+import org.unitConverter.unit.Unit;
+import org.unitConverter.unit.UnitPrefix;
/**
* A database of units and prefixes, and their names.
diff --git a/src/unitConverter/converterGUI/DelegateListModel.java b/src/org/unitConverter/converterGUI/DelegateListModel.java
index 0e9b342..e375126 100755
--- a/src/unitConverter/converterGUI/DelegateListModel.java
+++ b/src/org/unitConverter/converterGUI/DelegateListModel.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.converterGUI;
+package org.unitConverter.converterGUI;
import java.util.Collection;
import java.util.Iterator;
diff --git a/src/unitConverter/converterGUI/FilterComparator.java b/src/org/unitConverter/converterGUI/FilterComparator.java
index 27ec3ab..bebc2df 100755
--- a/src/unitConverter/converterGUI/FilterComparator.java
+++ b/src/org/unitConverter/converterGUI/FilterComparator.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.converterGUI;
+package org.unitConverter.converterGUI;
import java.util.Comparator;
import java.util.Objects;
diff --git a/src/unitConverter/converterGUI/GridBagBuilder.java b/src/org/unitConverter/converterGUI/GridBagBuilder.java
index e036677..f1229b2 100755
--- a/src/unitConverter/converterGUI/GridBagBuilder.java
+++ b/src/org/unitConverter/converterGUI/GridBagBuilder.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.converterGUI;
+package org.unitConverter.converterGUI;
import java.awt.GridBagConstraints;
import java.awt.Insets;
diff --git a/src/unitConverter/converterGUI/UnitConverterGUI.java b/src/org/unitConverter/converterGUI/UnitConverterGUI.java
index cf78ea8..a70e971 100755
--- a/src/unitConverter/converterGUI/UnitConverterGUI.java
+++ b/src/org/unitConverter/converterGUI/UnitConverterGUI.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.converterGUI;
+package org.unitConverter.converterGUI;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -44,14 +44,14 @@ import javax.swing.JTextField;
import javax.swing.ListModel;
import javax.swing.ListSelectionModel;
-import unitConverter.UnitsDatabase;
-import unitConverter.dimension.StandardDimensions;
-import unitConverter.dimension.UnitDimension;
-import unitConverter.unit.AbstractUnit;
-import unitConverter.unit.NonlinearUnits;
-import unitConverter.unit.SI;
-import unitConverter.unit.Unit;
-import unitConverter.unit.UnitPrefix;
+import org.unitConverter.UnitsDatabase;
+import org.unitConverter.dimension.StandardDimensions;
+import org.unitConverter.dimension.UnitDimension;
+import org.unitConverter.unit.AbstractUnit;
+import org.unitConverter.unit.NonlinearUnits;
+import org.unitConverter.unit.SI;
+import org.unitConverter.unit.Unit;
+import org.unitConverter.unit.UnitPrefix;
/**
* @author Adrien Hopkins
diff --git a/src/unitConverter/converterGUI/package-info.java b/src/org/unitConverter/converterGUI/package-info.java
index 9f7fa57..d899f97 100644
--- a/src/unitConverter/converterGUI/package-info.java
+++ b/src/org/unitConverter/converterGUI/package-info.java
@@ -20,4 +20,4 @@
* @author Adrien Hopkins
* @since 2019-01-25
*/
-package unitConverter.converterGUI; \ No newline at end of file
+package org.unitConverter.converterGUI; \ No newline at end of file
diff --git a/src/unitConverter/dimension/BaseDimension.java b/src/org/unitConverter/dimension/BaseDimension.java
index 0c09dce..5e3ddad 100755
--- a/src/unitConverter/dimension/BaseDimension.java
+++ b/src/org/unitConverter/dimension/BaseDimension.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.dimension;
+package org.unitConverter.dimension;
/**
* A base dimension that makes up {@code UnitDimension} objects.
diff --git a/src/unitConverter/dimension/OtherBaseDimension.java b/src/org/unitConverter/dimension/OtherBaseDimension.java
index 8c6d25d..8aea2b9 100755
--- a/src/unitConverter/dimension/OtherBaseDimension.java
+++ b/src/org/unitConverter/dimension/OtherBaseDimension.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.dimension;
+package org.unitConverter.dimension;
import java.util.Objects;
diff --git a/src/unitConverter/dimension/SIBaseDimension.java b/src/org/unitConverter/dimension/SIBaseDimension.java
index 928d8d6..c459963 100755
--- a/src/unitConverter/dimension/SIBaseDimension.java
+++ b/src/org/unitConverter/dimension/SIBaseDimension.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.dimension;
+package org.unitConverter.dimension;
import java.util.Objects;
diff --git a/src/unitConverter/dimension/StandardDimensions.java b/src/org/unitConverter/dimension/StandardDimensions.java
index b3edb7d..4b1b814 100755
--- a/src/unitConverter/dimension/StandardDimensions.java
+++ b/src/org/unitConverter/dimension/StandardDimensions.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.dimension;
+package org.unitConverter.dimension;
/**
* All of the dimensions that are used by the SI.
diff --git a/src/unitConverter/dimension/UnitDimension.java b/src/org/unitConverter/dimension/UnitDimension.java
index 40e5bbc..dbeaeff 100755
--- a/src/unitConverter/dimension/UnitDimension.java
+++ b/src/org/unitConverter/dimension/UnitDimension.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.dimension;
+package org.unitConverter.dimension;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/unitConverter/dimension/UnitDimensionTest.java b/src/org/unitConverter/dimension/UnitDimensionTest.java
index 86db1b8..3b09610 100755
--- a/src/unitConverter/dimension/UnitDimensionTest.java
+++ b/src/org/unitConverter/dimension/UnitDimensionTest.java
@@ -14,20 +14,20 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.dimension;
+package org.unitConverter.dimension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static unitConverter.dimension.StandardDimensions.AREA;
-import static unitConverter.dimension.StandardDimensions.ENERGY;
-import static unitConverter.dimension.StandardDimensions.LENGTH;
-import static unitConverter.dimension.StandardDimensions.MASS;
-import static unitConverter.dimension.StandardDimensions.MASS_DENSITY;
-import static unitConverter.dimension.StandardDimensions.QUANTITY;
-import static unitConverter.dimension.StandardDimensions.TIME;
-import static unitConverter.dimension.StandardDimensions.VOLUME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.unitConverter.dimension.StandardDimensions.AREA;
+import static org.unitConverter.dimension.StandardDimensions.ENERGY;
+import static org.unitConverter.dimension.StandardDimensions.LENGTH;
+import static org.unitConverter.dimension.StandardDimensions.MASS;
+import static org.unitConverter.dimension.StandardDimensions.MASS_DENSITY;
+import static org.unitConverter.dimension.StandardDimensions.QUANTITY;
+import static org.unitConverter.dimension.StandardDimensions.TIME;
+import static org.unitConverter.dimension.StandardDimensions.VOLUME;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
/**
* Tests for {@link UnitDimension}.
diff --git a/src/unitConverter/dimension/package-info.java b/src/org/unitConverter/dimension/package-info.java
index 74895ce..db363df 100755
--- a/src/unitConverter/dimension/package-info.java
+++ b/src/org/unitConverter/dimension/package-info.java
@@ -20,4 +20,4 @@
* @author Adrien Hopkins
* @since 2018-12-22
*/
-package unitConverter.dimension; \ No newline at end of file
+package org.unitConverter.dimension; \ No newline at end of file
diff --git a/src/unitConverter/package-info.java b/src/org/unitConverter/package-info.java
index e2f7ff7..4f51ad0 100644
--- a/src/unitConverter/package-info.java
+++ b/src/org/unitConverter/package-info.java
@@ -20,4 +20,4 @@
* @author Adrien Hopkins
* @since 2019-01-25
*/
-package unitConverter; \ No newline at end of file
+package org.unitConverter; \ No newline at end of file
diff --git a/src/unitConverter/unit/AbstractUnit.java b/src/org/unitConverter/unit/AbstractUnit.java
index 24814e8..6088960 100644
--- a/src/unitConverter/unit/AbstractUnit.java
+++ b/src/org/unitConverter/unit/AbstractUnit.java
@@ -14,11 +14,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.Objects;
-import unitConverter.dimension.UnitDimension;
+import org.unitConverter.dimension.UnitDimension;
/**
* The default abstract implementation of the {@code Unit} interface.
diff --git a/src/unitConverter/unit/BaseUnit.java b/src/org/unitConverter/unit/BaseUnit.java
index fe36c45..1f0c825 100755
--- a/src/unitConverter/unit/BaseUnit.java
+++ b/src/org/unitConverter/unit/BaseUnit.java
@@ -14,11 +14,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.Objects;
-import unitConverter.dimension.UnitDimension;
+import org.unitConverter.dimension.UnitDimension;
/**
* A unit that is the base for its dimension. It does not have to be for a base dimension, so units like the Newton and
diff --git a/src/unitConverter/unit/DefaultUnitPrefix.java b/src/org/unitConverter/unit/DefaultUnitPrefix.java
index d19161b..c0e8dcc 100755
--- a/src/unitConverter/unit/DefaultUnitPrefix.java
+++ b/src/org/unitConverter/unit/DefaultUnitPrefix.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.Objects;
diff --git a/src/unitConverter/unit/LinearUnit.java b/src/org/unitConverter/unit/LinearUnit.java
index b786b3b..ab46f1e 100644
--- a/src/unitConverter/unit/LinearUnit.java
+++ b/src/org/unitConverter/unit/LinearUnit.java
@@ -14,11 +14,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.Objects;
-import unitConverter.dimension.UnitDimension;
+import org.unitConverter.dimension.UnitDimension;
/**
* A unit that is equal to a certain number multiplied by its base.
diff --git a/src/unitConverter/unit/NonlinearUnits.java b/src/org/unitConverter/unit/NonlinearUnits.java
index ec1874c..e47c28f 100755
--- a/src/unitConverter/unit/NonlinearUnits.java
+++ b/src/org/unitConverter/unit/NonlinearUnits.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
/**
* Some major nonlinear units.
diff --git a/src/unitConverter/unit/SI.java b/src/org/unitConverter/unit/SI.java
index 54eb4c5..46e6ff1 100644
--- a/src/unitConverter/unit/SI.java
+++ b/src/org/unitConverter/unit/SI.java
@@ -14,14 +14,14 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
-import unitConverter.dimension.StandardDimensions;
-import unitConverter.dimension.UnitDimension;
+import org.unitConverter.dimension.StandardDimensions;
+import org.unitConverter.dimension.UnitDimension;
/**
* The SI, which holds all SI units
diff --git a/src/unitConverter/unit/SIPrefix.java b/src/org/unitConverter/unit/SIPrefix.java
index 54625fb..31d7ff2 100755
--- a/src/unitConverter/unit/SIPrefix.java
+++ b/src/org/unitConverter/unit/SIPrefix.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
/**
* The SI prefixes.
diff --git a/src/unitConverter/unit/Unit.java b/src/org/unitConverter/unit/Unit.java
index 54f1423..86fc5a2 100755
--- a/src/unitConverter/unit/Unit.java
+++ b/src/org/unitConverter/unit/Unit.java
@@ -14,11 +14,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.Objects;
-import unitConverter.dimension.UnitDimension;
+import org.unitConverter.dimension.UnitDimension;
/**
* A unit that has an associated base unit, and can convert a value expressed in it to and from that base.
diff --git a/src/unitConverter/unit/UnitPrefix.java b/src/org/unitConverter/unit/UnitPrefix.java
index a0c1b7c..289e60f 100755
--- a/src/unitConverter/unit/UnitPrefix.java
+++ b/src/org/unitConverter/unit/UnitPrefix.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
/**
* A prefix that can be attached onto the front of any unit, which multiplies it by a certain value
diff --git a/src/unitConverter/unit/UnitSystem.java b/src/org/unitConverter/unit/UnitSystem.java
index ce8c249..550eff6 100755
--- a/src/unitConverter/unit/UnitSystem.java
+++ b/src/org/unitConverter/unit/UnitSystem.java
@@ -14,11 +14,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
import java.util.Objects;
-import unitConverter.dimension.UnitDimension;
+import org.unitConverter.dimension.UnitDimension;
/**
* A system of units. Each unit should be aware of its system.
diff --git a/src/unitConverter/unit/UnitTest.java b/src/org/unitConverter/unit/UnitTest.java
index c3237eb..931cc57 100755
--- a/src/unitConverter/unit/UnitTest.java
+++ b/src/org/unitConverter/unit/UnitTest.java
@@ -14,13 +14,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package unitConverter.unit;
+package org.unitConverter.unit;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
-import org.junit.jupiter.api.Test;
-
-import unitConverter.dimension.StandardDimensions;
+import org.junit.Test;
+import org.unitConverter.dimension.StandardDimensions;
/**
* Testing the various Unit classes
diff --git a/src/unitConverter/unit/package-info.java b/src/org/unitConverter/unit/package-info.java
index b5deb0c..c4493ae 100644
--- a/src/unitConverter/unit/package-info.java
+++ b/src/org/unitConverter/unit/package-info.java
@@ -20,4 +20,4 @@
* @author Adrien Hopkins
* @since 2019-01-25
*/
-package unitConverter.unit; \ No newline at end of file
+package org.unitConverter.unit; \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-03 12:25:02 +0000