diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index d42aaad2..5e5c7a26 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
encoding//src/jar-specific/java=UTF-8
encoding//src/main/java=UTF-8
-encoding//src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java=UTF-8
-encoding//src/main/java/org/warp/picalculator/math/MathematicalSymbols.java=UTF-8
+encoding//src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesis.java=UTF-8
+encoding//src/main/java/it/cavallium/warppi/math/MathematicalSymbols.java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/main/rules=UTF-8
encoding//src/teavm-specific/java=UTF-8
diff --git a/MmapByteBuffer.java b/MmapByteBuffer.java
index e2772a5a..5573e989 100644
--- a/MmapByteBuffer.java
+++ b/MmapByteBuffer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.nio.ByteBuffer;
diff --git a/math-rules-cache.zip b/math-rules-cache.zip
index 8b961d68..74244bd4 100644
Binary files a/math-rules-cache.zip and b/math-rules-cache.zip differ
diff --git a/pom.xml b/pom.xml
index 56138d59..39dc10c8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4.0.0
- org.warp.picalculator
+ it.cavallium.warppi
warppi-calculator
jar
0.8-SNAPSHOT
@@ -100,13 +100,6 @@
ecj
4.6.1
-
@@ -193,7 +186,7 @@
process-classes
- org.warp.picalculator.boot.Main
+ it.cavallium.warppi.boot.WarpPI
true
true
true
@@ -210,12 +203,6 @@
-
-
- org.infinispan
- infinispan-jcache
- 9.4.0.Beta1
-
it.unimi.dsi
fastutil
@@ -312,7 +299,7 @@
- org.warp.picalculator.boot.Main
+ it.cavallium.warppi.boot.WarpPI
@@ -334,6 +321,6 @@
maven-jar-plugin 2.4
false 1.8 1.8
true libs/
- org.warp.picalculator.boot.Main
+ it.cavallium.warppi.boot.WarpPI
-->
diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup
deleted file mode 100644
index 334e937b..00000000
--- a/pom.xml.versionsBackup
+++ /dev/null
@@ -1,276 +0,0 @@
-
- 4.0.0
- org.warp.picalculator
- warppi-calculator
- jar
- 1.0-SNAPSHOT
- WarpPI Calculator
- http://warp.ovh
-
- 1.8
- 1.8
- src/main/java
-
-
-
- teavm-dev
- https://dl.bintray.com/konsoletyper/teavm
-
-
- oss-snapshots-repo
- Sonatype OSS Maven Repository
- https://oss.sonatype.org/content/groups/public
-
- true
- always
-
-
-
-
-
- jarprofile
-
- jar-specific
-
-
- true
-
-
-
- org.jogamp.jogl
- jogl-all-main
- 2.3.2
-
-
- org.jogamp.gluegen
- gluegen-rt-main
- 2.3.2
-
-
- com.pi4j
- pi4j-core
- 1.2-SNAPSHOT
-
-
- org.fusesource.jansi
- jansi
- 1.15
-
-
- net.lingala.zip4j
- zip4j
- 1.3.2
-
-
- org.eclipse.jdt.core.compiler
- ecj
- 4.6.1
-
-
- ar.com.hjg
- pngj
- 2.1.0
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.3.2
-
- 1.8
- 1.8
- UTF-8
-
-
-
-
-
-
- jsprofile
-
- js-specific
-
-
- false
-
-
-
-
- org.codehaus.mojo
- versions-maven-plugin
- 2.5
-
-
- org.teavm:*
-
-
-
-
-
- use-latest-versions
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.3.2
-
-
- org/warp/picalculator/gui/graphicengine/cpu/*
- org/warp/picalculator/gui/graphicengine/gpu/*
- org/warp/picalculator/gui/graphicengine/headless24bit/*
- org/warp/picalculator/gui/graphicengine/headless256/*
- org/warp/picalculator/gui/graphicengine/headless8/*
- org/warp/picalculator/gui/graphicengine/framebuffer/*
-
- 1.8
- 1.8
- UTF-8
-
-
-
- org.teavm
- teavm-maven-plugin
- 0.5.1
-
-
-
- org.teavm
- teavm-classlib
- 0.5.1
-
-
-
-
-
- compile
-
- process-classes
-
- org.warp.picalculator.Main
- true
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
- org.teavm
- teavm-classlib
- 0.5.1
-
-
-
- it.unimi.dsi
- fastutil
- 7.2.0
-
-
- com.google.code.gson
- gson
- 2.8.2
-
-
-
- WarpPICalculator
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- add-source
- generate-sources
-
- add-source
-
-
-
-
- ${basedir}/src/main/java
-
-
- ${basedir}/src/${src.dir}/java
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-eclipse-plugin
- 2.9
-
- true
- true
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 3.0.2
-
- UTF-8
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 2.4.1
-
-
-
- jar-with-dependencies
-
-
-
-
- org.warp.picalculator.Main
-
-
-
-
-
-
- make-assembly
-
- package
-
- single
-
-
-
-
-
-
-
-
diff --git a/src/jar-specific/java/ar/com/hjg/pngj/PngReaderApng.java b/src/jar-specific/java/ar/com/hjg/pngj/PngReaderApng.java
index 64f99247..90127d27 100644
--- a/src/jar-specific/java/ar/com/hjg/pngj/PngReaderApng.java
+++ b/src/jar-specific/java/ar/com/hjg/pngj/PngReaderApng.java
@@ -184,7 +184,7 @@ public class PngReaderApng extends PngReaderByte {
@Override
protected boolean countChunkTypeAsAncillary(String id) {
// we don't count fdat as ancillary data
- return super.countChunkTypeAsAncillary(id) && !id.equals(""+id.equals(PngChunkFDAT.ID));
+ return super.countChunkTypeAsAncillary(id) && !id.equals("" + id.equals(PngChunkFDAT.ID));
}
};
diff --git a/src/jar-specific/java/org/warp/picalculator/ConsoleUtils.java b/src/jar-specific/java/it/cavallium/warppi/ConsoleUtils.java
similarity index 94%
rename from src/jar-specific/java/org/warp/picalculator/ConsoleUtils.java
rename to src/jar-specific/java/it/cavallium/warppi/ConsoleUtils.java
index 52874efd..878d3339 100644
--- a/src/jar-specific/java/org/warp/picalculator/ConsoleUtils.java
+++ b/src/jar-specific/java/it/cavallium/warppi/ConsoleUtils.java
@@ -1,11 +1,11 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.PrintStream;
import java.io.StringWriter;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import org.warp.picalculator.math.MathematicalSymbols;
+import it.cavallium.warppi.math.MathematicalSymbols;
public class ConsoleUtils {
diff --git a/src/jar-specific/java/org/warp/picalculator/PlatformUtils.java b/src/jar-specific/java/it/cavallium/warppi/PlatformUtils.java
similarity index 93%
rename from src/jar-specific/java/org/warp/picalculator/PlatformUtils.java
rename to src/jar-specific/java/it/cavallium/warppi/PlatformUtils.java
index 82c7ca85..73b586ba 100644
--- a/src/jar-specific/java/org/warp/picalculator/PlatformUtils.java
+++ b/src/jar-specific/java/it/cavallium/warppi/PlatformUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git a/src/jar-specific/java/org/warp/picalculator/ZipUtils.java b/src/jar-specific/java/it/cavallium/warppi/ZipUtils.java
similarity index 94%
rename from src/jar-specific/java/org/warp/picalculator/ZipUtils.java
rename to src/jar-specific/java/it/cavallium/warppi/ZipUtils.java
index e56ec7c4..d86b01e1 100644
--- a/src/jar-specific/java/org/warp/picalculator/ZipUtils.java
+++ b/src/jar-specific/java/it/cavallium/warppi/ZipUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.File;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DAtomicInteger.java b/src/jar-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java
similarity index 83%
rename from src/jar-specific/java/org/warp/picalculator/deps/DAtomicInteger.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java
index 073c5021..b0f4c304 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DAtomicInteger.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/jar-specific/java/it/cavallium/warppi/deps/DEngine.java b/src/jar-specific/java/it/cavallium/warppi/deps/DEngine.java
new file mode 100644
index 00000000..6e83f6f3
--- /dev/null
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DEngine.java
@@ -0,0 +1,40 @@
+package it.cavallium.warppi.deps;
+
+import it.cavallium.warppi.ClassUtils;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUEngine;
+import it.cavallium.warppi.gui.graphicengine.framebuffer.FBEngine;
+
+public class DEngine {
+ public static GraphicEngine newGPUEngine() {
+ try {
+ return (GraphicEngine) ClassUtils.newClassInstance("it.cavallium.warppi.gui.graphicengine.gpu.GPUEngine");
+ } catch (NullPointerException ex) {
+ return null;
+ }
+ }
+
+ public static GraphicEngine newHeadless24bitEngine() {
+ return new it.cavallium.warppi.gui.graphicengine.headless24bit.Headless24bitEngine();
+ }
+
+ public static GraphicEngine newHeadless256Engine() {
+ return new it.cavallium.warppi.gui.graphicengine.headless256.Headless256Engine();
+ }
+
+ public static GraphicEngine newHeadless8Engine() {
+ return new it.cavallium.warppi.gui.graphicengine.headless8.Headless8Engine();
+ }
+
+ public static GraphicEngine newCPUEngine() {
+ return new CPUEngine();
+ }
+
+ public static GraphicEngine newFBEngine() {
+ return new FBEngine();
+ }
+
+ public static GraphicEngine newHtmlEngine() {
+ return null;
+ }
+}
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DGpio.java b/src/jar-specific/java/it/cavallium/warppi/deps/DGpio.java
similarity index 91%
rename from src/jar-specific/java/org/warp/picalculator/deps/DGpio.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DGpio.java
index 4ec28019..989aa86d 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DGpio.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DGpio.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
-import org.warp.picalculator.ClassUtils;
+import it.cavallium.warppi.ClassUtils;
public class DGpio {
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DJDTCompiler.java b/src/jar-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java
similarity index 85%
rename from src/jar-specific/java/org/warp/picalculator/deps/DJDTCompiler.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java
index 6d08c4c8..e8b91d44 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DJDTCompiler.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.io.PrintWriter;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DSemaphore.java b/src/jar-specific/java/it/cavallium/warppi/deps/DSemaphore.java
similarity index 87%
rename from src/jar-specific/java/org/warp/picalculator/deps/DSemaphore.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DSemaphore.java
index 6d69b642..d39b5142 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DSemaphore.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DSemaphore.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.util.concurrent.Semaphore;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java b/src/jar-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java
similarity index 94%
rename from src/jar-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java
index 332a772b..2cdf2478 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java
@@ -23,7 +23,9 @@
*
*/
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
+
+import java.nio.file.LinkOption;
/**
* Defines the standard open options.
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DSystem.java b/src/jar-specific/java/it/cavallium/warppi/deps/DSystem.java
similarity index 67%
rename from src/jar-specific/java/org/warp/picalculator/deps/DSystem.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DSystem.java
index e42f2d24..ef421991 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DSystem.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DSystem.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
public class DSystem {
public static final void exit(int val) {
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DURLClassLoader.java b/src/jar-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java
similarity index 90%
rename from src/jar-specific/java/org/warp/picalculator/deps/DURLClassLoader.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java
index de3b4c1e..1ad355e7 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/DURLClassLoader.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.net.URL;
import java.net.URLClassLoader;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/StorageUtils.java b/src/jar-specific/java/it/cavallium/warppi/deps/StorageUtils.java
similarity index 95%
rename from src/jar-specific/java/org/warp/picalculator/deps/StorageUtils.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/StorageUtils.java
index e769ea87..c99f5b69 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/StorageUtils.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/StorageUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.io.BufferedReader;
import java.io.File;
@@ -24,7 +24,8 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.io.IOUtils;
-import org.warp.picalculator.ClassUtils;
+
+import it.cavallium.warppi.ClassUtils;
public class StorageUtils {
public static final boolean exists(Path f) {
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java b/src/jar-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java
similarity index 96%
rename from src/jar-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java
index b4acfdaf..2f175ae1 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.jogamp;
+package it.cavallium.warppi.deps.jogamp;
public class DJogamp {
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/nio/DFiles.java b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DFiles.java
similarity index 89%
rename from src/jar-specific/java/org/warp/picalculator/deps/nio/DFiles.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/nio/DFiles.java
index d6ac2dd1..428cbc59 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/nio/DFiles.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DFiles.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.nio;
+package it.cavallium.warppi.deps.nio;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/nio/DPath.java b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPath.java
similarity index 79%
rename from src/jar-specific/java/org/warp/picalculator/deps/nio/DPath.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/nio/DPath.java
index 0fd0dc3d..0217e705 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/nio/DPath.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPath.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.nio;
+package it.cavallium.warppi.deps.nio;
import java.nio.file.Path;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/nio/DPaths.java b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPaths.java
similarity index 75%
rename from src/jar-specific/java/org/warp/picalculator/deps/nio/DPaths.java
rename to src/jar-specific/java/it/cavallium/warppi/deps/nio/DPaths.java
index 9afcb3bf..dc9a89ee 100644
--- a/src/jar-specific/java/org/warp/picalculator/deps/nio/DPaths.java
+++ b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPaths.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.nio;
+package it.cavallium.warppi.deps.nio;
import java.nio.file.Paths;
diff --git a/src/jar-specific/java/org/warp/picalculator/deps/DEngine.java b/src/jar-specific/java/org/warp/picalculator/deps/DEngine.java
deleted file mode 100644
index bf9e8ab4..00000000
--- a/src/jar-specific/java/org/warp/picalculator/deps/DEngine.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.warp.picalculator.deps;
-
-import org.warp.picalculator.ClassUtils;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUEngine;
-import org.warp.picalculator.gui.graphicengine.framebuffer.FBEngine;
-
-public class DEngine {
- public static GraphicEngine newGPUEngine() {
- try {
- return (GraphicEngine) ClassUtils.newClassInstance("org.warp.picalculator.gui.graphicengine.gpu.GPUEngine");
- } catch (NullPointerException ex) {
- return null;
- }
- }
-
- public static GraphicEngine newHeadless24bitEngine() {
- return new org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitEngine();
- }
-
- public static GraphicEngine newHeadless256Engine() {
- return new org.warp.picalculator.gui.graphicengine.headless256.Headless256Engine();
- }
-
- public static GraphicEngine newHeadless8Engine() {
- return new org.warp.picalculator.gui.graphicengine.headless8.Headless8Engine();
- }
-
- public static GraphicEngine newCPUEngine() {
- return new CPUEngine();
- }
-
- public static GraphicEngine newFBEngine() {
- return new FBEngine();
- }
-
- public static GraphicEngine newHtmlEngine() {
- return null;
- }
-}
diff --git a/src/main/java/org/warp/picalculator/BMPFile.java b/src/main/java/it/cavallium/warppi/BMPFile.java
similarity index 96%
rename from src/main/java/org/warp/picalculator/BMPFile.java
rename to src/main/java/it/cavallium/warppi/BMPFile.java
index 0ffd6a1c..5a83f7d5 100755
--- a/src/main/java/org/warp/picalculator/BMPFile.java
+++ b/src/main/java/it/cavallium/warppi/BMPFile.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.awt.Component;
import java.awt.Image;
diff --git a/src/main/java/org/warp/picalculator/CacheUtils.java b/src/main/java/it/cavallium/warppi/CacheUtils.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/CacheUtils.java
rename to src/main/java/it/cavallium/warppi/CacheUtils.java
index 5b44e561..812dac31 100644
--- a/src/main/java/org/warp/picalculator/CacheUtils.java
+++ b/src/main/java/it/cavallium/warppi/CacheUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.util.Collections;
import java.util.HashMap;
diff --git a/src/main/java/org/warp/picalculator/ClassUtils.java b/src/main/java/it/cavallium/warppi/ClassUtils.java
similarity index 96%
rename from src/main/java/org/warp/picalculator/ClassUtils.java
rename to src/main/java/it/cavallium/warppi/ClassUtils.java
index b630f896..d70d0e8f 100644
--- a/src/main/java/org/warp/picalculator/ClassUtils.java
+++ b/src/main/java/it/cavallium/warppi/ClassUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/it/cavallium/warppi/Engine.java b/src/main/java/it/cavallium/warppi/Engine.java
new file mode 100755
index 00000000..898ecbf2
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/Engine.java
@@ -0,0 +1,129 @@
+package it.cavallium.warppi;
+
+import java.io.IOException;
+
+import it.cavallium.warppi.boot.StartupArguments;
+import it.cavallium.warppi.deps.DGpio;
+import it.cavallium.warppi.deps.DSystem;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.HardwareTouchDevice;
+import it.cavallium.warppi.device.InputManager;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.flow.BehaviorSubject;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.DisplayManager;
+import it.cavallium.warppi.gui.HUD;
+import it.cavallium.warppi.gui.HardwareDisplay;
+import it.cavallium.warppi.gui.screens.Screen;
+
+public class Engine {
+ public static final Engine INSTANCE = new Engine();
+ private static boolean running = false;
+ private static BehaviorSubject loadPhase = BehaviorSubject.create();
+ private BehaviorSubject loaded = BehaviorSubject.create(false);
+
+ private Engine() {
+
+ }
+
+ /**
+ * Start an instance of the calculator.
+ *
+ * @param screen
+ * Default screen to show at startup
+ * @param disp
+ * Hardware display
+ * @param hud
+ * Head-up display
+ * @param args
+ * Startup arguments
+ * @throws InterruptedException
+ * @throws IOException
+ */
+ public static void start(Screen screen, HardwareDisplay disp, HardwareTouchDevice touchdevice, HUD hud,
+ StartupArguments args) throws InterruptedException, IOException {
+ if (running) {
+ throw new IllegalAccessError("Already running!");
+ } else {
+ running = true;
+ INSTANCE.startInstance(screen, disp, touchdevice, hud, args);
+ }
+ }
+
+ private void startInstance(Screen screen, HardwareDisplay disp, HardwareTouchDevice touchdevice, HUD hud,
+ StartupArguments args) throws InterruptedException, IOException {
+ ConsoleUtils.out.println("WarpPI Calculator");
+ initializeEnvironment(args);
+
+ Thread currentThread = Thread.currentThread();
+ currentThread.setPriority(Thread.MAX_PRIORITY);
+ PlatformUtils.setThreadName(currentThread, "Main thread");
+
+ DisplayManager dm = new DisplayManager(disp, hud, screen, "WarpPI Calculator by Andrea Cavalli (@Cavallium)");
+ Keyboard k = new Keyboard();
+ InputManager im = new InputManager(k, touchdevice);
+ HardwareDevice hardwareDevice = new HardwareDevice(dm, im);
+
+ hardwareDevice.setup(() -> loadPhase.onNext(new LoadingStatus()));
+ }
+
+ private void onShutdown() {
+ ConsoleUtils.out.println(1, "Shutdown...");
+ beforeShutdown();
+ ConsoleUtils.out.println(1, "");
+ ConsoleUtils.out.println(1, "Closed.");
+ DSystem.exit(0);
+ }
+
+ private void initializeEnvironment(StartupArguments args) throws IOException {
+ ClassUtils.classLoader = this.getClass();
+ StaticVars.startupArguments = args;
+ Utils.debugThirdScreen = StaticVars.debugOn & false;
+ StaticVars.debugWindow2x = args.isZoomed();
+ if (args.isVerboseLoggingEnabled() || args.isDebugEnabled()) {
+ StaticVars.outputLevel = ConsoleUtils.OUTPUTLEVEL_DEBUG_VERBOSE;
+ }
+ ConsoleUtils.out.println(ConsoleUtils.OUTPUTLEVEL_DEBUG_MIN, args);
+ checkDeviceType();
+ if (Utils.isRunningOnRaspberry() && args.isRaspberryModeAllowed()) {
+ DGpio.wiringPiSetupPhys();
+ DGpio.pinMode(12, DGpio.PWM_OUTPUT);
+ } else {
+ StaticVars.screenPos = new int[] { 0, 0 };
+ StaticVars.debugOn = true;
+ }
+ }
+
+ private void checkDeviceType() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void beforeShutdown() {
+ Keyboard.stopKeyboard();
+ }
+
+ public Observable isLoaded() {
+ return loaded;
+ }
+
+ public Observable getLoadPhase() {
+ return loadPhase;
+ }
+
+ public static class LoadingStatus {
+ protected LoadingStatus() {
+
+ }
+
+ public void done() {
+ Engine.INSTANCE.loaded.onNext(true);
+ HardwareDevice.INSTANCE.getDisplayManager().waitForExit();
+ Engine.INSTANCE.onShutdown();
+ }
+
+ public void failed() {
+ Engine.INSTANCE.onShutdown();
+ }
+ }
+}
diff --git a/src/main/java/org/warp/picalculator/Error.java b/src/main/java/it/cavallium/warppi/Error.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/Error.java
rename to src/main/java/it/cavallium/warppi/Error.java
index 8ac6a768..d25f11ca 100755
--- a/src/main/java/org/warp/picalculator/Error.java
+++ b/src/main/java/it/cavallium/warppi/Error.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
public class Error extends java.lang.Throwable {
diff --git a/src/main/java/org/warp/picalculator/Errors.java b/src/main/java/it/cavallium/warppi/Errors.java
similarity index 85%
rename from src/main/java/org/warp/picalculator/Errors.java
rename to src/main/java/it/cavallium/warppi/Errors.java
index a3df6442..85c66415 100755
--- a/src/main/java/org/warp/picalculator/Errors.java
+++ b/src/main/java/it/cavallium/warppi/Errors.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
public enum Errors {
ERROR, DIVISION_BY_ZERO, UNBALANCED_STACK, NOT_IMPLEMENTED, NEGATIVE_PARAMETER, NUMBER_TOO_LARGE, NUMBER_TOO_SMALL, CONVERSION_ERROR, SYNTAX_ERROR, NOT_AN_EQUATION, TIMEOUT, MISSING_ARGUMENTS
diff --git a/src/main/java/org/warp/picalculator/IntegerObj.java b/src/main/java/it/cavallium/warppi/IntegerObj.java
similarity index 69%
rename from src/main/java/org/warp/picalculator/IntegerObj.java
rename to src/main/java/it/cavallium/warppi/IntegerObj.java
index 1e287bb9..a0fa20a0 100644
--- a/src/main/java/org/warp/picalculator/IntegerObj.java
+++ b/src/main/java/it/cavallium/warppi/IntegerObj.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
public class IntegerObj {
public int i;
diff --git a/src/main/java/it/cavallium/warppi/KeyboardTest.java b/src/main/java/it/cavallium/warppi/KeyboardTest.java
new file mode 100755
index 00000000..76066ec1
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/KeyboardTest.java
@@ -0,0 +1,16 @@
+package it.cavallium.warppi;
+
+import java.io.IOException;
+
+import it.cavallium.warppi.boot.WarpPI;
+import it.cavallium.warppi.device.PIHardwareDisplay;
+import it.cavallium.warppi.device.PIHardwareTouchDevice;
+import it.cavallium.warppi.gui.CalculatorHUD;
+import it.cavallium.warppi.gui.screens.KeyboardDebugScreen;
+
+public class KeyboardTest {
+
+ public static void main(String[] args) throws InterruptedException, Error, IOException {
+ Engine.start(new KeyboardDebugScreen(), new PIHardwareDisplay(), new PIHardwareTouchDevice(false, false, false), new CalculatorHUD(), WarpPI.parseStartupArguments(args));
+ }
+}
diff --git a/src/main/java/org/warp/picalculator/MmapByteBuffer.java b/src/main/java/it/cavallium/warppi/MmapByteBuffer.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/MmapByteBuffer.java
rename to src/main/java/it/cavallium/warppi/MmapByteBuffer.java
index 2ea78897..784dc240 100644
--- a/src/main/java/org/warp/picalculator/MmapByteBuffer.java
+++ b/src/main/java/it/cavallium/warppi/MmapByteBuffer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.nio.ByteBuffer;
diff --git a/src/main/java/org/warp/picalculator/ScriptUtils.java b/src/main/java/it/cavallium/warppi/ScriptUtils.java
similarity index 92%
rename from src/main/java/org/warp/picalculator/ScriptUtils.java
rename to src/main/java/it/cavallium/warppi/ScriptUtils.java
index 2355dd75..8fc0beda 100644
--- a/src/main/java/org/warp/picalculator/ScriptUtils.java
+++ b/src/main/java/it/cavallium/warppi/ScriptUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.math.BigInteger;
import java.util.Iterator;
diff --git a/src/main/java/org/warp/picalculator/StaticVars.java b/src/main/java/it/cavallium/warppi/StaticVars.java
similarity index 82%
rename from src/main/java/org/warp/picalculator/StaticVars.java
rename to src/main/java/it/cavallium/warppi/StaticVars.java
index a7650d45..c08dd0f7 100644
--- a/src/main/java/org/warp/picalculator/StaticVars.java
+++ b/src/main/java/it/cavallium/warppi/StaticVars.java
@@ -1,10 +1,10 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.util.function.Function;
-import org.warp.picalculator.boot.StartupArguments;
-import org.warp.picalculator.flow.BehaviorSubject;
-import org.warp.picalculator.flow.Observable;
+import it.cavallium.warppi.boot.StartupArguments;
+import it.cavallium.warppi.flow.BehaviorSubject;
+import it.cavallium.warppi.flow.Observable;
public class StaticVars {
public static final boolean enableVBO = true;
diff --git a/src/main/java/org/warp/picalculator/TestDrivers.java b/src/main/java/it/cavallium/warppi/TestDrivers.java
similarity index 92%
rename from src/main/java/org/warp/picalculator/TestDrivers.java
rename to src/main/java/it/cavallium/warppi/TestDrivers.java
index 1ffd0d80..bc27a251 100755
--- a/src/main/java/org/warp/picalculator/TestDrivers.java
+++ b/src/main/java/it/cavallium/warppi/TestDrivers.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
public class TestDrivers {
public static void main(String[] args) {
diff --git a/src/main/java/org/warp/picalculator/TestGPU.java b/src/main/java/it/cavallium/warppi/TestGPU.java
similarity index 79%
rename from src/main/java/org/warp/picalculator/TestGPU.java
rename to src/main/java/it/cavallium/warppi/TestGPU.java
index 6bdbca6b..7d675566 100755
--- a/src/main/java/org/warp/picalculator/TestGPU.java
+++ b/src/main/java/it/cavallium/warppi/TestGPU.java
@@ -1,25 +1,25 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.IOException;
-import org.warp.picalculator.deps.DEngine;
-import org.warp.picalculator.deps.DSystem;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.KeyPressedEvent;
-import org.warp.picalculator.event.KeyReleasedEvent;
-import org.warp.picalculator.event.KeyboardEventListener;
-import org.warp.picalculator.gui.expression.InputContext;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.containers.NormalInputContainer;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.parser.MathParser;
+import it.cavallium.warppi.deps.DEngine;
+import it.cavallium.warppi.deps.DSystem;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
+import it.cavallium.warppi.event.KeyboardEventListener;
+import it.cavallium.warppi.gui.expression.InputContext;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.containers.NormalInputContainer;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.parser.MathParser;
public class TestGPU {
diff --git a/src/main/java/org/warp/picalculator/TestJNI.java b/src/main/java/it/cavallium/warppi/TestJNI.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/TestJNI.java
rename to src/main/java/it/cavallium/warppi/TestJNI.java
index d4fa9bbc..3488ae36 100644
--- a/src/main/java/org/warp/picalculator/TestJNI.java
+++ b/src/main/java/it/cavallium/warppi/TestJNI.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
public class TestJNI {
public TestJNI() {
diff --git a/src/main/java/org/warp/picalculator/Utils.java b/src/main/java/it/cavallium/warppi/Utils.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/Utils.java
rename to src/main/java/it/cavallium/warppi/Utils.java
index 66d5fc72..96e35a5d 100755
--- a/src/main/java/org/warp/picalculator/Utils.java
+++ b/src/main/java/it/cavallium/warppi/Utils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -16,28 +16,28 @@ import java.util.List;
import org.nevec.rjm.BigDecimalMath;
import org.nevec.rjm.Rational;
-import org.warp.picalculator.deps.DGpio;
-import org.warp.picalculator.deps.StorageUtils;
-import org.warp.picalculator.deps.nio.DFiles;
-import org.warp.picalculator.deps.nio.DPath;
-import org.warp.picalculator.deps.nio.DPaths;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Negative;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Variable;
-import org.warp.picalculator.math.functions.equations.Equation;
-import org.warp.picalculator.math.functions.equations.EquationsSystemPart;
+import it.cavallium.warppi.deps.DGpio;
+import it.cavallium.warppi.deps.StorageUtils;
+import it.cavallium.warppi.deps.nio.DFiles;
+import it.cavallium.warppi.deps.nio.DPath;
+import it.cavallium.warppi.deps.nio.DPaths;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Negative;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.functions.Variable;
+import it.cavallium.warppi.math.functions.equations.Equation;
+import it.cavallium.warppi.math.functions.equations.EquationsSystemPart;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Utils {
diff --git a/src/main/java/org/warp/picalculator/boot/StartupArguments.java b/src/main/java/it/cavallium/warppi/boot/StartupArguments.java
similarity index 90%
rename from src/main/java/org/warp/picalculator/boot/StartupArguments.java
rename to src/main/java/it/cavallium/warppi/boot/StartupArguments.java
index 30abac97..1f6928bc 100644
--- a/src/main/java/org/warp/picalculator/boot/StartupArguments.java
+++ b/src/main/java/it/cavallium/warppi/boot/StartupArguments.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.boot;
+package it.cavallium.warppi.boot;
public interface StartupArguments {
public boolean isRaspberryModeAllowed();
diff --git a/src/main/java/org/warp/picalculator/boot/StartupArgumentsImpl.java b/src/main/java/it/cavallium/warppi/boot/StartupArgumentsImpl.java
similarity index 96%
rename from src/main/java/org/warp/picalculator/boot/StartupArgumentsImpl.java
rename to src/main/java/it/cavallium/warppi/boot/StartupArgumentsImpl.java
index 09d18260..99f79928 100644
--- a/src/main/java/org/warp/picalculator/boot/StartupArgumentsImpl.java
+++ b/src/main/java/it/cavallium/warppi/boot/StartupArgumentsImpl.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.boot;
+package it.cavallium.warppi.boot;
public class StartupArgumentsImpl implements StartupArguments {
diff --git a/src/main/java/org/warp/picalculator/boot/Main.java b/src/main/java/it/cavallium/warppi/boot/WarpPI.java
similarity index 59%
rename from src/main/java/org/warp/picalculator/boot/Main.java
rename to src/main/java/it/cavallium/warppi/boot/WarpPI.java
index 053032ac..c8e711e5 100644
--- a/src/main/java/org/warp/picalculator/boot/Main.java
+++ b/src/main/java/it/cavallium/warppi/boot/WarpPI.java
@@ -1,13 +1,34 @@
-package org.warp.picalculator.boot;
+package it.cavallium.warppi.boot;
import java.util.Arrays;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.PICalculator;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.Engine;
+import it.cavallium.warppi.Engine.LoadingStatus;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.PIHardwareDisplay;
+import it.cavallium.warppi.device.PIHardwareTouchDevice;
+import it.cavallium.warppi.gui.CalculatorHUD;
+import it.cavallium.warppi.gui.screens.LoadingScreen;
+import it.cavallium.warppi.math.rules.RulesManager;
-public class Main {
+public class WarpPI {
public static void main(String[] args) throws Exception {
- new PICalculator(parseStartupArguments(args));
+ Engine.start(new LoadingScreen(), new PIHardwareDisplay(), new PIHardwareTouchDevice(false, false, false), new CalculatorHUD(), parseStartupArguments(args));
+ Engine.INSTANCE.getLoadPhase().subscribe(WarpPI::loadCalculator);
+ }
+
+ private static void loadCalculator(LoadingStatus loading) {
+ try {
+ HardwareDevice.INSTANCE.getDisplayManager().setBrightness(0.2f);
+ RulesManager.initialize();
+ RulesManager.warmUp();
+ loading.done();
+ } catch (InterruptedException | Error e) {
+ e.printStackTrace();
+ }
+ loading.failed();
}
public static StartupArguments parseStartupArguments(final String[] a) {
diff --git a/src/main/java/org/warp/picalculator/device/CacheFile.java b/src/main/java/it/cavallium/warppi/device/CacheFile.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/device/CacheFile.java
rename to src/main/java/it/cavallium/warppi/device/CacheFile.java
index 1e261e69..af795dd5 100755
--- a/src/main/java/org/warp/picalculator/device/CacheFile.java
+++ b/src/main/java/it/cavallium/warppi/device/CacheFile.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -7,9 +7,9 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.UUID;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.deps.nio.DFiles;
-import org.warp.picalculator.deps.nio.DPaths;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.deps.nio.DFiles;
+import it.cavallium.warppi.deps.nio.DPaths;
public class CacheFile {
private String path;
diff --git a/src/main/java/org/warp/picalculator/device/HardwareDevice.java b/src/main/java/it/cavallium/warppi/device/HardwareDevice.java
similarity index 80%
rename from src/main/java/org/warp/picalculator/device/HardwareDevice.java
rename to src/main/java/it/cavallium/warppi/device/HardwareDevice.java
index 3c42f9d4..efbe1007 100644
--- a/src/main/java/org/warp/picalculator/device/HardwareDevice.java
+++ b/src/main/java/it/cavallium/warppi/device/HardwareDevice.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.gui.DisplayManager;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.gui.DisplayManager;
public class HardwareDevice {
public static HardwareDevice INSTANCE;
diff --git a/src/main/java/org/warp/picalculator/device/HardwareTouchDevice.java b/src/main/java/it/cavallium/warppi/device/HardwareTouchDevice.java
similarity index 72%
rename from src/main/java/org/warp/picalculator/device/HardwareTouchDevice.java
rename to src/main/java/it/cavallium/warppi/device/HardwareTouchDevice.java
index 5ed4bb78..ce37c52c 100644
--- a/src/main/java/org/warp/picalculator/device/HardwareTouchDevice.java
+++ b/src/main/java/it/cavallium/warppi/device/HardwareTouchDevice.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
-import org.warp.picalculator.event.TouchEventListener;
-import org.warp.picalculator.event.TouchPoint;
+import it.cavallium.warppi.event.TouchEventListener;
+import it.cavallium.warppi.event.TouchPoint;
public interface HardwareTouchDevice extends TouchEventListener {
public boolean getInvertedXY();
diff --git a/src/main/java/org/warp/picalculator/device/InputManager.java b/src/main/java/it/cavallium/warppi/device/InputManager.java
similarity index 85%
rename from src/main/java/org/warp/picalculator/device/InputManager.java
rename to src/main/java/it/cavallium/warppi/device/InputManager.java
index 6c6b35ad..41f9cc0e 100644
--- a/src/main/java/org/warp/picalculator/device/InputManager.java
+++ b/src/main/java/it/cavallium/warppi/device/InputManager.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
public class InputManager {
private final Keyboard keyboard;
diff --git a/src/main/java/org/warp/picalculator/device/Keyboard.java b/src/main/java/it/cavallium/warppi/device/Keyboard.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/device/Keyboard.java
rename to src/main/java/it/cavallium/warppi/device/Keyboard.java
index 92fd08ba..976b94bc 100755
--- a/src/main/java/org/warp/picalculator/device/Keyboard.java
+++ b/src/main/java/it/cavallium/warppi/device/Keyboard.java
@@ -1,22 +1,22 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
import java.awt.event.KeyEvent;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.deps.DGpio;
-import org.warp.picalculator.deps.jogamp.DJogamp;
-import org.warp.picalculator.device.chip.ParallelToSerial;
-import org.warp.picalculator.device.chip.SerialToParallel;
-import org.warp.picalculator.event.Key;
-import org.warp.picalculator.event.KeyPressedEvent;
-import org.warp.picalculator.event.KeyReleasedEvent;
-import org.warp.picalculator.event.KeyboardEventListener;
-import org.warp.picalculator.gui.GUIErrorMessage;
-import org.warp.picalculator.gui.screens.KeyboardDebugScreen;
-import org.warp.picalculator.gui.screens.MarioScreen;
-import org.warp.picalculator.gui.screens.Screen;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.deps.DGpio;
+import it.cavallium.warppi.deps.jogamp.DJogamp;
+import it.cavallium.warppi.device.chip.ParallelToSerial;
+import it.cavallium.warppi.device.chip.SerialToParallel;
+import it.cavallium.warppi.event.Key;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
+import it.cavallium.warppi.event.KeyboardEventListener;
+import it.cavallium.warppi.gui.GUIErrorMessage;
+import it.cavallium.warppi.gui.screens.KeyboardDebugScreen;
+import it.cavallium.warppi.gui.screens.MarioScreen;
+import it.cavallium.warppi.gui.screens.Screen;
public class Keyboard {
public static volatile boolean alpha = false;
diff --git a/src/main/java/org/warp/picalculator/device/PIHardwareDisplay.java b/src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java
similarity index 64%
rename from src/main/java/org/warp/picalculator/device/PIHardwareDisplay.java
rename to src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java
index a7a4ec8a..610210b0 100644
--- a/src/main/java/org/warp/picalculator/device/PIHardwareDisplay.java
+++ b/src/main/java/it/cavallium/warppi/device/PIHardwareDisplay.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.deps.DGpio;
-import org.warp.picalculator.gui.HardwareDisplay;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.deps.DGpio;
+import it.cavallium.warppi.gui.HardwareDisplay;
public class PIHardwareDisplay implements HardwareDisplay {
diff --git a/src/main/java/org/warp/picalculator/device/PIHardwareTouchDevice.java b/src/main/java/it/cavallium/warppi/device/PIHardwareTouchDevice.java
similarity index 85%
rename from src/main/java/org/warp/picalculator/device/PIHardwareTouchDevice.java
rename to src/main/java/it/cavallium/warppi/device/PIHardwareTouchDevice.java
index 1407009d..c742e23b 100644
--- a/src/main/java/org/warp/picalculator/device/PIHardwareTouchDevice.java
+++ b/src/main/java/it/cavallium/warppi/device/PIHardwareTouchDevice.java
@@ -1,11 +1,11 @@
-package org.warp.picalculator.device;
+package it.cavallium.warppi.device;
-import org.warp.picalculator.event.TouchCancelEvent;
-import org.warp.picalculator.event.TouchEndEvent;
-import org.warp.picalculator.event.TouchMoveEvent;
-import org.warp.picalculator.event.TouchPoint;
-import org.warp.picalculator.event.TouchStartEvent;
-import org.warp.picalculator.gui.screens.Screen;
+import it.cavallium.warppi.event.TouchCancelEvent;
+import it.cavallium.warppi.event.TouchEndEvent;
+import it.cavallium.warppi.event.TouchMoveEvent;
+import it.cavallium.warppi.event.TouchPoint;
+import it.cavallium.warppi.event.TouchStartEvent;
+import it.cavallium.warppi.gui.screens.Screen;
public class PIHardwareTouchDevice implements HardwareTouchDevice {
diff --git a/src/main/java/org/warp/picalculator/device/chip/ParallelToSerial.java b/src/main/java/it/cavallium/warppi/device/chip/ParallelToSerial.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/device/chip/ParallelToSerial.java
rename to src/main/java/it/cavallium/warppi/device/chip/ParallelToSerial.java
index f62cb8e3..2c739877 100755
--- a/src/main/java/org/warp/picalculator/device/chip/ParallelToSerial.java
+++ b/src/main/java/it/cavallium/warppi/device/chip/ParallelToSerial.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.device.chip;
+package it.cavallium.warppi.device.chip;
-import org.warp.picalculator.deps.DGpio;
+import it.cavallium.warppi.deps.DGpio;
public class ParallelToSerial {
diff --git a/src/main/java/org/warp/picalculator/device/chip/SerialToParallel.java b/src/main/java/it/cavallium/warppi/device/chip/SerialToParallel.java
similarity index 84%
rename from src/main/java/org/warp/picalculator/device/chip/SerialToParallel.java
rename to src/main/java/it/cavallium/warppi/device/chip/SerialToParallel.java
index 12a6fa8b..3e991131 100755
--- a/src/main/java/org/warp/picalculator/device/chip/SerialToParallel.java
+++ b/src/main/java/it/cavallium/warppi/device/chip/SerialToParallel.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.device.chip;
+package it.cavallium.warppi.device.chip;
-import org.warp.picalculator.deps.DGpio;
+import it.cavallium.warppi.deps.DGpio;
public class SerialToParallel {
private final int RCK; //Storage register clock pin (latch pin)
diff --git a/src/main/java/org/warp/picalculator/device/graphicengine/RAWFont.java b/src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/device/graphicengine/RAWFont.java
rename to src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java
index a3be6321..d581bc92 100755
--- a/src/main/java/org/warp/picalculator/device/graphicengine/RAWFont.java
+++ b/src/main/java/it/cavallium/warppi/device/graphicengine/RAWFont.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.device.graphicengine;
+package it.cavallium.warppi.device.graphicengine;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
@@ -11,9 +11,9 @@ import java.util.logging.Logger;
import javax.imageio.ImageIO;
-import org.warp.picalculator.ClassUtils;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.deps.DSystem;
+import it.cavallium.warppi.ClassUtils;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.deps.DSystem;
/**
*
diff --git a/src/main/java/it/cavallium/warppi/event/Event.java b/src/main/java/it/cavallium/warppi/event/Event.java
new file mode 100644
index 00000000..ffcbbc34
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/event/Event.java
@@ -0,0 +1,5 @@
+package it.cavallium.warppi.event;
+
+public interface Event {
+
+}
diff --git a/src/main/java/org/warp/picalculator/event/Key.java b/src/main/java/it/cavallium/warppi/event/Key.java
similarity index 95%
rename from src/main/java/org/warp/picalculator/event/Key.java
rename to src/main/java/it/cavallium/warppi/event/Key.java
index a8797591..34fb1f56 100644
--- a/src/main/java/org/warp/picalculator/event/Key.java
+++ b/src/main/java/it/cavallium/warppi/event/Key.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public enum Key {
POWEROFF, debug_DEG, debug_RAD, debug_GRA, SHIFT, ALPHA, NONE, HISTORY_BACK, HISTORY_FORWARD, SURD_MODE, DRG_CYCLE, STEP, SIMPLIFY, BRIGHTNESS_CYCLE, BRIGHTNESS_CYCLE_REVERSE, DOT, NUM0, NUM1, NUM2, NUM3, NUM4, NUM5, NUM6, NUM7, NUM8, NUM9, PARENTHESIS_OPEN, PARENTHESIS_CLOSE, PLUS, MINUS, PLUS_MINUS, MULTIPLY, DIVIDE, EQUAL, DELETE, RESET, LEFT, RIGHT, UP, DOWN, OK, debug1, debug2, debug3, debug4, debug5, SQRT, ROOT, POWER_OF_2, POWER_OF_x, SINE, COSINE, TANGENT, ARCSINE, ARCCOSINE, ARCTANGENT, PI, SETTINGS, F1, F2, F3, F4, BACK, ZOOM_MODE, LOGARITHM, EULER_NUMBER, LETTER_A, LETTER_B, LETTER_C, LETTER_D, LETTER_E, LETTER_F, LETTER_G, LETTER_H, LETTER_I, LETTER_J, LETTER_K, LETTER_L, LETTER_M, LETTER_N, LETTER_O, LETTER_P, LETTER_Q, LETTER_R, LETTER_S, LETTER_T, LETTER_U, LETTER_V, LETTER_W, LETTER_X, LETTER_Y, LETTER_Z,
diff --git a/src/main/java/org/warp/picalculator/event/KeyEvent.java b/src/main/java/it/cavallium/warppi/event/KeyEvent.java
similarity index 61%
rename from src/main/java/org/warp/picalculator/event/KeyEvent.java
rename to src/main/java/it/cavallium/warppi/event/KeyEvent.java
index ce41667e..f5dd53fb 100644
--- a/src/main/java/org/warp/picalculator/event/KeyEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/KeyEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public interface KeyEvent extends Event {
public Key getKey();
diff --git a/src/main/java/org/warp/picalculator/event/KeyPressedEvent.java b/src/main/java/it/cavallium/warppi/event/KeyPressedEvent.java
similarity index 76%
rename from src/main/java/org/warp/picalculator/event/KeyPressedEvent.java
rename to src/main/java/it/cavallium/warppi/event/KeyPressedEvent.java
index 113ed8c0..8c43ab81 100644
--- a/src/main/java/org/warp/picalculator/event/KeyPressedEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/KeyPressedEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public class KeyPressedEvent implements KeyEvent {
diff --git a/src/main/java/org/warp/picalculator/event/KeyReleasedEvent.java b/src/main/java/it/cavallium/warppi/event/KeyReleasedEvent.java
similarity index 76%
rename from src/main/java/org/warp/picalculator/event/KeyReleasedEvent.java
rename to src/main/java/it/cavallium/warppi/event/KeyReleasedEvent.java
index 5c22ecfd..b1e0daf1 100644
--- a/src/main/java/org/warp/picalculator/event/KeyReleasedEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/KeyReleasedEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public class KeyReleasedEvent implements KeyEvent {
diff --git a/src/main/java/org/warp/picalculator/event/KeyboardEventListener.java b/src/main/java/it/cavallium/warppi/event/KeyboardEventListener.java
similarity index 80%
rename from src/main/java/org/warp/picalculator/event/KeyboardEventListener.java
rename to src/main/java/it/cavallium/warppi/event/KeyboardEventListener.java
index d2655cdd..6101459b 100644
--- a/src/main/java/org/warp/picalculator/event/KeyboardEventListener.java
+++ b/src/main/java/it/cavallium/warppi/event/KeyboardEventListener.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public interface KeyboardEventListener {
public default boolean onKeyPressed(KeyPressedEvent k) {
diff --git a/src/main/java/org/warp/picalculator/event/TouchCancelEvent.java b/src/main/java/it/cavallium/warppi/event/TouchCancelEvent.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/event/TouchCancelEvent.java
rename to src/main/java/it/cavallium/warppi/event/TouchCancelEvent.java
index 1e8574a3..3618ac3e 100644
--- a/src/main/java/org/warp/picalculator/event/TouchCancelEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchCancelEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
import java.util.List;
diff --git a/src/main/java/org/warp/picalculator/event/TouchEndEvent.java b/src/main/java/it/cavallium/warppi/event/TouchEndEvent.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/event/TouchEndEvent.java
rename to src/main/java/it/cavallium/warppi/event/TouchEndEvent.java
index c42a4795..27f98186 100644
--- a/src/main/java/org/warp/picalculator/event/TouchEndEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchEndEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
import java.util.List;
diff --git a/src/main/java/org/warp/picalculator/event/TouchEvent.java b/src/main/java/it/cavallium/warppi/event/TouchEvent.java
similarity index 77%
rename from src/main/java/org/warp/picalculator/event/TouchEvent.java
rename to src/main/java/it/cavallium/warppi/event/TouchEvent.java
index e363784d..66aa6265 100644
--- a/src/main/java/org/warp/picalculator/event/TouchEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
import java.util.List;
diff --git a/src/main/java/org/warp/picalculator/event/TouchEventListener.java b/src/main/java/it/cavallium/warppi/event/TouchEventListener.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/event/TouchEventListener.java
rename to src/main/java/it/cavallium/warppi/event/TouchEventListener.java
index 66ee1979..596fa62a 100644
--- a/src/main/java/org/warp/picalculator/event/TouchEventListener.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchEventListener.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public interface TouchEventListener {
public default boolean onTouchStart(TouchStartEvent k) {
diff --git a/src/main/java/org/warp/picalculator/event/TouchMoveEvent.java b/src/main/java/it/cavallium/warppi/event/TouchMoveEvent.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/event/TouchMoveEvent.java
rename to src/main/java/it/cavallium/warppi/event/TouchMoveEvent.java
index 82032b08..424226b3 100644
--- a/src/main/java/org/warp/picalculator/event/TouchMoveEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchMoveEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
import java.util.List;
diff --git a/src/main/java/org/warp/picalculator/event/TouchPoint.java b/src/main/java/it/cavallium/warppi/event/TouchPoint.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/event/TouchPoint.java
rename to src/main/java/it/cavallium/warppi/event/TouchPoint.java
index 6b46292e..dc46e1cf 100644
--- a/src/main/java/org/warp/picalculator/event/TouchPoint.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchPoint.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
public class TouchPoint {
private final float radiusX;
diff --git a/src/main/java/org/warp/picalculator/event/TouchStartEvent.java b/src/main/java/it/cavallium/warppi/event/TouchStartEvent.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/event/TouchStartEvent.java
rename to src/main/java/it/cavallium/warppi/event/TouchStartEvent.java
index 41d32346..97c032fc 100644
--- a/src/main/java/org/warp/picalculator/event/TouchStartEvent.java
+++ b/src/main/java/it/cavallium/warppi/event/TouchStartEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.event;
+package it.cavallium.warppi.event;
import java.util.List;
diff --git a/src/main/java/org/warp/picalculator/extra/mario/MarioBlock.java b/src/main/java/it/cavallium/warppi/extra/mario/MarioBlock.java
similarity index 84%
rename from src/main/java/org/warp/picalculator/extra/mario/MarioBlock.java
rename to src/main/java/it/cavallium/warppi/extra/mario/MarioBlock.java
index 48deff06..6f9f7147 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/MarioBlock.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/MarioBlock.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class MarioBlock {
private final int x;
diff --git a/src/main/java/org/warp/picalculator/extra/mario/MarioEnemy.java b/src/main/java/it/cavallium/warppi/extra/mario/MarioEnemy.java
similarity index 81%
rename from src/main/java/org/warp/picalculator/extra/mario/MarioEnemy.java
rename to src/main/java/it/cavallium/warppi/extra/mario/MarioEnemy.java
index a1dc5d74..50199268 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/MarioEnemy.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/MarioEnemy.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class MarioEnemy extends MarioEntity {
diff --git a/src/main/java/org/warp/picalculator/extra/mario/MarioEntity.java b/src/main/java/it/cavallium/warppi/extra/mario/MarioEntity.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/extra/mario/MarioEntity.java
rename to src/main/java/it/cavallium/warppi/extra/mario/MarioEntity.java
index 283a00f2..1facaf96 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/MarioEntity.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/MarioEntity.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class MarioEntity {
protected double x;
diff --git a/src/main/java/it/cavallium/warppi/extra/mario/MarioEvent.java b/src/main/java/it/cavallium/warppi/extra/mario/MarioEvent.java
new file mode 100644
index 00000000..13adfbba
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/extra/mario/MarioEvent.java
@@ -0,0 +1,5 @@
+package it.cavallium.warppi.extra.mario;
+
+public class MarioEvent {
+
+}
diff --git a/src/main/java/org/warp/picalculator/extra/mario/MarioGame.java b/src/main/java/it/cavallium/warppi/extra/mario/MarioGame.java
similarity index 98%
rename from src/main/java/org/warp/picalculator/extra/mario/MarioGame.java
rename to src/main/java/it/cavallium/warppi/extra/mario/MarioGame.java
index 8fd97948..f799669f 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/MarioGame.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/MarioGame.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class MarioGame {
diff --git a/src/main/java/org/warp/picalculator/extra/mario/MarioWorld.java b/src/main/java/it/cavallium/warppi/extra/mario/MarioWorld.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/extra/mario/MarioWorld.java
rename to src/main/java/it/cavallium/warppi/extra/mario/MarioWorld.java
index d59f138e..e6cae610 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/MarioWorld.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/MarioWorld.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class MarioWorld {
diff --git a/src/main/java/org/warp/picalculator/extra/mario/PlayerEntity.java b/src/main/java/it/cavallium/warppi/extra/mario/PlayerEntity.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/extra/mario/PlayerEntity.java
rename to src/main/java/it/cavallium/warppi/extra/mario/PlayerEntity.java
index f914e39c..1056952c 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/PlayerEntity.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/PlayerEntity.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class PlayerEntity extends MarioEntity {
diff --git a/src/main/java/org/warp/picalculator/extra/mario/PositionEvent.java b/src/main/java/it/cavallium/warppi/extra/mario/PositionEvent.java
similarity index 52%
rename from src/main/java/org/warp/picalculator/extra/mario/PositionEvent.java
rename to src/main/java/it/cavallium/warppi/extra/mario/PositionEvent.java
index 9694cd42..ea521d2f 100644
--- a/src/main/java/org/warp/picalculator/extra/mario/PositionEvent.java
+++ b/src/main/java/it/cavallium/warppi/extra/mario/PositionEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.extra.mario;
+package it.cavallium.warppi.extra.mario;
public class PositionEvent extends MarioEvent {
diff --git a/src/main/java/org/warp/picalculator/flow/Action0.java b/src/main/java/it/cavallium/warppi/flow/Action0.java
similarity index 51%
rename from src/main/java/org/warp/picalculator/flow/Action0.java
rename to src/main/java/it/cavallium/warppi/flow/Action0.java
index ce01c6fa..1edbe759 100644
--- a/src/main/java/org/warp/picalculator/flow/Action0.java
+++ b/src/main/java/it/cavallium/warppi/flow/Action0.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Action0 {
void call();
diff --git a/src/main/java/org/warp/picalculator/flow/Action1.java b/src/main/java/it/cavallium/warppi/flow/Action1.java
similarity index 54%
rename from src/main/java/org/warp/picalculator/flow/Action1.java
rename to src/main/java/it/cavallium/warppi/flow/Action1.java
index 947f046c..1655c575 100644
--- a/src/main/java/org/warp/picalculator/flow/Action1.java
+++ b/src/main/java/it/cavallium/warppi/flow/Action1.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Action1 {
void call(T t);
diff --git a/src/main/java/org/warp/picalculator/flow/Action2.java b/src/main/java/it/cavallium/warppi/flow/Action2.java
similarity index 58%
rename from src/main/java/org/warp/picalculator/flow/Action2.java
rename to src/main/java/it/cavallium/warppi/flow/Action2.java
index 446e103a..acc3cfc4 100644
--- a/src/main/java/org/warp/picalculator/flow/Action2.java
+++ b/src/main/java/it/cavallium/warppi/flow/Action2.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Action2 {
void call(T t, U u);
diff --git a/src/main/java/org/warp/picalculator/flow/BehaviorSubject.java b/src/main/java/it/cavallium/warppi/flow/BehaviorSubject.java
similarity index 92%
rename from src/main/java/org/warp/picalculator/flow/BehaviorSubject.java
rename to src/main/java/it/cavallium/warppi/flow/BehaviorSubject.java
index ac4d79dd..029cf057 100644
--- a/src/main/java/org/warp/picalculator/flow/BehaviorSubject.java
+++ b/src/main/java/it/cavallium/warppi/flow/BehaviorSubject.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public class BehaviorSubject extends Subject {
diff --git a/src/main/java/org/warp/picalculator/flow/Consumer.java b/src/main/java/it/cavallium/warppi/flow/Consumer.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/flow/Consumer.java
rename to src/main/java/it/cavallium/warppi/flow/Consumer.java
index fbcac6b3..addbb885 100644
--- a/src/main/java/org/warp/picalculator/flow/Consumer.java
+++ b/src/main/java/it/cavallium/warppi/flow/Consumer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import java.util.Objects;
diff --git a/src/main/java/org/warp/picalculator/flow/Disposable.java b/src/main/java/it/cavallium/warppi/flow/Disposable.java
similarity index 67%
rename from src/main/java/org/warp/picalculator/flow/Disposable.java
rename to src/main/java/it/cavallium/warppi/flow/Disposable.java
index 80eb9454..6e3fd6c2 100644
--- a/src/main/java/org/warp/picalculator/flow/Disposable.java
+++ b/src/main/java/it/cavallium/warppi/flow/Disposable.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Disposable {
public void dispose();
diff --git a/src/main/java/org/warp/picalculator/flow/IntervalsManager.java b/src/main/java/it/cavallium/warppi/flow/IntervalsManager.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/flow/IntervalsManager.java
rename to src/main/java/it/cavallium/warppi/flow/IntervalsManager.java
index 7a8d30ac..6138dcb1 100644
--- a/src/main/java/org/warp/picalculator/flow/IntervalsManager.java
+++ b/src/main/java/it/cavallium/warppi/flow/IntervalsManager.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import java.util.LinkedList;
import java.util.List;
-import org.warp.picalculator.PlatformUtils;
+import it.cavallium.warppi.PlatformUtils;
public class IntervalsManager {
private static List intervals = new LinkedList<>();
diff --git a/src/main/java/org/warp/picalculator/flow/Observable.java b/src/main/java/it/cavallium/warppi/flow/Observable.java
similarity index 95%
rename from src/main/java/org/warp/picalculator/flow/Observable.java
rename to src/main/java/it/cavallium/warppi/flow/Observable.java
index a60bc644..0146dd18 100644
--- a/src/main/java/org/warp/picalculator/flow/Observable.java
+++ b/src/main/java/it/cavallium/warppi/flow/Observable.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import java.util.LinkedList;
import java.util.List;
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableCombinedChanged.java b/src/main/java/it/cavallium/warppi/flow/ObservableCombinedChanged.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/flow/ObservableCombinedChanged.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableCombinedChanged.java
index 4c26184b..6718388a 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableCombinedChanged.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableCombinedChanged.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableCombinedLatest.java b/src/main/java/it/cavallium/warppi/flow/ObservableCombinedLatest.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/flow/ObservableCombinedLatest.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableCombinedLatest.java
index 2929f281..cc15770c 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableCombinedLatest.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableCombinedLatest.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableInterval.java b/src/main/java/it/cavallium/warppi/flow/ObservableInterval.java
similarity index 90%
rename from src/main/java/org/warp/picalculator/flow/ObservableInterval.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableInterval.java
index 70bdb3c7..fe328c7c 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableInterval.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableInterval.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
-import org.warp.picalculator.PlatformUtils;
+import it.cavallium.warppi.PlatformUtils;
public class ObservableInterval extends Observable {
private final long interval;
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableMap.java b/src/main/java/it/cavallium/warppi/flow/ObservableMap.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/flow/ObservableMap.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableMap.java
index 7e63a3c8..70875e74 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableMap.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableMap.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import java.util.function.Function;
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableMerged.java b/src/main/java/it/cavallium/warppi/flow/ObservableMerged.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/flow/ObservableMerged.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableMerged.java
index 1aa63736..6dc60c72 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableMerged.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableMerged.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public class ObservableMerged extends Observable {
private Observable originalObservableA;
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableSource.java b/src/main/java/it/cavallium/warppi/flow/ObservableSource.java
similarity index 70%
rename from src/main/java/org/warp/picalculator/flow/ObservableSource.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableSource.java
index 48ad441a..8e3a604e 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableSource.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableSource.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface ObservableSource {
public void subscribe(Observer super T> observer);
diff --git a/src/main/java/org/warp/picalculator/flow/ObservableZipped.java b/src/main/java/it/cavallium/warppi/flow/ObservableZipped.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/flow/ObservableZipped.java
rename to src/main/java/it/cavallium/warppi/flow/ObservableZipped.java
index 201840cf..0ff45821 100644
--- a/src/main/java/org/warp/picalculator/flow/ObservableZipped.java
+++ b/src/main/java/it/cavallium/warppi/flow/ObservableZipped.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/src/main/java/org/warp/picalculator/flow/Observer.java b/src/main/java/it/cavallium/warppi/flow/Observer.java
similarity index 77%
rename from src/main/java/org/warp/picalculator/flow/Observer.java
rename to src/main/java/it/cavallium/warppi/flow/Observer.java
index 69719d1b..7b15429a 100644
--- a/src/main/java/org/warp/picalculator/flow/Observer.java
+++ b/src/main/java/it/cavallium/warppi/flow/Observer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Observer {
public void onComplete();
diff --git a/src/main/java/org/warp/picalculator/flow/SimpleSubject.java b/src/main/java/it/cavallium/warppi/flow/SimpleSubject.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/flow/SimpleSubject.java
rename to src/main/java/it/cavallium/warppi/flow/SimpleSubject.java
index 6cd60292..171130aa 100644
--- a/src/main/java/org/warp/picalculator/flow/SimpleSubject.java
+++ b/src/main/java/it/cavallium/warppi/flow/SimpleSubject.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public class SimpleSubject extends Subject {
diff --git a/src/main/java/org/warp/picalculator/flow/Subject.java b/src/main/java/it/cavallium/warppi/flow/Subject.java
similarity index 92%
rename from src/main/java/org/warp/picalculator/flow/Subject.java
rename to src/main/java/it/cavallium/warppi/flow/Subject.java
index 07425772..112eab0d 100644
--- a/src/main/java/org/warp/picalculator/flow/Subject.java
+++ b/src/main/java/it/cavallium/warppi/flow/Subject.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public abstract class Subject extends Observable implements Observer {
abstract Throwable getThrowable();
diff --git a/src/main/java/org/warp/picalculator/flow/Subscriber.java b/src/main/java/it/cavallium/warppi/flow/Subscriber.java
similarity index 77%
rename from src/main/java/org/warp/picalculator/flow/Subscriber.java
rename to src/main/java/it/cavallium/warppi/flow/Subscriber.java
index 0c28d749..4d743007 100644
--- a/src/main/java/org/warp/picalculator/flow/Subscriber.java
+++ b/src/main/java/it/cavallium/warppi/flow/Subscriber.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Subscriber {
default void onComplete() {}
diff --git a/src/main/java/org/warp/picalculator/flow/Subscription.java b/src/main/java/it/cavallium/warppi/flow/Subscription.java
similarity index 63%
rename from src/main/java/org/warp/picalculator/flow/Subscription.java
rename to src/main/java/it/cavallium/warppi/flow/Subscription.java
index 1d989767..ed251ee7 100644
--- a/src/main/java/org/warp/picalculator/flow/Subscription.java
+++ b/src/main/java/it/cavallium/warppi/flow/Subscription.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
public interface Subscription {
void cancel();
diff --git a/src/main/java/org/warp/picalculator/flow/TestFlow.java b/src/main/java/it/cavallium/warppi/flow/TestFlow.java
similarity index 95%
rename from src/main/java/org/warp/picalculator/flow/TestFlow.java
rename to src/main/java/it/cavallium/warppi/flow/TestFlow.java
index 1a13bd08..66b51c91 100644
--- a/src/main/java/org/warp/picalculator/flow/TestFlow.java
+++ b/src/main/java/it/cavallium/warppi/flow/TestFlow.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.flow;
+package it.cavallium.warppi.flow;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/src/main/java/org/warp/picalculator/gui/CalculatorHUD.java b/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/gui/CalculatorHUD.java
rename to src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
index e2e13820..574797e0 100644
--- a/src/main/java/org/warp/picalculator/gui/CalculatorHUD.java
+++ b/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java
@@ -1,13 +1,13 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class CalculatorHUD extends HUD {
diff --git a/src/main/java/org/warp/picalculator/gui/DisplayManager.java b/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
similarity index 90%
rename from src/main/java/org/warp/picalculator/gui/DisplayManager.java
rename to src/main/java/it/cavallium/warppi/gui/DisplayManager.java
index cc1f4833..8af5f62b 100755
--- a/src/main/java/org/warp/picalculator/gui/DisplayManager.java
+++ b/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
@@ -1,26 +1,26 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.deps.DEngine;
-import org.warp.picalculator.deps.DSemaphore;
-import org.warp.picalculator.deps.DSystem;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
-import org.warp.picalculator.gui.graphicengine.nogui.NoGuiEngine;
-import org.warp.picalculator.gui.screens.Screen;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.deps.DEngine;
+import it.cavallium.warppi.deps.DSemaphore;
+import it.cavallium.warppi.deps.DSystem;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.nogui.NoGuiEngine;
+import it.cavallium.warppi.gui.screens.Screen;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public final class DisplayManager implements RenderingLoop {
diff --git a/src/main/java/org/warp/picalculator/gui/GUIErrorMessage.java b/src/main/java/it/cavallium/warppi/gui/GUIErrorMessage.java
similarity index 77%
rename from src/main/java/org/warp/picalculator/gui/GUIErrorMessage.java
rename to src/main/java/it/cavallium/warppi/gui/GUIErrorMessage.java
index 7be62cb9..5c345c11 100755
--- a/src/main/java/org/warp/picalculator/gui/GUIErrorMessage.java
+++ b/src/main/java/it/cavallium/warppi/gui/GUIErrorMessage.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class GUIErrorMessage {
diff --git a/src/main/java/org/warp/picalculator/gui/GraphicUtils.java b/src/main/java/it/cavallium/warppi/gui/GraphicUtils.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/gui/GraphicUtils.java
rename to src/main/java/it/cavallium/warppi/gui/GraphicUtils.java
index 066bd0fb..1757d4c0 100755
--- a/src/main/java/org/warp/picalculator/gui/GraphicUtils.java
+++ b/src/main/java/it/cavallium/warppi/gui/GraphicUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
public class GraphicUtils {
public static final float sin(float rad) {
diff --git a/src/main/java/org/warp/picalculator/gui/GraphicalElement.java b/src/main/java/it/cavallium/warppi/gui/GraphicalElement.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/gui/GraphicalElement.java
rename to src/main/java/it/cavallium/warppi/gui/GraphicalElement.java
index 22481d97..4542318a 100755
--- a/src/main/java/org/warp/picalculator/gui/GraphicalElement.java
+++ b/src/main/java/it/cavallium/warppi/gui/GraphicalElement.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
public interface GraphicalElement {
diff --git a/src/main/java/org/warp/picalculator/gui/GraphicalInterface.java b/src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java
similarity index 84%
rename from src/main/java/org/warp/picalculator/gui/GraphicalInterface.java
rename to src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java
index 8f70a849..b3a9e797 100644
--- a/src/main/java/org/warp/picalculator/gui/GraphicalInterface.java
+++ b/src/main/java/it/cavallium/warppi/gui/GraphicalInterface.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
public interface GraphicalInterface {
public void create() throws InterruptedException;
diff --git a/src/main/java/org/warp/picalculator/gui/HUD.java b/src/main/java/it/cavallium/warppi/gui/HUD.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/gui/HUD.java
rename to src/main/java/it/cavallium/warppi/gui/HUD.java
index d0e7143f..9b863493 100644
--- a/src/main/java/org/warp/picalculator/gui/HUD.java
+++ b/src/main/java/it/cavallium/warppi/gui/HUD.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
public abstract class HUD implements GraphicalInterface {
public DisplayManager d;
diff --git a/src/main/java/org/warp/picalculator/gui/HardwareDisplay.java b/src/main/java/it/cavallium/warppi/gui/HardwareDisplay.java
similarity index 75%
rename from src/main/java/org/warp/picalculator/gui/HardwareDisplay.java
rename to src/main/java/it/cavallium/warppi/gui/HardwareDisplay.java
index fb5aa501..e873b828 100644
--- a/src/main/java/org/warp/picalculator/gui/HardwareDisplay.java
+++ b/src/main/java/it/cavallium/warppi/gui/HardwareDisplay.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui;
+package it.cavallium.warppi.gui;
public interface HardwareDisplay {
public void initialize();
diff --git a/src/main/java/org/warp/picalculator/gui/expression/Caret.java b/src/main/java/it/cavallium/warppi/gui/expression/Caret.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/gui/expression/Caret.java
rename to src/main/java/it/cavallium/warppi/gui/expression/Caret.java
index b39b5008..08d0929d 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/Caret.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/Caret.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.expression;
+package it.cavallium.warppi.gui.expression;
public class Caret {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/CaretState.java b/src/main/java/it/cavallium/warppi/gui/expression/CaretState.java
similarity index 54%
rename from src/main/java/org/warp/picalculator/gui/expression/CaretState.java
rename to src/main/java/it/cavallium/warppi/gui/expression/CaretState.java
index 94b77e97..c7949f42 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/CaretState.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/CaretState.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.expression;
+package it.cavallium.warppi.gui.expression;
public enum CaretState {
VISIBLE_ON, VISIBLE_OFF, HIDDEN
diff --git a/src/main/java/org/warp/picalculator/gui/expression/ExtraMenu.java b/src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java
similarity index 71%
rename from src/main/java/org/warp/picalculator/gui/expression/ExtraMenu.java
rename to src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java
index f863c0be..253790c0 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/ExtraMenu.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/ExtraMenu.java
@@ -1,11 +1,11 @@
-package org.warp.picalculator.gui.expression;
+package it.cavallium.warppi.gui.expression;
import java.io.Serializable;
-import org.warp.picalculator.event.KeyboardEventListener;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.event.KeyboardEventListener;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public abstract class ExtraMenu implements Serializable, KeyboardEventListener {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/InputContext.java b/src/main/java/it/cavallium/warppi/gui/expression/InputContext.java
similarity index 65%
rename from src/main/java/org/warp/picalculator/gui/expression/InputContext.java
rename to src/main/java/it/cavallium/warppi/gui/expression/InputContext.java
index a97d127e..6205901e 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/InputContext.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/InputContext.java
@@ -1,10 +1,10 @@
-package org.warp.picalculator.gui.expression;
+package it.cavallium.warppi.gui.expression;
import java.util.HashMap;
-import org.warp.picalculator.gui.expression.blocks.BlockVariable;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.math.functions.Variable.V_TYPE;
+import it.cavallium.warppi.gui.expression.blocks.BlockVariable;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.functions.Variable.V_TYPE;
public class InputContext {
public final HashMap variableTypes;
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/Block.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/Block.java
similarity index 66%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/Block.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/Block.java
index 2763f354..b5c7fec8 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/Block.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/Block.java
@@ -1,13 +1,13 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.GraphicalElement;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.expression.ExtraMenu;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.GraphicalElement;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.expression.ExtraMenu;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public abstract class Block implements GraphicalElement {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockChar.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockChar.java
similarity index 69%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockChar.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockChar.java
index a76fac21..6edb6213 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockChar.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockChar.java
@@ -1,11 +1,11 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeatureChar;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeatureChar;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public class BlockChar extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockContainer.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockContainer.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockContainer.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockContainer.java
index 3a37572f..96112828 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockContainer.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockContainer.java
@@ -1,19 +1,18 @@
-package org.warp.picalculator.gui.expression.blocks;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.gui.GraphicalElement;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.expression.CaretState;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.MathParser;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+package it.cavallium.warppi.gui.expression.blocks;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.gui.GraphicalElement;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.expression.CaretState;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.MathParser;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class BlockContainer implements GraphicalElement {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockDivision.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockDivision.java
similarity index 82%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockDivision.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockDivision.java
index 0a4f584f..54da1728 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockDivision.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockDivision.java
@@ -1,13 +1,13 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeatureDivision;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeatureDivision;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public class BlockDivision extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockExponentialNotation.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockExponentialNotation.java
similarity index 70%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockExponentialNotation.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockExponentialNotation.java
index 4e117859..5dbfb6f8 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockExponentialNotation.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockExponentialNotation.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class BlockExponentialNotation extends BlockPower {
private int bw;
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockLogarithm.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockLogarithm.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockLogarithm.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockLogarithm.java
index b5018d5f..45b56e15 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockLogarithm.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockLogarithm.java
@@ -1,14 +1,13 @@
-package org.warp.picalculator.gui.expression.blocks;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeatureLogarithm;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+package it.cavallium.warppi.gui.expression.blocks;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeatureLogarithm;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class BlockLogarithm extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockNumericChar.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockNumericChar.java
similarity index 63%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockNumericChar.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockNumericChar.java
index ea4e5982..ccb34d45 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockNumericChar.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockNumericChar.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
public class BlockNumericChar extends BlockChar {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesis.java
similarity index 55%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesis.java
index ec91ed90..d7944c43 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesis.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.gui.expression.blocks;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeatureParenthesis;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+package it.cavallium.warppi.gui.expression.blocks;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeatureParenthesis;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class BlockParenthesis extends BlockParenthesisAbstract {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesisAbstract.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesisAbstract.java
similarity index 85%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesisAbstract.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesisAbstract.java
index 98f843bc..14c6fb37 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesisAbstract.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockParenthesisAbstract.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.gui.expression.blocks;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+package it.cavallium.warppi.gui.expression.blocks;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public abstract class BlockParenthesisAbstract extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockPower.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockPower.java
similarity index 75%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockPower.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockPower.java
index 4f0e0592..40aee0b9 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockPower.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockPower.java
@@ -1,13 +1,13 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeaturePowerChar;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeaturePowerChar;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public class BlockPower extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockReference.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockReference.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockReference.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockReference.java
index 25d3a219..3615f98b 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockReference.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockReference.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
public class BlockReference {
private final T block;
diff --git a/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSine.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSine.java
new file mode 100644
index 00000000..0c958672
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSine.java
@@ -0,0 +1,19 @@
+package it.cavallium.warppi.gui.expression.blocks;
+
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeatureSine;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
+
+public class BlockSine extends BlockParenthesisAbstract {
+ public BlockSine() {
+ super("SIN");
+ }
+
+ @Override
+ public Feature toFeature(MathContext context) throws Error {
+ final Function cont = getNumberContainer().toFunction(context);
+ return new FeatureSine(cont);
+ }
+}
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSquareRoot.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSquareRoot.java
similarity index 80%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSquareRoot.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSquareRoot.java
index 9f92094a..d52098d6 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSquareRoot.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSquareRoot.java
@@ -1,13 +1,13 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeatureSquareRoot;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.FeatureSquareRoot;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public class BlockSquareRoot extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockUndefined.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockUndefined.java
similarity index 67%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockUndefined.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockUndefined.java
index d10ec69a..f4294db7 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockUndefined.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockUndefined.java
@@ -1,12 +1,12 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.math.parser.features.FeatureChar;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.parser.features.FeatureChar;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public class BlockUndefined extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockVariable.java b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockVariable.java
similarity index 83%
rename from src/main/java/org/warp/picalculator/gui/expression/blocks/BlockVariable.java
rename to src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockVariable.java
index 3c972991..627d9df7 100644
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockVariable.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockVariable.java
@@ -1,19 +1,19 @@
-package org.warp.picalculator.gui.expression.blocks;
+package it.cavallium.warppi.gui.expression.blocks;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.event.KeyPressedEvent;
-import org.warp.picalculator.event.KeyReleasedEvent;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.expression.ExtraMenu;
-import org.warp.picalculator.gui.expression.InputContext;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Variable.V_TYPE;
-import org.warp.picalculator.math.parser.features.FeatureVariable;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.expression.ExtraMenu;
+import it.cavallium.warppi.gui.expression.InputContext;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Variable.V_TYPE;
+import it.cavallium.warppi.math.parser.features.FeatureVariable;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
public class BlockVariable extends Block {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/InlineInputContainer.java b/src/main/java/it/cavallium/warppi/gui/expression/containers/InlineInputContainer.java
similarity index 69%
rename from src/main/java/org/warp/picalculator/gui/expression/containers/InlineInputContainer.java
rename to src/main/java/it/cavallium/warppi/gui/expression/containers/InlineInputContainer.java
index c1c27c1a..f42091b3 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/InlineInputContainer.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/containers/InlineInputContainer.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.gui.expression.containers;
+package it.cavallium.warppi.gui.expression.containers;
-import org.warp.picalculator.gui.expression.InputContext;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.gui.expression.InputContext;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
public class InlineInputContainer extends InputContainer {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/InputContainer.java b/src/main/java/it/cavallium/warppi/gui/expression/containers/InputContainer.java
similarity index 81%
rename from src/main/java/org/warp/picalculator/gui/expression/containers/InputContainer.java
rename to src/main/java/it/cavallium/warppi/gui/expression/containers/InputContainer.java
index 29bd4a3e..c68d0b65 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/InputContainer.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/containers/InputContainer.java
@@ -1,23 +1,22 @@
-package org.warp.picalculator.gui.expression.containers;
+package it.cavallium.warppi.gui.expression.containers;
import java.io.Serializable;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.event.KeyboardEventListener;
-import org.warp.picalculator.gui.GraphicalElement;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.expression.CaretState;
-import org.warp.picalculator.gui.expression.ExtraMenu;
-import org.warp.picalculator.gui.expression.InputContext;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockReference;
-import org.warp.picalculator.gui.expression.layouts.InputLayout;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.event.KeyboardEventListener;
+import it.cavallium.warppi.gui.GraphicalElement;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.expression.CaretState;
+import it.cavallium.warppi.gui.expression.ExtraMenu;
+import it.cavallium.warppi.gui.expression.InputContext;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockReference;
+import it.cavallium.warppi.gui.expression.layouts.InputLayout;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public abstract class InputContainer implements GraphicalElement, InputLayout, Serializable {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/NormalInputContainer.java b/src/main/java/it/cavallium/warppi/gui/expression/containers/NormalInputContainer.java
similarity index 71%
rename from src/main/java/org/warp/picalculator/gui/expression/containers/NormalInputContainer.java
rename to src/main/java/it/cavallium/warppi/gui/expression/containers/NormalInputContainer.java
index f289f2bf..6fad54ad 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/NormalInputContainer.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/containers/NormalInputContainer.java
@@ -1,19 +1,19 @@
-package org.warp.picalculator.gui.expression.containers;
+package it.cavallium.warppi.gui.expression.containers;
-import org.warp.picalculator.gui.expression.InputContext;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockDivision;
-import org.warp.picalculator.gui.expression.blocks.BlockLogarithm;
-import org.warp.picalculator.gui.expression.blocks.BlockNumericChar;
-import org.warp.picalculator.gui.expression.blocks.BlockParenthesis;
-import org.warp.picalculator.gui.expression.blocks.BlockPower;
-import org.warp.picalculator.gui.expression.blocks.BlockReference;
-import org.warp.picalculator.gui.expression.blocks.BlockSine;
-import org.warp.picalculator.gui.expression.blocks.BlockSquareRoot;
-import org.warp.picalculator.gui.expression.blocks.BlockVariable;
-import org.warp.picalculator.math.MathematicalSymbols;
+import it.cavallium.warppi.gui.expression.InputContext;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockDivision;
+import it.cavallium.warppi.gui.expression.blocks.BlockLogarithm;
+import it.cavallium.warppi.gui.expression.blocks.BlockNumericChar;
+import it.cavallium.warppi.gui.expression.blocks.BlockParenthesis;
+import it.cavallium.warppi.gui.expression.blocks.BlockPower;
+import it.cavallium.warppi.gui.expression.blocks.BlockReference;
+import it.cavallium.warppi.gui.expression.blocks.BlockSine;
+import it.cavallium.warppi.gui.expression.blocks.BlockSquareRoot;
+import it.cavallium.warppi.gui.expression.blocks.BlockVariable;
+import it.cavallium.warppi.math.MathematicalSymbols;
public class NormalInputContainer extends InputContainer {
@@ -97,7 +97,8 @@ public class NormalInputContainer extends InputContainer {
case MathematicalSymbols.DIVISION:
@SuppressWarnings("unchecked")
final BlockReference ref = (BlockReference) getSelectedBlock();
- @SuppressWarnings("unused") final BlockContainer parentContainer = ref.getContainer();
+ @SuppressWarnings("unused")
+ final BlockContainer parentContainer = ref.getContainer();
BlockReference> currentBlock = ref;
boolean groupedBefore = false;
int before = 0;
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/NormalOutputContainer.java b/src/main/java/it/cavallium/warppi/gui/expression/containers/NormalOutputContainer.java
similarity index 82%
rename from src/main/java/org/warp/picalculator/gui/expression/containers/NormalOutputContainer.java
rename to src/main/java/it/cavallium/warppi/gui/expression/containers/NormalOutputContainer.java
index 2d30d85a..929cedaf 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/NormalOutputContainer.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/containers/NormalOutputContainer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.expression.containers;
+package it.cavallium.warppi.gui.expression.containers;
public class NormalOutputContainer extends OutputContainer {
diff --git a/src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java b/src/main/java/it/cavallium/warppi/gui/expression/containers/OutputContainer.java
similarity index 82%
rename from src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java
rename to src/main/java/it/cavallium/warppi/gui/expression/containers/OutputContainer.java
index 30fb2118..b68c5590 100755
--- a/src/main/java/org/warp/picalculator/gui/expression/containers/OutputContainer.java
+++ b/src/main/java/it/cavallium/warppi/gui/expression/containers/OutputContainer.java
@@ -1,16 +1,15 @@
-package org.warp.picalculator.gui.expression.containers;
+package it.cavallium.warppi.gui.expression.containers;
import java.io.Serializable;
-import org.warp.picalculator.gui.GraphicalElement;
-import org.warp.picalculator.gui.expression.Caret;
-import org.warp.picalculator.gui.expression.CaretState;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.layouts.OutputLayout;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-
+import it.cavallium.warppi.gui.GraphicalElement;
+import it.cavallium.warppi.gui.expression.Caret;
+import it.cavallium.warppi.gui.expression.CaretState;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.layouts.OutputLayout;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public abstract class OutputContainer implements GraphicalElement, OutputLayout, Serializable {
diff --git a/src/main/java/it/cavallium/warppi/gui/expression/layouts/InputLayout.java b/src/main/java/it/cavallium/warppi/gui/expression/layouts/InputLayout.java
new file mode 100755
index 00000000..88a970db
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/gui/expression/layouts/InputLayout.java
@@ -0,0 +1,7 @@
+package it.cavallium.warppi.gui.expression.layouts;
+
+import it.cavallium.warppi.gui.expression.blocks.Block;
+
+public interface InputLayout {
+ public Block parseChar(char c);
+}
diff --git a/src/main/java/it/cavallium/warppi/gui/expression/layouts/OutputLayout.java b/src/main/java/it/cavallium/warppi/gui/expression/layouts/OutputLayout.java
new file mode 100755
index 00000000..e9c58715
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/gui/expression/layouts/OutputLayout.java
@@ -0,0 +1,3 @@
+package it.cavallium.warppi.gui.expression.layouts;
+
+public interface OutputLayout {}
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/BinaryFont.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/BinaryFont.java
similarity index 74%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/BinaryFont.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/BinaryFont.java
index 47a43480..ca4318e4 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/BinaryFont.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/BinaryFont.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine;
+package it.cavallium.warppi.gui.graphicengine;
/**
*
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/GraphicEngine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/GraphicEngine.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/GraphicEngine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/GraphicEngine.java
index 998ab473..88d4f1cc 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/GraphicEngine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/GraphicEngine.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.gui.graphicengine;
+package it.cavallium.warppi.gui.graphicengine;
import java.io.IOException;
import java.util.List;
-import org.warp.picalculator.flow.Observable;
+import it.cavallium.warppi.flow.Observable;
public interface GraphicEngine {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/Renderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/Renderer.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/Renderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/Renderer.java
index c0dd3a49..5a367a07 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/Renderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/Renderer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine;
+package it.cavallium.warppi.gui.graphicengine;
public interface Renderer {
public void glColor3i(int r, int gg, int b);
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/RenderingLoop.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/RenderingLoop.java
similarity index 52%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/RenderingLoop.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/RenderingLoop.java
index 9adf03cd..24307987 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/RenderingLoop.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/RenderingLoop.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine;
+package it.cavallium.warppi.gui.graphicengine;
public interface RenderingLoop {
public void refresh();
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/Skin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/Skin.java
similarity index 83%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/Skin.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/Skin.java
index 36d8e696..bdf38fb8 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/Skin.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/Skin.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine;
+package it.cavallium.warppi.gui.graphicengine;
import java.io.IOException;
import java.net.URISyntaxException;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUEngine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUEngine.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUEngine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUEngine.java
index f3ca8793..4515e48c 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUEngine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUEngine.java
@@ -1,18 +1,18 @@
-package org.warp.picalculator.gui.graphicengine.cpu;
+package it.cavallium.warppi.gui.graphicengine.cpu;
import java.awt.GraphicsEnvironment;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.concurrent.Semaphore;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class CPUEngine implements GraphicEngine {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUFont.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUFont.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUFont.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUFont.java
index 4a7f81a9..b6f616cd 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUFont.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUFont.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.cpu;
+package it.cavallium.warppi.gui.graphicengine.cpu;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
@@ -12,13 +12,13 @@ import java.util.logging.Logger;
import javax.imageio.ImageIO;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.deps.DSystem;
-import org.warp.picalculator.deps.StorageUtils;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.deps.DSystem;
+import it.cavallium.warppi.deps.StorageUtils;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
public class CPUFont implements BinaryFont {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPURenderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPURenderer.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPURenderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPURenderer.java
index 16cf9ee4..cd065c34 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPURenderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPURenderer.java
@@ -1,10 +1,10 @@
-package org.warp.picalculator.gui.graphicengine.cpu;
+package it.cavallium.warppi.gui.graphicengine.cpu;
import java.awt.FontMetrics;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class CPURenderer implements Renderer {
public int clearcolor = 0xFFc5c2af;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUSkin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUSkin.java
similarity index 90%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUSkin.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUSkin.java
index e5201df8..a3b8353d 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/CPUSkin.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUSkin.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.cpu;
+package it.cavallium.warppi.gui.graphicengine.cpu;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -7,12 +7,11 @@ import java.net.URISyntaxException;
import javax.imageio.ImageIO;
-import org.warp.picalculator.deps.StorageUtils;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Skin;
-
import ar.com.hjg.pngj.ImageLineInt;
import ar.com.hjg.pngj.PngReader;
+import it.cavallium.warppi.deps.StorageUtils;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class CPUSkin implements Skin {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/SwingWindow.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/SwingWindow.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/cpu/SwingWindow.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/SwingWindow.java
index 9fa53a9f..0a8b5c18 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/cpu/SwingWindow.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/SwingWindow.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.cpu;
+package it.cavallium.warppi.gui.graphicengine.cpu;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -19,19 +19,18 @@ import java.awt.image.DataBufferInt;
import javax.swing.JFrame;
import javax.swing.JPanel;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.TouchEndEvent;
-import org.warp.picalculator.event.TouchMoveEvent;
-import org.warp.picalculator.event.TouchPoint;
-import org.warp.picalculator.event.TouchStartEvent;
-import org.warp.picalculator.flow.BehaviorSubject;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.TouchEndEvent;
+import it.cavallium.warppi.event.TouchMoveEvent;
+import it.cavallium.warppi.event.TouchPoint;
+import it.cavallium.warppi.event.TouchStartEvent;
+import it.cavallium.warppi.flow.BehaviorSubject;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class SwingWindow extends JFrame {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/framebuffer/FBEngine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/framebuffer/FBEngine.java
similarity index 83%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/framebuffer/FBEngine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/framebuffer/FBEngine.java
index 3333d08c..8b992d76 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/framebuffer/FBEngine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/framebuffer/FBEngine.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.framebuffer;
+package it.cavallium.warppi.gui.graphicengine.framebuffer;
import java.io.IOException;
import java.io.RandomAccessFile;
@@ -6,18 +6,18 @@ import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import java.util.concurrent.Semaphore;
-import org.warp.picalculator.MmapByteBuffer;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.TestJNI;
-import org.warp.picalculator.flow.BehaviorSubject;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUFont;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUSkin;
+import it.cavallium.warppi.MmapByteBuffer;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.TestJNI;
+import it.cavallium.warppi.flow.BehaviorSubject;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUFont;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUSkin;
public class FBEngine implements GraphicEngine {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/framebuffer/FBRenderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/framebuffer/FBRenderer.java
similarity index 88%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/framebuffer/FBRenderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/framebuffer/FBRenderer.java
index cc78ddfd..c3d7a411 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/framebuffer/FBRenderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/framebuffer/FBRenderer.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.gui.graphicengine.framebuffer;
+package it.cavallium.warppi.gui.graphicengine.framebuffer;
import java.nio.MappedByteBuffer;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class FBRenderer implements Renderer {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/DeallocationHelper.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/DeallocationHelper.java
similarity index 97%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/gpu/DeallocationHelper.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/DeallocationHelper.java
index 1c16194e..9ee59a79 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/DeallocationHelper.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/DeallocationHelper.java
@@ -10,7 +10,7 @@
* write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-package org.warp.picalculator.gui.graphicengine.gpu;
+package it.cavallium.warppi.gui.graphicengine.gpu;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUEngine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUEngine.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUEngine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUEngine.java
index f2649bfb..29f4d78c 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUEngine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUEngine.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.gpu;
+package it.cavallium.warppi.gui.graphicengine.gpu;
import java.io.IOException;
import java.util.HashMap;
@@ -8,17 +8,17 @@ import java.util.Map.Entry;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Semaphore;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
-
import com.jogamp.opengl.GLProfile;
import com.jogamp.opengl.util.texture.Texture;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
+
public class GPUEngine implements GraphicEngine {
private volatile boolean initialized = false;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUFont.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUFont.java
similarity index 92%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUFont.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUFont.java
index 4ff1946c..47ef84d6 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUFont.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUFont.java
@@ -1,15 +1,10 @@
-package org.warp.picalculator.gui.graphicengine.gpu;
+package it.cavallium.warppi.gui.graphicengine.gpu;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUFont;
-
import com.jogamp.opengl.GLException;
import com.jogamp.opengl.util.texture.Texture;
@@ -17,6 +12,10 @@ import ar.com.hjg.pngj.ImageInfo;
import ar.com.hjg.pngj.ImageLineHelper;
import ar.com.hjg.pngj.ImageLineInt;
import ar.com.hjg.pngj.PngWriter;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUFont;
public class GPUFont implements BinaryFont {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPURenderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPURenderer.java
similarity index 95%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPURenderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPURenderer.java
index 2a083d9e..e466a034 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPURenderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPURenderer.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.gpu;
+package it.cavallium.warppi.gui.graphicengine.gpu;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -10,11 +10,6 @@ import java.nio.file.Files;
import javax.imageio.ImageIO;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-
import com.jogamp.common.nio.Buffers;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2ES1;
@@ -23,6 +18,11 @@ import com.jogamp.opengl.util.texture.Texture;
import com.jogamp.opengl.util.texture.TextureData;
import com.jogamp.opengl.util.texture.TextureIO;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+
public class GPURenderer implements Renderer {
public static GL2ES1 gl;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUSkin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUSkin.java
similarity index 82%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUSkin.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUSkin.java
index 1e463c88..2130c686 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/GPUSkin.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/GPUSkin.java
@@ -1,16 +1,16 @@
-package org.warp.picalculator.gui.graphicengine.gpu;
+package it.cavallium.warppi.gui.graphicengine.gpu;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Skin;
-import org.warp.picalculator.gui.graphicengine.gpu.GPURenderer.OpenedTextureData;
-
import com.jogamp.opengl.GLException;
import com.jogamp.opengl.util.texture.Texture;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.gpu.GPURenderer.OpenedTextureData;
+
public class GPUSkin implements Skin {
public Texture t;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/NEWTWindow.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/NEWTWindow.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/gpu/NEWTWindow.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/NEWTWindow.java
index b5ab9f99..4521a028 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/gpu/NEWTWindow.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/gpu/NEWTWindow.java
@@ -26,23 +26,10 @@
* or implied, of JogAmp Community.
*/
-package org.warp.picalculator.gui.graphicengine.gpu;
+package it.cavallium.warppi.gui.graphicengine.gpu;
import java.util.List;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.Key;
-import org.warp.picalculator.event.TouchEndEvent;
-import org.warp.picalculator.event.TouchMoveEvent;
-import org.warp.picalculator.event.TouchPoint;
-import org.warp.picalculator.event.TouchStartEvent;
-import org.warp.picalculator.flow.BehaviorSubject;
-import org.warp.picalculator.flow.SimpleSubject;
-import org.warp.picalculator.flow.Subject;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.MouseEvent;
@@ -63,6 +50,18 @@ import com.jogamp.opengl.fixedfunc.GLPointerFunc;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.texture.Texture;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.Key;
+import it.cavallium.warppi.event.TouchEndEvent;
+import it.cavallium.warppi.event.TouchMoveEvent;
+import it.cavallium.warppi.event.TouchPoint;
+import it.cavallium.warppi.event.TouchStartEvent;
+import it.cavallium.warppi.flow.BehaviorSubject;
+import it.cavallium.warppi.flow.SimpleSubject;
+import it.cavallium.warppi.flow.Subject;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitEngine.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitEngine.java
index fc2c73ed..1a108b4c 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitEngine.java
@@ -1,19 +1,20 @@
-package org.warp.picalculator.gui.graphicengine.headless24bit;
+package it.cavallium.warppi.gui.graphicengine.headless24bit;
import java.io.IOException;
import java.util.logging.ConsoleHandler;
import org.fusesource.jansi.AnsiConsole;
import org.fusesource.jansi.internal.WindowsSupport;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.Key;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-public class Headless24bitEngine implements org.warp.picalculator.gui.graphicengine.GraphicEngine {
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.Key;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+
+public class Headless24bitEngine implements it.cavallium.warppi.gui.graphicengine.GraphicEngine {
private final Headless24bitRenderer r = new Headless24bitRenderer();
private boolean stopped = true;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitFont.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitFont.java
similarity index 75%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitFont.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitFont.java
index 3ac0587e..8b9141eb 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitFont.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitFont.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.gui.graphicengine.headless24bit;
+package it.cavallium.warppi.gui.graphicengine.headless24bit;
import java.io.IOException;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
public class Headless24bitFont implements BinaryFont {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitRenderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitRenderer.java
similarity index 98%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitRenderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitRenderer.java
index b00e1fe7..09355d38 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitRenderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitRenderer.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.gui.graphicengine.headless24bit;
+package it.cavallium.warppi.gui.graphicengine.headless24bit;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class Headless24bitRenderer implements Renderer {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitSkin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitSkin.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitSkin.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitSkin.java
index 5ecfea99..af50f781 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitSkin.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless24bit/Headless24bitSkin.java
@@ -1,12 +1,12 @@
-package org.warp.picalculator.gui.graphicengine.headless24bit;
+package it.cavallium.warppi.gui.graphicengine.headless24bit;
import java.awt.image.BufferedImage;
import java.io.IOException;
import javax.imageio.ImageIO;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class Headless24bitSkin implements Skin {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Engine.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Engine.java
index c165e4f0..e1e70a73 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Engine.java
@@ -1,20 +1,21 @@
-package org.warp.picalculator.gui.graphicengine.headless256;
+package it.cavallium.warppi.gui.graphicengine.headless256;
import java.io.IOException;
import java.util.logging.ConsoleHandler;
import org.fusesource.jansi.AnsiConsole;
import org.fusesource.jansi.internal.WindowsSupport;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.Key;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitRenderer;
-public class Headless256Engine implements org.warp.picalculator.gui.graphicengine.GraphicEngine {
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.Key;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.headless24bit.Headless24bitRenderer;
+
+public class Headless256Engine implements it.cavallium.warppi.gui.graphicengine.GraphicEngine {
private final Headless256Renderer r = new Headless256Renderer();
private boolean stopped = true;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Font.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Font.java
similarity index 75%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Font.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Font.java
index 477a96a1..128eeee4 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Font.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Font.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.gui.graphicengine.headless256;
+package it.cavallium.warppi.gui.graphicengine.headless256;
import java.io.IOException;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
public class Headless256Font implements BinaryFont {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Renderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Renderer.java
similarity index 98%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Renderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Renderer.java
index 36bf7500..d48a377d 100755
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Renderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Renderer.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.gui.graphicengine.headless256;
+package it.cavallium.warppi.gui.graphicengine.headless256;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class Headless256Renderer implements Renderer {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Skin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Skin.java
similarity index 88%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Skin.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Skin.java
index a8ddff50..0da04bf6 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Skin.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless256/Headless256Skin.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.headless256;
+package it.cavallium.warppi.gui.graphicengine.headless256;
import java.awt.geom.AffineTransform;
import java.awt.image.AffineTransformOp;
@@ -7,8 +7,8 @@ import java.io.IOException;
import javax.imageio.ImageIO;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class Headless256Skin implements Skin {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Engine.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Engine.java
index 3d819ac7..ae60ae37 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Engine.java
@@ -1,20 +1,21 @@
-package org.warp.picalculator.gui.graphicengine.headless8;
+package it.cavallium.warppi.gui.graphicengine.headless8;
import java.io.IOException;
import java.util.logging.ConsoleHandler;
import org.fusesource.jansi.AnsiConsole;
import org.fusesource.jansi.internal.WindowsSupport;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.Key;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitRenderer;
-public class Headless8Engine implements org.warp.picalculator.gui.graphicengine.GraphicEngine {
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.Key;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.headless24bit.Headless24bitRenderer;
+
+public class Headless8Engine implements it.cavallium.warppi.gui.graphicengine.GraphicEngine {
private final Headless8Renderer r = new Headless8Renderer();
private boolean stopped = true;
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Font.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Font.java
similarity index 75%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Font.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Font.java
index 365347a6..34169742 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Font.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Font.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.gui.graphicengine.headless8;
+package it.cavallium.warppi.gui.graphicengine.headless8;
import java.io.IOException;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
public class Headless8Font implements BinaryFont {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Renderer.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Renderer.java
similarity index 98%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Renderer.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Renderer.java
index 5b17da80..40a814e2 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Renderer.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Renderer.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.gui.graphicengine.headless8;
+package it.cavallium.warppi.gui.graphicengine.headless8;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class Headless8Renderer implements Renderer {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Skin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Skin.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Skin.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Skin.java
index 52811909..cfb346ab 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Skin.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/headless8/Headless8Skin.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.headless8;
+package it.cavallium.warppi.gui.graphicengine.headless8;
import java.awt.geom.AffineTransform;
import java.awt.image.AffineTransformOp;
@@ -7,8 +7,8 @@ import java.io.IOException;
import javax.imageio.ImageIO;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class Headless8Skin implements Skin {
diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/nogui/NoGuiEngine.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/nogui/NoGuiEngine.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/gui/graphicengine/nogui/NoGuiEngine.java
rename to src/main/java/it/cavallium/warppi/gui/graphicengine/nogui/NoGuiEngine.java
index a4cb8cfe..8f9b5967 100644
--- a/src/main/java/org/warp/picalculator/gui/graphicengine/nogui/NoGuiEngine.java
+++ b/src/main/java/it/cavallium/warppi/gui/graphicengine/nogui/NoGuiEngine.java
@@ -1,14 +1,14 @@
-package org.warp.picalculator.gui.graphicengine.nogui;
+package it.cavallium.warppi.gui.graphicengine.nogui;
import java.io.IOException;
-import org.warp.picalculator.deps.DSemaphore;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.deps.DSemaphore;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class NoGuiEngine implements GraphicEngine {
diff --git a/src/main/java/org/warp/picalculator/gui/screens/ChooseVariableValueScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/ChooseVariableValueScreen.java
similarity index 88%
rename from src/main/java/org/warp/picalculator/gui/screens/ChooseVariableValueScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/ChooseVariableValueScreen.java
index 6644b709..62e1ec82 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/ChooseVariableValueScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/ChooseVariableValueScreen.java
@@ -1,11 +1,11 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.event.KeyPressedEvent;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Variable.VariableValue;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.functions.Variable.VariableValue;
public class ChooseVariableValueScreen extends Screen {
diff --git a/src/main/java/org/warp/picalculator/gui/screens/EmptyScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/EmptyScreen.java
similarity index 86%
rename from src/main/java/org/warp/picalculator/gui/screens/EmptyScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/EmptyScreen.java
index e7f13ddd..c15c0c0a 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/EmptyScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/EmptyScreen.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
public class EmptyScreen extends Screen {
diff --git a/src/main/java/org/warp/picalculator/gui/screens/KeyboardDebugScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/KeyboardDebugScreen.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/gui/screens/KeyboardDebugScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/KeyboardDebugScreen.java
index f262315c..7278140c 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/KeyboardDebugScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/KeyboardDebugScreen.java
@@ -1,10 +1,10 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.event.KeyPressedEvent;
-import org.warp.picalculator.event.KeyReleasedEvent;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class KeyboardDebugScreen extends Screen {
diff --git a/src/main/java/org/warp/picalculator/gui/screens/LoadingScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/LoadingScreen.java
similarity index 84%
rename from src/main/java/org/warp/picalculator/gui/screens/LoadingScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/LoadingScreen.java
index 2325f140..49b129f7 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/LoadingScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/LoadingScreen.java
@@ -1,8 +1,9 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.gui.GraphicUtils;
+import it.cavallium.warppi.Engine;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.gui.GraphicUtils;
public class LoadingScreen extends Screen {
@@ -19,6 +20,9 @@ public class LoadingScreen extends Screen {
@Override
public void created() throws InterruptedException {
+ Engine.INSTANCE.isLoaded().subscribe((loaded) -> {
+ this.loaded = loaded;
+ });
endLoading = 0;
}
diff --git a/src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/MarioScreen.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/MarioScreen.java
index 205c8fe5..272f2522 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/MarioScreen.java
@@ -1,14 +1,14 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
import java.io.IOException;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.extra.mario.MarioGame;
-import org.warp.picalculator.extra.mario.MarioWorld;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.Skin;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.extra.mario.MarioGame;
+import it.cavallium.warppi.extra.mario.MarioWorld;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class MarioScreen extends Screen {
diff --git a/src/main/java/org/warp/picalculator/gui/screens/MathInputScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/MathInputScreen.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/gui/screens/MathInputScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/MathInputScreen.java
index 2d68bac5..94239c70 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/MathInputScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/MathInputScreen.java
@@ -1,42 +1,41 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
import java.io.IOException;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.deps.DSystem;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.event.Key;
-import org.warp.picalculator.event.KeyPressedEvent;
-import org.warp.picalculator.event.KeyReleasedEvent;
-import org.warp.picalculator.gui.expression.InputContext;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.containers.InputContainer;
-import org.warp.picalculator.gui.expression.containers.NormalInputContainer;
-import org.warp.picalculator.gui.expression.containers.NormalOutputContainer;
-import org.warp.picalculator.gui.expression.containers.OutputContainer;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.math.AngleMode;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Variable;
-import org.warp.picalculator.math.functions.Variable.VariableValue;
-import org.warp.picalculator.math.parser.MathParser;
-import org.warp.picalculator.math.solver.MathSolver;
-
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.deps.DSystem;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.event.Key;
+import it.cavallium.warppi.event.KeyPressedEvent;
+import it.cavallium.warppi.event.KeyReleasedEvent;
+import it.cavallium.warppi.gui.expression.InputContext;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.containers.InputContainer;
+import it.cavallium.warppi.gui.expression.containers.NormalInputContainer;
+import it.cavallium.warppi.gui.expression.containers.NormalOutputContainer;
+import it.cavallium.warppi.gui.expression.containers.OutputContainer;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.math.AngleMode;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Variable;
+import it.cavallium.warppi.math.functions.Variable.VariableValue;
+import it.cavallium.warppi.math.parser.MathParser;
+import it.cavallium.warppi.math.solver.MathSolver;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class MathInputScreen extends Screen {
diff --git a/src/main/java/org/warp/picalculator/gui/screens/Screen.java b/src/main/java/it/cavallium/warppi/gui/screens/Screen.java
similarity index 73%
rename from src/main/java/org/warp/picalculator/gui/screens/Screen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/Screen.java
index eaf215df..58c4735c 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/Screen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/Screen.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
-import org.warp.picalculator.event.KeyboardEventListener;
-import org.warp.picalculator.event.TouchEventListener;
-import org.warp.picalculator.gui.DisplayManager;
-import org.warp.picalculator.gui.GraphicalInterface;
+import it.cavallium.warppi.event.KeyboardEventListener;
+import it.cavallium.warppi.event.TouchEventListener;
+import it.cavallium.warppi.gui.DisplayManager;
+import it.cavallium.warppi.gui.GraphicalInterface;
public abstract class Screen implements KeyboardEventListener, TouchEventListener, GraphicalInterface {
public DisplayManager d;
diff --git a/src/main/java/org/warp/picalculator/gui/screens/SolveForXScreen.java b/src/main/java/it/cavallium/warppi/gui/screens/SolveForXScreen.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/gui/screens/SolveForXScreen.java
rename to src/main/java/it/cavallium/warppi/gui/screens/SolveForXScreen.java
index e689b1be..af23845d 100755
--- a/src/main/java/org/warp/picalculator/gui/screens/SolveForXScreen.java
+++ b/src/main/java/it/cavallium/warppi/gui/screens/SolveForXScreen.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.gui.screens;
+package it.cavallium.warppi.gui.screens;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.event.KeyPressedEvent;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.device.HardwareDevice;
+import it.cavallium.warppi.event.KeyPressedEvent;
public class SolveForXScreen extends Screen {
diff --git a/src/main/java/org/warp/picalculator/math/AngleMode.java b/src/main/java/it/cavallium/warppi/math/AngleMode.java
similarity index 50%
rename from src/main/java/org/warp/picalculator/math/AngleMode.java
rename to src/main/java/it/cavallium/warppi/math/AngleMode.java
index e8f01ecb..09625f7d 100755
--- a/src/main/java/org/warp/picalculator/math/AngleMode.java
+++ b/src/main/java/it/cavallium/warppi/math/AngleMode.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.math;
+package it.cavallium.warppi.math;
public enum AngleMode {
DEG, RAD, GRA
diff --git a/src/main/java/org/warp/picalculator/math/Function.java b/src/main/java/it/cavallium/warppi/math/Function.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/math/Function.java
rename to src/main/java/it/cavallium/warppi/math/Function.java
index e09a20d0..0ec094e5 100755
--- a/src/main/java/org/warp/picalculator/math/Function.java
+++ b/src/main/java/it/cavallium/warppi/math/Function.java
@@ -1,9 +1,8 @@
-package org.warp.picalculator.math;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public interface Function {
diff --git a/src/main/java/org/warp/picalculator/math/FunctionDynamic.java b/src/main/java/it/cavallium/warppi/math/FunctionDynamic.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/math/FunctionDynamic.java
rename to src/main/java/it/cavallium/warppi/math/FunctionDynamic.java
index d31a0c0b..86e72467 100755
--- a/src/main/java/org/warp/picalculator/math/FunctionDynamic.java
+++ b/src/main/java/it/cavallium/warppi/math/FunctionDynamic.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math;
+package it.cavallium.warppi.math;
import java.util.Arrays;
import java.util.List;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.math.rules.Rule;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public abstract class FunctionDynamic implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/FunctionOperator.java b/src/main/java/it/cavallium/warppi/math/FunctionOperator.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/math/FunctionOperator.java
rename to src/main/java/it/cavallium/warppi/math/FunctionOperator.java
index 693b29cb..e3b21bea 100755
--- a/src/main/java/org/warp/picalculator/math/FunctionOperator.java
+++ b/src/main/java/it/cavallium/warppi/math/FunctionOperator.java
@@ -1,10 +1,9 @@
-package org.warp.picalculator.math;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public abstract class FunctionOperator implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/FunctionSingle.java b/src/main/java/it/cavallium/warppi/math/FunctionSingle.java
similarity index 91%
rename from src/main/java/org/warp/picalculator/math/FunctionSingle.java
rename to src/main/java/it/cavallium/warppi/math/FunctionSingle.java
index 08b570b5..7280e479 100755
--- a/src/main/java/org/warp/picalculator/math/FunctionSingle.java
+++ b/src/main/java/it/cavallium/warppi/math/FunctionSingle.java
@@ -1,8 +1,7 @@
-package org.warp.picalculator.math;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public abstract class FunctionSingle implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/MathContext.java b/src/main/java/it/cavallium/warppi/math/MathContext.java
similarity index 90%
rename from src/main/java/org/warp/picalculator/math/MathContext.java
rename to src/main/java/it/cavallium/warppi/math/MathContext.java
index c9050545..ad53f45d 100755
--- a/src/main/java/org/warp/picalculator/math/MathContext.java
+++ b/src/main/java/it/cavallium/warppi/math/MathContext.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.math;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.functions.Variable.VariableValue;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
+package it.cavallium.warppi.math;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.functions.Variable.VariableValue;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class MathContext {
diff --git a/src/main/java/org/warp/picalculator/math/MathematicalSymbols.java b/src/main/java/it/cavallium/warppi/math/MathematicalSymbols.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/math/MathematicalSymbols.java
rename to src/main/java/it/cavallium/warppi/math/MathematicalSymbols.java
index 11805572..53e0bdb0 100755
--- a/src/main/java/org/warp/picalculator/math/MathematicalSymbols.java
+++ b/src/main/java/it/cavallium/warppi/math/MathematicalSymbols.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math;
+package it.cavallium.warppi.math;
-import static org.warp.picalculator.Utils.concat;
+import static it.cavallium.warppi.Utils.concat;
-import org.warp.picalculator.Utils;
+import it.cavallium.warppi.Utils;
public class MathematicalSymbols {
public static final char SUM = '+';
diff --git a/src/main/java/org/warp/picalculator/math/functions/Division.java b/src/main/java/it/cavallium/warppi/math/functions/Division.java
similarity index 74%
rename from src/main/java/org/warp/picalculator/math/functions/Division.java
rename to src/main/java/it/cavallium/warppi/math/functions/Division.java
index f3c8415f..c95088fe 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Division.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Division.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockDivision;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockDivision;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Division extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/EmptyNumber.java b/src/main/java/it/cavallium/warppi/math/functions/EmptyNumber.java
similarity index 74%
rename from src/main/java/org/warp/picalculator/math/functions/EmptyNumber.java
rename to src/main/java/it/cavallium/warppi/math/functions/EmptyNumber.java
index f7775d34..e682e839 100755
--- a/src/main/java/org/warp/picalculator/math/functions/EmptyNumber.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/EmptyNumber.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class EmptyNumber implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Expression.java b/src/main/java/it/cavallium/warppi/math/functions/Expression.java
similarity index 94%
rename from src/main/java/org/warp/picalculator/math/functions/Expression.java
rename to src/main/java/it/cavallium/warppi/math/functions/Expression.java
index 44d341b7..97c21a73 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Expression.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Expression.java
@@ -1,19 +1,18 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockParenthesis;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.trigonometry.ArcCosine;
-import org.warp.picalculator.math.functions.trigonometry.ArcSine;
-import org.warp.picalculator.math.functions.trigonometry.ArcTangent;
-import org.warp.picalculator.math.functions.trigonometry.Cosine;
-import org.warp.picalculator.math.functions.trigonometry.Sine;
-import org.warp.picalculator.math.functions.trigonometry.Tangent;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockParenthesis;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.trigonometry.ArcCosine;
+import it.cavallium.warppi.math.functions.trigonometry.ArcSine;
+import it.cavallium.warppi.math.functions.trigonometry.ArcTangent;
+import it.cavallium.warppi.math.functions.trigonometry.Cosine;
+import it.cavallium.warppi.math.functions.trigonometry.Sine;
+import it.cavallium.warppi.math.functions.trigonometry.Tangent;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Expression extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Joke.java b/src/main/java/it/cavallium/warppi/math/functions/Joke.java
similarity index 78%
rename from src/main/java/org/warp/picalculator/math/functions/Joke.java
rename to src/main/java/it/cavallium/warppi/math/functions/Joke.java
index 99f870f4..af1ceaf3 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Joke.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Joke.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Joke implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Logarithm.java b/src/main/java/it/cavallium/warppi/math/functions/Logarithm.java
similarity index 72%
rename from src/main/java/org/warp/picalculator/math/functions/Logarithm.java
rename to src/main/java/it/cavallium/warppi/math/functions/Logarithm.java
index 70304a44..d0d46d08 100644
--- a/src/main/java/org/warp/picalculator/math/functions/Logarithm.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Logarithm.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockLogarithm;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockLogarithm;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Logarithm extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Multiplication.java b/src/main/java/it/cavallium/warppi/math/functions/Multiplication.java
similarity index 84%
rename from src/main/java/org/warp/picalculator/math/functions/Multiplication.java
rename to src/main/java/it/cavallium/warppi/math/functions/Multiplication.java
index f98625e6..8901ecbd 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Multiplication.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Multiplication.java
@@ -1,14 +1,13 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.gui.expression.blocks.BlockParenthesis;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.gui.expression.blocks.BlockParenthesis;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Multiplication extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Negative.java b/src/main/java/it/cavallium/warppi/math/functions/Negative.java
similarity index 70%
rename from src/main/java/org/warp/picalculator/math/functions/Negative.java
rename to src/main/java/it/cavallium/warppi/math/functions/Negative.java
index 3b7de3ba..625128c6 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Negative.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Negative.java
@@ -1,14 +1,13 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.gui.expression.blocks.BlockParenthesis;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.gui.expression.blocks.BlockParenthesis;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Negative extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Number.java b/src/main/java/it/cavallium/warppi/math/functions/Number.java
similarity index 88%
rename from src/main/java/org/warp/picalculator/math/functions/Number.java
rename to src/main/java/it/cavallium/warppi/math/functions/Number.java
index db9aaaeb..8dced949 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Number.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Number.java
@@ -1,21 +1,21 @@
-package org.warp.picalculator.math.functions;
+package it.cavallium.warppi.math.functions;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.LinkedList;
import org.nevec.rjm.BigDecimalMath;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockExponentialNotation;
-import org.warp.picalculator.gui.expression.blocks.BlockPower;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.rules.Rule;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockExponentialNotation;
+import it.cavallium.warppi.gui.expression.blocks.BlockPower;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Number implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Power.java b/src/main/java/it/cavallium/warppi/math/functions/Power.java
similarity index 70%
rename from src/main/java/org/warp/picalculator/math/functions/Power.java
rename to src/main/java/it/cavallium/warppi/math/functions/Power.java
index 67374cfa..36dc9254 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Power.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Power.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockPower;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockPower;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Power extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Root.java b/src/main/java/it/cavallium/warppi/math/functions/Root.java
similarity index 67%
rename from src/main/java/org/warp/picalculator/math/functions/Root.java
rename to src/main/java/it/cavallium/warppi/math/functions/Root.java
index d750f2ec..5dd85a0c 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Root.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Root.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Root extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/RootSquare.java b/src/main/java/it/cavallium/warppi/math/functions/RootSquare.java
similarity index 68%
rename from src/main/java/org/warp/picalculator/math/functions/RootSquare.java
rename to src/main/java/it/cavallium/warppi/math/functions/RootSquare.java
index f17e5eee..a66a4ef0 100755
--- a/src/main/java/org/warp/picalculator/math/functions/RootSquare.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/RootSquare.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockSquareRoot;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockSquareRoot;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class RootSquare extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Subtraction.java b/src/main/java/it/cavallium/warppi/math/functions/Subtraction.java
similarity index 67%
rename from src/main/java/org/warp/picalculator/math/functions/Subtraction.java
rename to src/main/java/it/cavallium/warppi/math/functions/Subtraction.java
index d552c05d..18b884a4 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Subtraction.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Subtraction.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Subtraction extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Sum.java b/src/main/java/it/cavallium/warppi/math/functions/Sum.java
similarity index 68%
rename from src/main/java/org/warp/picalculator/math/functions/Sum.java
rename to src/main/java/it/cavallium/warppi/math/functions/Sum.java
index 746826f2..034e63f6 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Sum.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Sum.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Sum extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/SumSubtraction.java b/src/main/java/it/cavallium/warppi/math/functions/SumSubtraction.java
similarity index 67%
rename from src/main/java/org/warp/picalculator/math/functions/SumSubtraction.java
rename to src/main/java/it/cavallium/warppi/math/functions/SumSubtraction.java
index 26f911cf..58b3d008 100755
--- a/src/main/java/org/warp/picalculator/math/functions/SumSubtraction.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/SumSubtraction.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class SumSubtraction extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Undefined.java b/src/main/java/it/cavallium/warppi/math/functions/Undefined.java
similarity index 72%
rename from src/main/java/org/warp/picalculator/math/functions/Undefined.java
rename to src/main/java/it/cavallium/warppi/math/functions/Undefined.java
index 0ced4634..0a2f533b 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Undefined.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Undefined.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockUndefined;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockUndefined;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Undefined implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/functions/Variable.java b/src/main/java/it/cavallium/warppi/math/functions/Variable.java
similarity index 82%
rename from src/main/java/org/warp/picalculator/math/functions/Variable.java
rename to src/main/java/it/cavallium/warppi/math/functions/Variable.java
index 2b422ebf..59d7ea9c 100755
--- a/src/main/java/org/warp/picalculator/math/functions/Variable.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/Variable.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockChar;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.rules.Rule;
+package it.cavallium.warppi.math.functions;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockChar;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Variable implements Function {
diff --git a/src/main/java/org/warp/picalculator/math/functions/equations/Equation.java b/src/main/java/it/cavallium/warppi/math/functions/equations/Equation.java
similarity index 78%
rename from src/main/java/org/warp/picalculator/math/functions/equations/Equation.java
rename to src/main/java/it/cavallium/warppi/math/functions/equations/Equation.java
index 5116a648..4c33060c 100755
--- a/src/main/java/org/warp/picalculator/math/functions/equations/Equation.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/equations/Equation.java
@@ -1,16 +1,15 @@
-package org.warp.picalculator.math.functions.equations;
+package it.cavallium.warppi.math.functions.equations;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.solver.SolveMethod;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.solver.SolveMethod;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Equation extends FunctionOperator {
diff --git a/src/main/java/org/warp/picalculator/math/functions/equations/EquationResult.java b/src/main/java/it/cavallium/warppi/math/functions/equations/EquationResult.java
similarity index 62%
rename from src/main/java/org/warp/picalculator/math/functions/equations/EquationResult.java
rename to src/main/java/it/cavallium/warppi/math/functions/equations/EquationResult.java
index 6c0ee773..ccd80dc7 100755
--- a/src/main/java/org/warp/picalculator/math/functions/equations/EquationResult.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/equations/EquationResult.java
@@ -1,6 +1,6 @@
-package org.warp.picalculator.math.functions.equations;
+package it.cavallium.warppi.math.functions.equations;
-import org.warp.picalculator.math.functions.Number;
+import it.cavallium.warppi.math.functions.Number;
public class EquationResult {
public boolean isAnEquation = false;
diff --git a/src/main/java/org/warp/picalculator/math/functions/equations/EquationsSystem.java b/src/main/java/it/cavallium/warppi/math/functions/equations/EquationsSystem.java
similarity index 65%
rename from src/main/java/org/warp/picalculator/math/functions/equations/EquationsSystem.java
rename to src/main/java/it/cavallium/warppi/math/functions/equations/EquationsSystem.java
index 1cb2dd06..02e8dd03 100755
--- a/src/main/java/org/warp/picalculator/math/functions/equations/EquationsSystem.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/equations/EquationsSystem.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.math.functions.equations;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.equations;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class EquationsSystem extends FunctionDynamic {
diff --git a/src/main/java/org/warp/picalculator/math/functions/equations/EquationsSystemPart.java b/src/main/java/it/cavallium/warppi/math/functions/equations/EquationsSystemPart.java
similarity index 67%
rename from src/main/java/org/warp/picalculator/math/functions/equations/EquationsSystemPart.java
rename to src/main/java/it/cavallium/warppi/math/functions/equations/EquationsSystemPart.java
index 5f98a612..ad3e6d40 100755
--- a/src/main/java/org/warp/picalculator/math/functions/equations/EquationsSystemPart.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/equations/EquationsSystemPart.java
@@ -1,10 +1,9 @@
-package org.warp.picalculator.math.functions.equations;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.equations;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class EquationsSystemPart extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcCosine.java b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcCosine.java
similarity index 62%
rename from src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcCosine.java
rename to src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcCosine.java
index 839bcf43..5ec6a636 100755
--- a/src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcCosine.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcCosine.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions.trigonometry;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.trigonometry;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class ArcCosine extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcSine.java b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcSine.java
similarity index 62%
rename from src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcSine.java
rename to src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcSine.java
index c21b8e52..05d38f57 100755
--- a/src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcSine.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcSine.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions.trigonometry;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.trigonometry;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class ArcSine extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcTangent.java b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcTangent.java
similarity index 62%
rename from src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcTangent.java
rename to src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcTangent.java
index 0f6923e4..b76fb42f 100755
--- a/src/main/java/org/warp/picalculator/math/functions/trigonometry/ArcTangent.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/ArcTangent.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions.trigonometry;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.trigonometry;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class ArcTangent extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/trigonometry/Cosine.java b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/Cosine.java
similarity index 62%
rename from src/main/java/org/warp/picalculator/math/functions/trigonometry/Cosine.java
rename to src/main/java/it/cavallium/warppi/math/functions/trigonometry/Cosine.java
index e8cce9cb..0dc7761b 100755
--- a/src/main/java/org/warp/picalculator/math/functions/trigonometry/Cosine.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/Cosine.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.functions.trigonometry;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.trigonometry;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Cosine extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/trigonometry/Sine.java b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/Sine.java
similarity index 66%
rename from src/main/java/org/warp/picalculator/math/functions/trigonometry/Sine.java
rename to src/main/java/it/cavallium/warppi/math/functions/trigonometry/Sine.java
index 34ac616c..203c2b95 100755
--- a/src/main/java/org/warp/picalculator/math/functions/trigonometry/Sine.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/Sine.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.functions.trigonometry;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.blocks.BlockContainer;
-import org.warp.picalculator.gui.expression.blocks.BlockSine;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.trigonometry;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.blocks.BlockContainer;
+import it.cavallium.warppi.gui.expression.blocks.BlockSine;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Sine extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/functions/trigonometry/Tangent.java b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/Tangent.java
similarity index 61%
rename from src/main/java/org/warp/picalculator/math/functions/trigonometry/Tangent.java
rename to src/main/java/it/cavallium/warppi/math/functions/trigonometry/Tangent.java
index 181a0e1d..125daf10 100755
--- a/src/main/java/org/warp/picalculator/math/functions/trigonometry/Tangent.java
+++ b/src/main/java/it/cavallium/warppi/math/functions/trigonometry/Tangent.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.math.functions.trigonometry;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
+package it.cavallium.warppi.math.functions.trigonometry;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class Tangent extends FunctionSingle {
diff --git a/src/main/java/org/warp/picalculator/math/parser/MathParser.java b/src/main/java/it/cavallium/warppi/math/parser/MathParser.java
similarity index 80%
rename from src/main/java/org/warp/picalculator/math/parser/MathParser.java
rename to src/main/java/it/cavallium/warppi/math/parser/MathParser.java
index e669a7f2..9f5d8f17 100755
--- a/src/main/java/org/warp/picalculator/math/parser/MathParser.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/MathParser.java
@@ -1,35 +1,34 @@
-package org.warp.picalculator.math.parser;
-
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.gui.expression.containers.InputContainer;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.functions.Variable.V_TYPE;
-import org.warp.picalculator.math.parser.features.FeatureChar;
-import org.warp.picalculator.math.parser.features.FeatureDivision;
-import org.warp.picalculator.math.parser.features.FeatureMultiplication;
-import org.warp.picalculator.math.parser.features.FeatureNumber;
-import org.warp.picalculator.math.parser.features.FeaturePower;
-import org.warp.picalculator.math.parser.features.FeaturePowerChar;
-import org.warp.picalculator.math.parser.features.FeatureSubtraction;
-import org.warp.picalculator.math.parser.features.FeatureSum;
-import org.warp.picalculator.math.parser.features.FeatureSumSubtraction;
-import org.warp.picalculator.math.parser.features.FeatureVariable;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
-import org.warp.picalculator.math.parser.steps.AddImplicitMultiplications;
-import org.warp.picalculator.math.parser.steps.FixMultiplicationsAndDivisions;
-import org.warp.picalculator.math.parser.steps.FixSingleFunctionArgs;
-import org.warp.picalculator.math.parser.steps.FixSumsAndSubtractions;
-import org.warp.picalculator.math.parser.steps.JoinNumberAndVariables;
-import org.warp.picalculator.math.parser.steps.RemoveParentheses;
+package it.cavallium.warppi.math.parser;
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.gui.expression.containers.InputContainer;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Variable.V_TYPE;
+import it.cavallium.warppi.math.parser.features.FeatureChar;
+import it.cavallium.warppi.math.parser.features.FeatureDivision;
+import it.cavallium.warppi.math.parser.features.FeatureMultiplication;
+import it.cavallium.warppi.math.parser.features.FeatureNumber;
+import it.cavallium.warppi.math.parser.features.FeaturePower;
+import it.cavallium.warppi.math.parser.features.FeaturePowerChar;
+import it.cavallium.warppi.math.parser.features.FeatureSubtraction;
+import it.cavallium.warppi.math.parser.features.FeatureSum;
+import it.cavallium.warppi.math.parser.features.FeatureSumSubtraction;
+import it.cavallium.warppi.math.parser.features.FeatureVariable;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
+import it.cavallium.warppi.math.parser.steps.AddImplicitMultiplications;
+import it.cavallium.warppi.math.parser.steps.FixMultiplicationsAndDivisions;
+import it.cavallium.warppi.math.parser.steps.FixSingleFunctionArgs;
+import it.cavallium.warppi.math.parser.steps.FixSumsAndSubtractions;
+import it.cavallium.warppi.math.parser.steps.JoinNumberAndVariables;
+import it.cavallium.warppi.math.parser.steps.RemoveParentheses;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class MathParser {
diff --git a/src/main/java/org/warp/picalculator/math/parser/MathParserStep.java b/src/main/java/it/cavallium/warppi/math/parser/MathParserStep.java
similarity index 73%
rename from src/main/java/org/warp/picalculator/math/parser/MathParserStep.java
rename to src/main/java/it/cavallium/warppi/math/parser/MathParserStep.java
index a10e5b84..f899bff4 100644
--- a/src/main/java/org/warp/picalculator/math/parser/MathParserStep.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/MathParserStep.java
@@ -1,9 +1,8 @@
-package org.warp.picalculator.math.parser;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
+package it.cavallium.warppi.math.parser;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/it/cavallium/warppi/math/parser/features/FeatureChar.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureChar.java
new file mode 100755
index 00000000..9b2610f0
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureChar.java
@@ -0,0 +1,20 @@
+package it.cavallium.warppi.math.parser.features;
+
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.parser.features.interfaces.Feature;
+
+public class FeatureChar implements Feature {
+
+ public final char ch;
+
+ public FeatureChar(char ch) {
+ this.ch = ch;
+ }
+
+ @Override
+ public Function toFunction(MathContext context) {
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureDivision.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureDivision.java
similarity index 61%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureDivision.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureDivision.java
index 058f64b9..513b16e8 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureDivision.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureDivision.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
public class FeatureDivision extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureDoubleImpl.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureDoubleImpl.java
similarity index 74%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureDoubleImpl.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureDoubleImpl.java
index 17094698..5227d8d0 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureDoubleImpl.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureDoubleImpl.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.parser.features.interfaces.FeatureDouble;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.parser.features.interfaces.FeatureDouble;
public abstract class FeatureDoubleImpl implements FeatureDouble {
private Object child_1;
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureLogarithm.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureLogarithm.java
similarity index 58%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureLogarithm.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureLogarithm.java
index b3472bcd..529e1e0d 100644
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureLogarithm.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureLogarithm.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Logarithm;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Logarithm;
public class FeatureLogarithm extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureMultiplication.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureMultiplication.java
similarity index 63%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureMultiplication.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureMultiplication.java
index 336a4334..e7f4075b 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureMultiplication.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureMultiplication.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
public class FeatureMultiplication extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureNumber.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureNumber.java
similarity index 70%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureNumber.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureNumber.java
index 75bd90b3..4048425e 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureNumber.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureNumber.java
@@ -1,10 +1,10 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.parser.features.interfaces.FeatureBasic;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.parser.features.interfaces.FeatureBasic;
public class FeatureNumber implements FeatureBasic {
private String numberString;
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureParenthesis.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureParenthesis.java
similarity index 50%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureParenthesis.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureParenthesis.java
index 37234b9d..dc30b365 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureParenthesis.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureParenthesis.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Expression;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Expression;
public class FeatureParenthesis extends FeatureSingleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeaturePower.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeaturePower.java
similarity index 57%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeaturePower.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeaturePower.java
index b32c42ea..7490c132 100644
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeaturePower.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeaturePower.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Power;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Power;
public class FeaturePower extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeaturePowerChar.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeaturePowerChar.java
similarity index 52%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeaturePowerChar.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeaturePowerChar.java
index 732271f4..ff64ef04 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeaturePowerChar.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeaturePowerChar.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
public class FeaturePowerChar extends FeatureSingleImpl {
diff --git a/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSine.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSine.java
new file mode 100644
index 00000000..ac9cb9b6
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSine.java
@@ -0,0 +1,19 @@
+package it.cavallium.warppi.math.parser.features;
+
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.trigonometry.Sine;
+
+public class FeatureSine extends FeatureSingleImpl {
+
+ public FeatureSine(Object child) {
+ super(child);
+ }
+
+ @Override
+ public Function toFunction(MathContext context) throws Error {
+ return new Sine(context, getFunction1());
+ }
+
+}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSingleImpl.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSingleImpl.java
similarity index 64%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureSingleImpl.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureSingleImpl.java
index 67fca4b8..37d9dfd1 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSingleImpl.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSingleImpl.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.parser.features.interfaces.FeatureSingle;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.parser.features.interfaces.FeatureSingle;
public abstract class FeatureSingleImpl implements FeatureSingle {
private Object child;
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSquareRoot.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSquareRoot.java
similarity index 55%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureSquareRoot.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureSquareRoot.java
index dfbbf20f..6960450d 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSquareRoot.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSquareRoot.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.RootSquare;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.RootSquare;
public class FeatureSquareRoot extends FeatureSingleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSubtraction.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSubtraction.java
similarity index 53%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureSubtraction.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureSubtraction.java
index 6e56b2f6..1fba8056 100644
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSubtraction.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSubtraction.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Subtraction;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Subtraction;
public class FeatureSubtraction extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSum.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSum.java
similarity index 57%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureSum.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureSum.java
index fed3d415..6edc8827 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSum.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSum.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Sum;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Sum;
public class FeatureSum extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSumSubtraction.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSumSubtraction.java
similarity index 59%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureSumSubtraction.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureSumSubtraction.java
index c6b22fe6..11dd23d2 100644
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSumSubtraction.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureSumSubtraction.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.SumSubtraction;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.SumSubtraction;
public class FeatureSumSubtraction extends FeatureDoubleImpl {
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureVariable.java b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureVariable.java
similarity index 50%
rename from src/main/java/org/warp/picalculator/math/parser/features/FeatureVariable.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/FeatureVariable.java
index 0480ae8d..25d4decf 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureVariable.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/FeatureVariable.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.math.parser.features;
+package it.cavallium.warppi.math.parser.features;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Variable;
-import org.warp.picalculator.math.functions.Variable.V_TYPE;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Variable;
+import it.cavallium.warppi.math.functions.Variable.V_TYPE;
public class FeatureVariable extends FeatureChar {
diff --git a/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/Feature.java b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/Feature.java
new file mode 100755
index 00000000..48fc92da
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/Feature.java
@@ -0,0 +1,11 @@
+package it.cavallium.warppi.math.parser.features.interfaces;
+
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+
+public abstract interface Feature {
+
+ public Function toFunction(MathContext context) throws Error;
+
+}
diff --git a/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureBasic.java b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureBasic.java
new file mode 100755
index 00000000..aaea3469
--- /dev/null
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureBasic.java
@@ -0,0 +1,3 @@
+package it.cavallium.warppi.math.parser.features.interfaces;
+
+public interface FeatureBasic extends Feature {}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureDouble.java b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureDouble.java
similarity index 71%
rename from src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureDouble.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureDouble.java
index 86c4e6f0..645141fb 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureDouble.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureDouble.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.math.parser.features.interfaces;
+package it.cavallium.warppi.math.parser.features.interfaces;
public interface FeatureDouble extends Feature {
public Object getChild1();
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureMultiple.java b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureMultiple.java
similarity index 78%
rename from src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureMultiple.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureMultiple.java
index c7807356..62bc2b9c 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureMultiple.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureMultiple.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.math.parser.features.interfaces;
+package it.cavallium.warppi.math.parser.features.interfaces;
public interface FeatureMultiple extends Feature {
public Object[] getChildren();
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureSingle.java b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureSingle.java
similarity index 62%
rename from src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureSingle.java
rename to src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureSingle.java
index 39895f44..70f0571d 100755
--- a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureSingle.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureSingle.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.math.parser.features.interfaces;
+package it.cavallium.warppi.math.parser.features.interfaces;
public interface FeatureSingle extends Feature {
public Object getChild();
diff --git a/src/main/java/org/warp/picalculator/math/parser/steps/AddImplicitMultiplications.java b/src/main/java/it/cavallium/warppi/math/parser/steps/AddImplicitMultiplications.java
similarity index 76%
rename from src/main/java/org/warp/picalculator/math/parser/steps/AddImplicitMultiplications.java
rename to src/main/java/it/cavallium/warppi/math/parser/steps/AddImplicitMultiplications.java
index 185f1a76..6984a027 100644
--- a/src/main/java/org/warp/picalculator/math/parser/steps/AddImplicitMultiplications.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/steps/AddImplicitMultiplications.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.math.parser.steps;
-
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.parser.MathParserStep;
+package it.cavallium.warppi.math.parser.steps;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.parser.MathParserStep;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class AddImplicitMultiplications implements MathParserStep {
diff --git a/src/main/java/org/warp/picalculator/math/parser/steps/FixMultiplicationsAndDivisions.java b/src/main/java/it/cavallium/warppi/math/parser/steps/FixMultiplicationsAndDivisions.java
similarity index 75%
rename from src/main/java/org/warp/picalculator/math/parser/steps/FixMultiplicationsAndDivisions.java
rename to src/main/java/it/cavallium/warppi/math/parser/steps/FixMultiplicationsAndDivisions.java
index 5717637a..f2ecfc7c 100644
--- a/src/main/java/org/warp/picalculator/math/parser/steps/FixMultiplicationsAndDivisions.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/steps/FixMultiplicationsAndDivisions.java
@@ -1,13 +1,12 @@
-package org.warp.picalculator.math.parser.steps;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.parser.MathParserStep;
+package it.cavallium.warppi.math.parser.steps;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.parser.MathParserStep;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class FixMultiplicationsAndDivisions implements MathParserStep {
diff --git a/src/main/java/org/warp/picalculator/math/parser/steps/FixSingleFunctionArgs.java b/src/main/java/it/cavallium/warppi/math/parser/steps/FixSingleFunctionArgs.java
similarity index 73%
rename from src/main/java/org/warp/picalculator/math/parser/steps/FixSingleFunctionArgs.java
rename to src/main/java/it/cavallium/warppi/math/parser/steps/FixSingleFunctionArgs.java
index b65d36f2..900ddf71 100644
--- a/src/main/java/org/warp/picalculator/math/parser/steps/FixSingleFunctionArgs.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/steps/FixSingleFunctionArgs.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.parser.steps;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.parser.MathParserStep;
+package it.cavallium.warppi.math.parser.steps;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.parser.MathParserStep;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/org/warp/picalculator/math/parser/steps/FixSumsAndSubtractions.java b/src/main/java/it/cavallium/warppi/math/parser/steps/FixSumsAndSubtractions.java
similarity index 73%
rename from src/main/java/org/warp/picalculator/math/parser/steps/FixSumsAndSubtractions.java
rename to src/main/java/it/cavallium/warppi/math/parser/steps/FixSumsAndSubtractions.java
index 3b9cd5f5..dd9cc736 100644
--- a/src/main/java/org/warp/picalculator/math/parser/steps/FixSumsAndSubtractions.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/steps/FixSumsAndSubtractions.java
@@ -1,14 +1,13 @@
-package org.warp.picalculator.math.parser.steps;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.parser.MathParserStep;
+package it.cavallium.warppi.math.parser.steps;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.parser.MathParserStep;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class FixSumsAndSubtractions implements MathParserStep {
diff --git a/src/main/java/org/warp/picalculator/math/parser/steps/JoinNumberAndVariables.java b/src/main/java/it/cavallium/warppi/math/parser/steps/JoinNumberAndVariables.java
similarity index 68%
rename from src/main/java/org/warp/picalculator/math/parser/steps/JoinNumberAndVariables.java
rename to src/main/java/it/cavallium/warppi/math/parser/steps/JoinNumberAndVariables.java
index db1fd56b..76c53937 100644
--- a/src/main/java/org/warp/picalculator/math/parser/steps/JoinNumberAndVariables.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/steps/JoinNumberAndVariables.java
@@ -1,14 +1,13 @@
-package org.warp.picalculator.math.parser.steps;
-
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Variable;
-import org.warp.picalculator.math.parser.MathParserStep;
+package it.cavallium.warppi.math.parser.steps;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Variable;
+import it.cavallium.warppi.math.parser.MathParserStep;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class JoinNumberAndVariables implements MathParserStep {
diff --git a/src/main/java/org/warp/picalculator/math/parser/steps/RemoveParentheses.java b/src/main/java/it/cavallium/warppi/math/parser/steps/RemoveParentheses.java
similarity index 71%
rename from src/main/java/org/warp/picalculator/math/parser/steps/RemoveParentheses.java
rename to src/main/java/it/cavallium/warppi/math/parser/steps/RemoveParentheses.java
index ae6b6f99..4d8f829a 100644
--- a/src/main/java/org/warp/picalculator/math/parser/steps/RemoveParentheses.java
+++ b/src/main/java/it/cavallium/warppi/math/parser/steps/RemoveParentheses.java
@@ -1,11 +1,10 @@
-package org.warp.picalculator.math.parser.steps;
-
-import org.warp.picalculator.IntegerObj;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.parser.MathParserStep;
+package it.cavallium.warppi.math.parser.steps;
+import it.cavallium.warppi.IntegerObj;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.parser.MathParserStep;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class RemoveParentheses implements MathParserStep {
diff --git a/src/main/java/org/warp/picalculator/math/rules/Rule.java b/src/main/java/it/cavallium/warppi/math/rules/Rule.java
similarity index 81%
rename from src/main/java/org/warp/picalculator/math/rules/Rule.java
rename to src/main/java/it/cavallium/warppi/math/rules/Rule.java
index 7a5dbe0e..8a8ebd4d 100644
--- a/src/main/java/org/warp/picalculator/math/rules/Rule.java
+++ b/src/main/java/it/cavallium/warppi/math/rules/Rule.java
@@ -1,8 +1,7 @@
-package org.warp.picalculator.math.rules;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
+package it.cavallium.warppi.math.rules;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/org/warp/picalculator/math/rules/RuleType.java b/src/main/java/it/cavallium/warppi/math/rules/RuleType.java
similarity index 83%
rename from src/main/java/org/warp/picalculator/math/rules/RuleType.java
rename to src/main/java/it/cavallium/warppi/math/rules/RuleType.java
index ce6341c7..81636942 100644
--- a/src/main/java/org/warp/picalculator/math/rules/RuleType.java
+++ b/src/main/java/it/cavallium/warppi/math/rules/RuleType.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.math.rules;
+package it.cavallium.warppi.math.rules;
public enum RuleType {
/**
diff --git a/src/main/java/org/warp/picalculator/math/rules/RulesManager.java b/src/main/java/it/cavallium/warppi/math/rules/RulesManager.java
similarity index 88%
rename from src/main/java/org/warp/picalculator/math/rules/RulesManager.java
rename to src/main/java/it/cavallium/warppi/math/rules/RulesManager.java
index 01e7020d..ca358a80 100644
--- a/src/main/java/org/warp/picalculator/math/rules/RulesManager.java
+++ b/src/main/java/it/cavallium/warppi/math/rules/RulesManager.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.math.rules;
+package it.cavallium.warppi.math.rules;
import java.io.File;
import java.io.FileInputStream;
@@ -11,23 +11,22 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.ZipUtils;
-import org.warp.picalculator.deps.DJDTCompiler;
-import org.warp.picalculator.deps.DStandardOpenOption;
-import org.warp.picalculator.deps.DSystem;
-import org.warp.picalculator.deps.DURLClassLoader;
-import org.warp.picalculator.deps.StorageUtils;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.functions.Variable;
-import org.warp.picalculator.math.functions.Variable.V_TYPE;
-import org.warp.picalculator.math.solver.MathSolver;
-
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.ZipUtils;
+import it.cavallium.warppi.deps.DJDTCompiler;
+import it.cavallium.warppi.deps.DStandardOpenOption;
+import it.cavallium.warppi.deps.DSystem;
+import it.cavallium.warppi.deps.DURLClassLoader;
+import it.cavallium.warppi.deps.StorageUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Variable;
+import it.cavallium.warppi.math.functions.Variable.V_TYPE;
+import it.cavallium.warppi.math.solver.MathSolver;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class RulesManager {
@@ -168,7 +167,7 @@ public class RulesManager {
final String javaClassDeclaration = textArray[3].substring(6);
int extIndex = javaClassDeclaration.lastIndexOf('.');
final String javaClassNameOnly = javaClassDeclaration.substring(extIndex + 1, javaClassDeclaration.length());
- final String javaClassNameAndPath = new StringBuilder("org.warp.picalculator.math.rules.").append(javaClassDeclaration).toString();
+ final String javaClassNameAndPath = new StringBuilder("it.cavallium.warppi.math.rules.").append(javaClassDeclaration).toString();
extIndex = javaClassNameAndPath.lastIndexOf('.');
final String javaCode = new StringBuilder("package ").append(javaClassNameAndPath.substring(0, extIndex >= 0 ? extIndex : javaClassNameAndPath.length())).append(";\n").append(textArray[5]).toString();
final File tDirPath = StorageUtils.getParent(StorageUtils.resolve(tDir, javaClassNameAndPath.replace('.', File.separatorChar)));
@@ -206,7 +205,7 @@ public class RulesManager {
if (textArray[3].contains("PATH=")) {
final String javaClassName = textArray[3].substring(6);
System.err.println(javaClassName);
- final String javaClassNameAndPath = new StringBuilder("org.warp.picalculator.math.rules.").append(javaClassName).toString();
+ final String javaClassNameAndPath = new StringBuilder("it.cavallium.warppi.math.rules.").append(javaClassName).toString();
try {
return loadClassRuleDirectly(javaClassNameAndPath, tDir);
} catch (final Exception ex) {
diff --git a/src/main/java/org/warp/picalculator/math/rules/methods/DivisionRule1.java b/src/main/java/it/cavallium/warppi/math/rules/methods/DivisionRule1.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/math/rules/methods/DivisionRule1.java
rename to src/main/java/it/cavallium/warppi/math/rules/methods/DivisionRule1.java
index fedf4bd5..1784a3e6 100755
--- a/src/main/java/org/warp/picalculator/math/rules/methods/DivisionRule1.java
+++ b/src/main/java/it/cavallium/warppi/math/rules/methods/DivisionRule1.java
@@ -1,12 +1,11 @@
-package org.warp.picalculator.math.rules.methods;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
+package it.cavallium.warppi.math.rules.methods;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/org/warp/picalculator/math/rules/methods/MultiplicationMethod1.java b/src/main/java/it/cavallium/warppi/math/rules/methods/MultiplicationMethod1.java
similarity index 89%
rename from src/main/java/org/warp/picalculator/math/rules/methods/MultiplicationMethod1.java
rename to src/main/java/it/cavallium/warppi/math/rules/methods/MultiplicationMethod1.java
index db9cfe09..f4c319b6 100755
--- a/src/main/java/org/warp/picalculator/math/rules/methods/MultiplicationMethod1.java
+++ b/src/main/java/it/cavallium/warppi/math/rules/methods/MultiplicationMethod1.java
@@ -1,10 +1,9 @@
-package org.warp.picalculator.math.rules.methods;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
+package it.cavallium.warppi.math.rules.methods;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/org/warp/picalculator/math/rules/methods/SumMethod1.java b/src/main/java/it/cavallium/warppi/math/rules/methods/SumMethod1.java
similarity index 87%
rename from src/main/java/org/warp/picalculator/math/rules/methods/SumMethod1.java
rename to src/main/java/it/cavallium/warppi/math/rules/methods/SumMethod1.java
index b64f406f..b450dc00 100755
--- a/src/main/java/org/warp/picalculator/math/rules/methods/SumMethod1.java
+++ b/src/main/java/it/cavallium/warppi/math/rules/methods/SumMethod1.java
@@ -1,16 +1,15 @@
-package org.warp.picalculator.math.rules.methods;
+package it.cavallium.warppi.math.rules.methods;
import java.math.BigDecimal;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Negative;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Negative;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/java/org/warp/picalculator/math/solver/MathSolver.java b/src/main/java/it/cavallium/warppi/math/solver/MathSolver.java
similarity index 93%
rename from src/main/java/org/warp/picalculator/math/solver/MathSolver.java
rename to src/main/java/it/cavallium/warppi/math/solver/MathSolver.java
index ab333a15..e96c9137 100644
--- a/src/main/java/org/warp/picalculator/math/solver/MathSolver.java
+++ b/src/main/java/it/cavallium/warppi/math/solver/MathSolver.java
@@ -1,15 +1,14 @@
-package org.warp.picalculator.math.solver;
+package it.cavallium.warppi.math.solver;
import java.util.List;
-import org.warp.picalculator.ConsoleUtils;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.deps.DAtomicInteger;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.ConsoleUtils;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.deps.DAtomicInteger;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public class MathSolver {
diff --git a/src/main/java/org/warp/picalculator/math/solver/SolveMethod.java b/src/main/java/it/cavallium/warppi/math/solver/SolveMethod.java
similarity index 65%
rename from src/main/java/org/warp/picalculator/math/solver/SolveMethod.java
rename to src/main/java/it/cavallium/warppi/math/solver/SolveMethod.java
index d57c9d00..987ea933 100755
--- a/src/main/java/org/warp/picalculator/math/solver/SolveMethod.java
+++ b/src/main/java/it/cavallium/warppi/math/solver/SolveMethod.java
@@ -1,7 +1,6 @@
-package org.warp.picalculator.math.solver;
-
-import org.warp.picalculator.math.functions.equations.Equation;
+package it.cavallium.warppi.math.solver;
+import it.cavallium.warppi.math.functions.equations.Equation;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
public interface SolveMethod {
diff --git a/src/main/java/org/nevec/rjm/Bernoulli.java b/src/main/java/org/nevec/rjm/Bernoulli.java
index 953087ec..fe4acca0 100755
--- a/src/main/java/org/nevec/rjm/Bernoulli.java
+++ b/src/main/java/org/nevec/rjm/Bernoulli.java
@@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.BigInteger;
import java.util.Vector;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* Bernoulli numbers.
diff --git a/src/main/java/org/nevec/rjm/BigDecimalMath.java b/src/main/java/org/nevec/rjm/BigDecimalMath.java
index 651e71a0..8fa928c9 100755
--- a/src/main/java/org/nevec/rjm/BigDecimalMath.java
+++ b/src/main/java/org/nevec/rjm/BigDecimalMath.java
@@ -5,7 +5,7 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.security.ProviderException;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* BigDecimal special functions.
diff --git a/src/main/java/org/nevec/rjm/BigIntegerMath.java b/src/main/java/org/nevec/rjm/BigIntegerMath.java
index 98d27083..0872422b 100755
--- a/src/main/java/org/nevec/rjm/BigIntegerMath.java
+++ b/src/main/java/org/nevec/rjm/BigIntegerMath.java
@@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.BigInteger;
import java.util.Vector;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* BigInteger special functions and Number theory.
diff --git a/src/main/java/org/nevec/rjm/BigIntegerPoly.java b/src/main/java/org/nevec/rjm/BigIntegerPoly.java
index 3ab9fbbb..8a06fe0f 100755
--- a/src/main/java/org/nevec/rjm/BigIntegerPoly.java
+++ b/src/main/java/org/nevec/rjm/BigIntegerPoly.java
@@ -5,7 +5,7 @@ import java.math.BigInteger;
import java.util.Scanner;
import java.util.Vector;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* Polynomial with integer coefficients.
diff --git a/src/main/java/org/nevec/rjm/BigSurd.java b/src/main/java/org/nevec/rjm/BigSurd.java
index d5fd201c..cdfa585d 100755
--- a/src/main/java/org/nevec/rjm/BigSurd.java
+++ b/src/main/java/org/nevec/rjm/BigSurd.java
@@ -5,8 +5,8 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.security.ProviderException;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Utils;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Utils;
/**
* Square roots on the real line.
diff --git a/src/main/java/org/nevec/rjm/BigSurdVec.java b/src/main/java/org/nevec/rjm/BigSurdVec.java
index e88f1b6e..310c9cc1 100755
--- a/src/main/java/org/nevec/rjm/BigSurdVec.java
+++ b/src/main/java/org/nevec/rjm/BigSurdVec.java
@@ -5,8 +5,8 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.util.Vector;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Utils;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Utils;
/**
* A BigSurdVec represents an algebraic sum or differences of values which each
diff --git a/src/main/java/org/nevec/rjm/Ifactor.java b/src/main/java/org/nevec/rjm/Ifactor.java
index c4cd9a98..8955a3f8 100755
--- a/src/main/java/org/nevec/rjm/Ifactor.java
+++ b/src/main/java/org/nevec/rjm/Ifactor.java
@@ -4,7 +4,7 @@ import java.math.BigInteger;
import java.util.Collections;
import java.util.Vector;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* Factored integers.
diff --git a/src/main/java/org/nevec/rjm/RatPoly.java b/src/main/java/org/nevec/rjm/RatPoly.java
index a9c12a15..53d7db5a 100755
--- a/src/main/java/org/nevec/rjm/RatPoly.java
+++ b/src/main/java/org/nevec/rjm/RatPoly.java
@@ -7,7 +7,7 @@ import java.util.Random;
import java.util.Scanner;
import java.util.Vector;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* A one-parameter polynomial with rational coefficients.
diff --git a/src/main/java/org/nevec/rjm/Rational.java b/src/main/java/org/nevec/rjm/Rational.java
index 2e8de13d..f1017574 100755
--- a/src/main/java/org/nevec/rjm/Rational.java
+++ b/src/main/java/org/nevec/rjm/Rational.java
@@ -5,8 +5,8 @@ import java.math.BigInteger;
import java.math.MathContext;
import java.math.RoundingMode;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
/**
* Fractions (rational numbers). They are divisions of two BigInteger numbers,
diff --git a/src/main/java/org/nevec/rjm/SafeMathContext.java b/src/main/java/org/nevec/rjm/SafeMathContext.java
index 9f10f1f8..c2b3932a 100644
--- a/src/main/java/org/nevec/rjm/SafeMathContext.java
+++ b/src/main/java/org/nevec/rjm/SafeMathContext.java
@@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.MathContext;
import java.math.RoundingMode;
-import org.warp.picalculator.ConsoleUtils;
+import it.cavallium.warppi.ConsoleUtils;
public final class SafeMathContext {
diff --git a/src/main/java/org/nevec/rjm/Wigner3j.java b/src/main/java/org/nevec/rjm/Wigner3j.java
index 43988f4d..dbe27404 100755
--- a/src/main/java/org/nevec/rjm/Wigner3j.java
+++ b/src/main/java/org/nevec/rjm/Wigner3j.java
@@ -3,7 +3,7 @@ package org.nevec.rjm;
import java.math.BigInteger;
import java.util.Scanner;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* Exact representations of Wigner 3jm and 3nj values of half-integer arguments.
diff --git a/src/main/java/org/nevec/rjm/Wigner3jGUI.java b/src/main/java/org/nevec/rjm/Wigner3jGUI.java
index c841e86b..d712dd2a 100755
--- a/src/main/java/org/nevec/rjm/Wigner3jGUI.java
+++ b/src/main/java/org/nevec/rjm/Wigner3jGUI.java
@@ -16,7 +16,7 @@ import javax.swing.JList;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.warp.picalculator.Error;
+import it.cavallium.warppi.Error;
/**
* An interactive interface to the Wigner3j class. The GUI allows to preselect
diff --git a/src/main/java/org/warp/picalculator/KeyboardTest.java b/src/main/java/org/warp/picalculator/KeyboardTest.java
deleted file mode 100755
index 442f0376..00000000
--- a/src/main/java/org/warp/picalculator/KeyboardTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.warp.picalculator;
-
-import java.io.IOException;
-
-import org.warp.picalculator.boot.Main;
-import org.warp.picalculator.device.PIHardwareDisplay;
-import org.warp.picalculator.gui.CalculatorHUD;
-import org.warp.picalculator.gui.screens.KeyboardDebugScreen;
-
-public class KeyboardTest {
-
- public static void main(String[] args) throws InterruptedException, Error, IOException {
- new PICalculator(new KeyboardDebugScreen(), new PIHardwareDisplay(), new CalculatorHUD(), Main.parseStartupArguments(args));
- }
-}
diff --git a/src/main/java/org/warp/picalculator/PICalculator.java b/src/main/java/org/warp/picalculator/PICalculator.java
deleted file mode 100755
index 8d24a011..00000000
--- a/src/main/java/org/warp/picalculator/PICalculator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.warp.picalculator;
-
-import java.io.IOException;
-
-import org.warp.picalculator.boot.StartupArguments;
-import org.warp.picalculator.deps.DGpio;
-import org.warp.picalculator.deps.DSystem;
-import org.warp.picalculator.device.HardwareDevice;
-import org.warp.picalculator.device.HardwareTouchDevice;
-import org.warp.picalculator.device.InputManager;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.device.PIHardwareDisplay;
-import org.warp.picalculator.device.PIHardwareTouchDevice;
-import org.warp.picalculator.gui.CalculatorHUD;
-import org.warp.picalculator.gui.DisplayManager;
-import org.warp.picalculator.gui.HUD;
-import org.warp.picalculator.gui.HardwareDisplay;
-import org.warp.picalculator.gui.screens.LoadingScreen;
-import org.warp.picalculator.gui.screens.Screen;
-import org.warp.picalculator.math.rules.RulesManager;
-
-public class PICalculator {
- public static PICalculator instance;
-
- public PICalculator(StartupArguments args) throws InterruptedException, IOException {
- this(new LoadingScreen(), new PIHardwareDisplay(), new CalculatorHUD(), args);
- }
-
- public PICalculator(Screen screen, HardwareDisplay disp, HUD hud, StartupArguments args) throws InterruptedException, IOException {
- ConsoleUtils.out.println("WarpPI Calculator");
- initializeEnvironment(args);
- Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
- PlatformUtils.setThreadName(Thread.currentThread(), "Main thread");
- DisplayManager dm = new DisplayManager(disp, hud, screen, "WarpPI Calculator by Andrea Cavalli (@Cavallium)");
- Keyboard k = new Keyboard();
- HardwareTouchDevice touch = new PIHardwareTouchDevice(false, false, false);
- InputManager im = new InputManager(k, touch);
- HardwareDevice hardwareDevice = new HardwareDevice(dm, im);
- hardwareDevice.setup(() -> {
- try {
- HardwareDevice.INSTANCE.getDisplayManager().setBrightness(0.2f);
- RulesManager.initialize();
- RulesManager.warmUp();
- if (screen instanceof LoadingScreen) {
- ((LoadingScreen) screen).loaded = true;
- }
- HardwareDevice.INSTANCE.getDisplayManager().waitForExit();
- } catch (InterruptedException | Error e) {
- e.printStackTrace();
- }
- ConsoleUtils.out.println(1, "Shutdown...");
- beforeShutdown();
- ConsoleUtils.out.println(1, "");
- ConsoleUtils.out.println(1, "Closed.");
- DSystem.exit(0);
- });
- }
-
- public void initializeEnvironment(StartupArguments args) throws IOException {
- instance = this;
- ClassUtils.classLoader = this.getClass();
- StaticVars.startupArguments = args;
- Utils.debugThirdScreen = StaticVars.debugOn & false;
- StaticVars.debugWindow2x = args.isZoomed();
- if (args.isVerboseLoggingEnabled() || args.isDebugEnabled()) {
- StaticVars.outputLevel = ConsoleUtils.OUTPUTLEVEL_DEBUG_VERBOSE;
- }
- ConsoleUtils.out.println(ConsoleUtils.OUTPUTLEVEL_DEBUG_MIN, args);
- checkDeviceType();
- if (Utils.isRunningOnRaspberry() && args.isRaspberryModeAllowed()) {
- DGpio.wiringPiSetupPhys();
- DGpio.pinMode(12, DGpio.PWM_OUTPUT);
- } else {
- StaticVars.screenPos = new int[] { 0, 0 };
- StaticVars.debugOn = true;
- }
- }
-
- private void checkDeviceType() {
- // TODO Auto-generated method stub
-
- }
-
- public void beforeShutdown() {
- Keyboard.stopKeyboard();
- }
-}
diff --git a/src/main/java/org/warp/picalculator/event/Event.java b/src/main/java/org/warp/picalculator/event/Event.java
deleted file mode 100644
index 0691a9d9..00000000
--- a/src/main/java/org/warp/picalculator/event/Event.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.warp.picalculator.event;
-
-public interface Event {
-
-}
diff --git a/src/main/java/org/warp/picalculator/extra/mario/MarioEvent.java b/src/main/java/org/warp/picalculator/extra/mario/MarioEvent.java
deleted file mode 100644
index 258c7889..00000000
--- a/src/main/java/org/warp/picalculator/extra/mario/MarioEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.warp.picalculator.extra.mario;
-
-public class MarioEvent {
-
-}
diff --git a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSine.java b/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSine.java
deleted file mode 100644
index 868793db..00000000
--- a/src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSine.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.warp.picalculator.gui.expression.blocks;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.FeatureSine;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
-
-public class BlockSine extends BlockParenthesisAbstract {
- public BlockSine() {
- super("SIN");
- }
-
- @Override
- public Feature toFeature(MathContext context) throws Error {
- final Function cont = getNumberContainer().toFunction(context);
- return new FeatureSine(cont);
- }
-}
diff --git a/src/main/java/org/warp/picalculator/gui/expression/layouts/InputLayout.java b/src/main/java/org/warp/picalculator/gui/expression/layouts/InputLayout.java
deleted file mode 100755
index ccc275ee..00000000
--- a/src/main/java/org/warp/picalculator/gui/expression/layouts/InputLayout.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.warp.picalculator.gui.expression.layouts;
-
-import org.warp.picalculator.gui.expression.blocks.Block;
-
-public interface InputLayout {
- public Block parseChar(char c);
-}
diff --git a/src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java b/src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java
deleted file mode 100755
index dd5867c7..00000000
--- a/src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.warp.picalculator.gui.expression.layouts;
-
-public interface OutputLayout {}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureChar.java b/src/main/java/org/warp/picalculator/math/parser/features/FeatureChar.java
deleted file mode 100755
index db832d82..00000000
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureChar.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.warp.picalculator.math.parser.features;
-
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.parser.features.interfaces.Feature;
-
-public class FeatureChar implements Feature {
-
- public final char ch;
-
- public FeatureChar(char ch) {
- this.ch = ch;
- }
-
- @Override
- public Function toFunction(MathContext context) {
- return null;
- }
-
-}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSine.java b/src/main/java/org/warp/picalculator/math/parser/features/FeatureSine.java
deleted file mode 100644
index e9e79bd6..00000000
--- a/src/main/java/org/warp/picalculator/math/parser/features/FeatureSine.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.warp.picalculator.math.parser.features;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.trigonometry.Sine;
-
-public class FeatureSine extends FeatureSingleImpl {
-
- public FeatureSine(Object child) {
- super(child);
- }
-
- @Override
- public Function toFunction(MathContext context) throws Error {
- return new Sine(context, getFunction1());
- }
-
-}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/Feature.java b/src/main/java/org/warp/picalculator/math/parser/features/interfaces/Feature.java
deleted file mode 100755
index 89b0360a..00000000
--- a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/Feature.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.warp.picalculator.math.parser.features.interfaces;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-
-public abstract interface Feature {
-
- public Function toFunction(MathContext context) throws Error;
-
-}
diff --git a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureBasic.java b/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureBasic.java
deleted file mode 100755
index 80e8569e..00000000
--- a/src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureBasic.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.warp.picalculator.math.parser.features.interfaces;
-
-public interface FeatureBasic extends Feature {}
diff --git a/src/main/jni/makefileOLD b/src/main/jni/makefileOLD
index 8c494755..17d2aa45 100644
--- a/src/main/jni/makefileOLD
+++ b/src/main/jni/makefileOLD
@@ -1,7 +1,7 @@
# Define a variable for classpath
CLASS_PATH = ../../../target/classes
-PATH1A = org/warp/picalculator
-PATH1B = org.warp.picalculator
+PATH1A = it/cavallium/warppi
+PATH1B = it.cavallium.warppi
# Define a virtual path for .class in the bin directory
vpath %.class $(CLASS_PATH)/$(PATH1A)
diff --git a/src/main/rules/rules/ExpandRule1.java b/src/main/rules/rules/ExpandRule1.java
index 31f9940f..16c0edb1 100644
--- a/src/main/rules/rules/ExpandRule1.java
+++ b/src/main/rules/rules/ExpandRule1.java
@@ -6,19 +6,19 @@ SETTINGS: (please don't move this part)
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
/**
* Expand rule
diff --git a/src/main/rules/rules/ExpandRule2.java b/src/main/rules/rules/ExpandRule2.java
index 16255bdf..ee124d91 100644
--- a/src/main/rules/rules/ExpandRule2.java
+++ b/src/main/rules/rules/ExpandRule2.java
@@ -4,20 +4,19 @@ SETTINGS: (please don't move this part)
PATH=ExpandRule2
*/
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
/**
* Expand rule
diff --git a/src/main/rules/rules/ExpandRule5.java b/src/main/rules/rules/ExpandRule5.java
index cfed4b72..743f796b 100644
--- a/src/main/rules/rules/ExpandRule5.java
+++ b/src/main/rules/rules/ExpandRule5.java
@@ -4,21 +4,19 @@ SETTINGS: (please don't move this part)
PATH=ExpandRule5
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Negative;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Negative;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule1.java b/src/main/rules/rules/ExponentRule1.java
index 867e6274..f184173a 100644
--- a/src/main/rules/rules/ExponentRule1.java
+++ b/src/main/rules/rules/ExponentRule1.java
@@ -4,22 +4,16 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule1
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule15.java b/src/main/rules/rules/ExponentRule15.java
index 4f0519d4..4685691b 100644
--- a/src/main/rules/rules/ExponentRule15.java
+++ b/src/main/rules/rules/ExponentRule15.java
@@ -4,23 +4,17 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule15
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule16.java b/src/main/rules/rules/ExponentRule16.java
index bc1c7789..d70f9d82 100644
--- a/src/main/rules/rules/ExponentRule16.java
+++ b/src/main/rules/rules/ExponentRule16.java
@@ -4,24 +4,18 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule16
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule17.java b/src/main/rules/rules/ExponentRule17.java
index 587208cc..46c0cb8a 100644
--- a/src/main/rules/rules/ExponentRule17.java
+++ b/src/main/rules/rules/ExponentRule17.java
@@ -4,24 +4,18 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule17
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.functions.Root;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.functions.Root;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule2.java b/src/main/rules/rules/ExponentRule2.java
index efe69119..414b37d9 100644
--- a/src/main/rules/rules/ExponentRule2.java
+++ b/src/main/rules/rules/ExponentRule2.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule2
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule3.java b/src/main/rules/rules/ExponentRule3.java
index 9c3c7b4e..0102e8b5 100644
--- a/src/main/rules/rules/ExponentRule3.java
+++ b/src/main/rules/rules/ExponentRule3.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule3
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule4.java b/src/main/rules/rules/ExponentRule4.java
index d1e96c33..c10062c8 100644
--- a/src/main/rules/rules/ExponentRule4.java
+++ b/src/main/rules/rules/ExponentRule4.java
@@ -4,24 +4,18 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule4
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Expression;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule8.java b/src/main/rules/rules/ExponentRule8.java
index 7a137743..7d2b0bbc 100644
--- a/src/main/rules/rules/ExponentRule8.java
+++ b/src/main/rules/rules/ExponentRule8.java
@@ -4,23 +4,17 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule8
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/ExponentRule9.java b/src/main/rules/rules/ExponentRule9.java
index 0e83bbf9..da285326 100644
--- a/src/main/rules/rules/ExponentRule9.java
+++ b/src/main/rules/rules/ExponentRule9.java
@@ -4,22 +4,16 @@ SETTINGS: (please don't move this part)
PATH=ExponentRule9
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule1.java b/src/main/rules/rules/FractionsRule1.java
index dd04a574..65ff3b31 100644
--- a/src/main/rules/rules/FractionsRule1.java
+++ b/src/main/rules/rules/FractionsRule1.java
@@ -4,15 +4,14 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule1
*/
-//Imports
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
/**
* Fractions rule
diff --git a/src/main/rules/rules/FractionsRule10.java b/src/main/rules/rules/FractionsRule10.java
index 97f5d0a5..c6c31e89 100644
--- a/src/main/rules/rules/FractionsRule10.java
+++ b/src/main/rules/rules/FractionsRule10.java
@@ -4,25 +4,20 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule10
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
import java.math.BigDecimal;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule11.java b/src/main/rules/rules/FractionsRule11.java
index e344248a..c2a55c0d 100644
--- a/src/main/rules/rules/FractionsRule11.java
+++ b/src/main/rules/rules/FractionsRule11.java
@@ -4,20 +4,16 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule11
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule12.java b/src/main/rules/rules/FractionsRule12.java
index af9397fe..d8966dc7 100644
--- a/src/main/rules/rules/FractionsRule12.java
+++ b/src/main/rules/rules/FractionsRule12.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule12
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule14.java b/src/main/rules/rules/FractionsRule14.java
index 8c45825c..58f439bb 100644
--- a/src/main/rules/rules/FractionsRule14.java
+++ b/src/main/rules/rules/FractionsRule14.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule14
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule2.java b/src/main/rules/rules/FractionsRule2.java
index ec097730..ab0d2a0d 100644
--- a/src/main/rules/rules/FractionsRule2.java
+++ b/src/main/rules/rules/FractionsRule2.java
@@ -4,16 +4,12 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule2
*/
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule3.java b/src/main/rules/rules/FractionsRule3.java
index 29460e90..0bcf6075 100644
--- a/src/main/rules/rules/FractionsRule3.java
+++ b/src/main/rules/rules/FractionsRule3.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule3
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule4.java b/src/main/rules/rules/FractionsRule4.java
index 3a970b0e..3b473419 100644
--- a/src/main/rules/rules/FractionsRule4.java
+++ b/src/main/rules/rules/FractionsRule4.java
@@ -4,22 +4,17 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule4
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule5.java b/src/main/rules/rules/FractionsRule5.java
index 9f59449f..ecf943a8 100644
--- a/src/main/rules/rules/FractionsRule5.java
+++ b/src/main/rules/rules/FractionsRule5.java
@@ -4,25 +4,20 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule5
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
import java.math.BigDecimal;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule6.java b/src/main/rules/rules/FractionsRule6.java
index c7621d08..8ffba685 100644
--- a/src/main/rules/rules/FractionsRule6.java
+++ b/src/main/rules/rules/FractionsRule6.java
@@ -4,23 +4,18 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule6
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule7.java b/src/main/rules/rules/FractionsRule7.java
index 253f60e2..7f738fa9 100644
--- a/src/main/rules/rules/FractionsRule7.java
+++ b/src/main/rules/rules/FractionsRule7.java
@@ -4,25 +4,20 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule7
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
import java.math.BigDecimal;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule8.java b/src/main/rules/rules/FractionsRule8.java
index e1c406a5..98469080 100644
--- a/src/main/rules/rules/FractionsRule8.java
+++ b/src/main/rules/rules/FractionsRule8.java
@@ -4,25 +4,20 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule8
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
import java.math.BigDecimal;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/FractionsRule9.java b/src/main/rules/rules/FractionsRule9.java
index 92ca3d78..8311bcb9 100644
--- a/src/main/rules/rules/FractionsRule9.java
+++ b/src/main/rules/rules/FractionsRule9.java
@@ -4,25 +4,20 @@ SETTINGS: (please don't move this part)
PATH=FractionsRule9
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
import java.math.BigDecimal;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/NumberRule1.java b/src/main/rules/rules/NumberRule1.java
index 8587fd19..0c1a1b44 100644
--- a/src/main/rules/rules/NumberRule1.java
+++ b/src/main/rules/rules/NumberRule1.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=NumberRule1
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/NumberRule2.java b/src/main/rules/rules/NumberRule2.java
index e5fd03ca..ae6d053d 100644
--- a/src/main/rules/rules/NumberRule2.java
+++ b/src/main/rules/rules/NumberRule2.java
@@ -4,21 +4,16 @@ SETTINGS: (please don't move this part)
PATH=NumberRule2
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/NumberRule3.java b/src/main/rules/rules/NumberRule3.java
index 351ae78a..b07413fc 100644
--- a/src/main/rules/rules/NumberRule3.java
+++ b/src/main/rules/rules/NumberRule3.java
@@ -4,25 +4,20 @@ SETTINGS: (please don't move this part)
PATH=NumberRule3
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Negative;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Negative;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/NumberRule4.java b/src/main/rules/rules/NumberRule4.java
index ec034115..96bdb5ff 100644
--- a/src/main/rules/rules/NumberRule4.java
+++ b/src/main/rules/rules/NumberRule4.java
@@ -4,22 +4,17 @@ SETTINGS: (please don't move this part)
PATH=NumberRule4
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/NumberRule5.java b/src/main/rules/rules/NumberRule5.java
index dc2c66cb..1fbfc208 100644
--- a/src/main/rules/rules/NumberRule5.java
+++ b/src/main/rules/rules/NumberRule5.java
@@ -4,25 +4,19 @@ SETTINGS: (please don't move this part)
PATH=NumberRule5
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/NumberRule7.java b/src/main/rules/rules/NumberRule7.java
index 21242a38..ed1030ed 100644
--- a/src/main/rules/rules/NumberRule7.java
+++ b/src/main/rules/rules/NumberRule7.java
@@ -4,22 +4,17 @@ SETTINGS: (please don't move this part)
PATH=NumberRule7
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/UndefinedRule1.java b/src/main/rules/rules/UndefinedRule1.java
index 7c681e3c..0961ab7b 100644
--- a/src/main/rules/rules/UndefinedRule1.java
+++ b/src/main/rules/rules/UndefinedRule1.java
@@ -4,22 +4,17 @@ SETTINGS: (please don't move this part)
PATH=UndefinedRule1
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Power;
-import org.warp.picalculator.math.functions.Undefined;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.functions.Undefined;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/UndefinedRule2.java b/src/main/rules/rules/UndefinedRule2.java
index 1587c857..4e8d2983 100644
--- a/src/main/rules/rules/UndefinedRule2.java
+++ b/src/main/rules/rules/UndefinedRule2.java
@@ -4,22 +4,17 @@ SETTINGS: (please don't move this part)
PATH=UndefinedRule2
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Undefined;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Undefined;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/VariableRule1.java b/src/main/rules/rules/VariableRule1.java
index 649ce89a..5873254b 100644
--- a/src/main/rules/rules/VariableRule1.java
+++ b/src/main/rules/rules/VariableRule1.java
@@ -4,23 +4,17 @@ SETTINGS: (please don't move this part)
PATH=VariableRule1
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/VariableRule2.java b/src/main/rules/rules/VariableRule2.java
index 49c9c40e..d0027eb9 100644
--- a/src/main/rules/rules/VariableRule2.java
+++ b/src/main/rules/rules/VariableRule2.java
@@ -4,24 +4,18 @@ SETTINGS: (please don't move this part)
PATH=VariableRule2
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/VariableRule3.java b/src/main/rules/rules/VariableRule3.java
index e2baa76f..0626380a 100644
--- a/src/main/rules/rules/VariableRule3.java
+++ b/src/main/rules/rules/VariableRule3.java
@@ -4,24 +4,18 @@ SETTINGS: (please don't move this part)
PATH=VariableRule3
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-//Imports
-
-import org.warp.picalculator.Error;
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.MathContext;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
/**
diff --git a/src/main/rules/rules/functions/DivisionRule.java b/src/main/rules/rules/functions/DivisionRule.java
index 1c6bbc9b..8ab59cc3 100644
--- a/src/main/rules/rules/functions/DivisionRule.java
+++ b/src/main/rules/rules/functions/DivisionRule.java
@@ -4,29 +4,27 @@ SETTINGS: (please don't move this part)
PATH=functions.DivisionRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import java.math.BigInteger;
import java.util.LinkedList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.Error;
-
/**
* Division
* a/b = c
diff --git a/src/main/rules/rules/functions/EmptyNumberRule.java b/src/main/rules/rules/functions/EmptyNumberRule.java
index 6afee130..01b2ce4b 100644
--- a/src/main/rules/rules/functions/EmptyNumberRule.java
+++ b/src/main/rules/rules/functions/EmptyNumberRule.java
@@ -4,17 +4,16 @@ SETTINGS: (please don't move this part)
PATH=functions.EmptyNumberRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
/**
* EmptyNumber
diff --git a/src/main/rules/rules/functions/ExpressionRule.java b/src/main/rules/rules/functions/ExpressionRule.java
index 388b5507..6f52e7c8 100644
--- a/src/main/rules/rules/functions/ExpressionRule.java
+++ b/src/main/rules/rules/functions/ExpressionRule.java
@@ -4,23 +4,22 @@ SETTINGS: (please don't move this part)
PATH=functions.ExpressionRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Expression;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Expression;
/**
* Expression
diff --git a/src/main/rules/rules/functions/JokeRule.java b/src/main/rules/rules/functions/JokeRule.java
index ca26d8b5..97220c14 100644
--- a/src/main/rules/rules/functions/JokeRule.java
+++ b/src/main/rules/rules/functions/JokeRule.java
@@ -4,17 +4,16 @@ SETTINGS: (please don't move this part)
PATH=functions.JokeRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
/**
* Joke
diff --git a/src/main/rules/rules/functions/MultiplicationRule.java b/src/main/rules/rules/functions/MultiplicationRule.java
index a6e3b881..7e262500 100644
--- a/src/main/rules/rules/functions/MultiplicationRule.java
+++ b/src/main/rules/rules/functions/MultiplicationRule.java
@@ -4,23 +4,22 @@ SETTINGS: (please don't move this part)
PATH=functions.MultiplicationRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Division;
/**
* Multiplication
diff --git a/src/main/rules/rules/functions/NegativeRule.java b/src/main/rules/rules/functions/NegativeRule.java
index 49458c65..5bc304f1 100644
--- a/src/main/rules/rules/functions/NegativeRule.java
+++ b/src/main/rules/rules/functions/NegativeRule.java
@@ -4,21 +4,21 @@ SETTINGS: (please don't move this part)
PATH=functions.NegativeRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Negative;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Negative;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
+
import java.lang.NullPointerException;
import java.lang.NumberFormatException;
import java.lang.ArithmeticException;
diff --git a/src/main/rules/rules/functions/NumberRule.java b/src/main/rules/rules/functions/NumberRule.java
index f6fc8cf4..ebd9fcea 100644
--- a/src/main/rules/rules/functions/NumberRule.java
+++ b/src/main/rules/rules/functions/NumberRule.java
@@ -4,19 +4,19 @@ SETTINGS: (please don't move this part)
PATH=functions.NumberRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Number;
+
import java.math.BigInteger;
/**
diff --git a/src/main/rules/rules/functions/PowerRule.java b/src/main/rules/rules/functions/PowerRule.java
index 03b9a10f..67fdbe1d 100644
--- a/src/main/rules/rules/functions/PowerRule.java
+++ b/src/main/rules/rules/functions/PowerRule.java
@@ -4,24 +4,23 @@ SETTINGS: (please don't move this part)
PATH=functions.PowerRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Power;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Power;
/**
* Power
@@ -49,7 +48,7 @@ public class PowerRule implements Rule {
- An ObjectArrayList if it did something
*/
@Override
- public ObjectArrayList execute(Function f) throws org.warp.picalculator.Error, InterruptedException {
+ public ObjectArrayList execute(Function f) throws it.cavallium.warppi.Error, InterruptedException {
if (f instanceof Power) {
ObjectArrayList result = new ObjectArrayList<>();
Function variable1 = ((FunctionOperator) f).getParameter1();
diff --git a/src/main/rules/rules/functions/RootRule.java b/src/main/rules/rules/functions/RootRule.java
index 2ecc5e1a..e704bceb 100644
--- a/src/main/rules/rules/functions/RootRule.java
+++ b/src/main/rules/rules/functions/RootRule.java
@@ -4,28 +4,27 @@ SETTINGS: (please don't move this part)
PATH=functions.RootRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.Errors;
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Root;
+import it.cavallium.warppi.math.functions.RootSquare;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.Errors;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Division;
-import org.warp.picalculator.math.functions.Root;
-import org.warp.picalculator.math.functions.RootSquare;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/src/main/rules/rules/functions/SubtractionRule.java b/src/main/rules/rules/functions/SubtractionRule.java
index 04bcc2b5..24349a63 100644
--- a/src/main/rules/rules/functions/SubtractionRule.java
+++ b/src/main/rules/rules/functions/SubtractionRule.java
@@ -4,23 +4,22 @@ SETTINGS: (please don't move this part)
PATH=functions.SubtractionRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Division;
/**
* Subtraction
diff --git a/src/main/rules/rules/functions/SumRule.java b/src/main/rules/rules/functions/SumRule.java
index 8cc54430..750a78d6 100644
--- a/src/main/rules/rules/functions/SumRule.java
+++ b/src/main/rules/rules/functions/SumRule.java
@@ -4,23 +4,22 @@ SETTINGS: (please don't move this part)
PATH=functions.SumRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Division;
/**
* Sum
diff --git a/src/main/rules/rules/functions/SumSubtractionRule.java b/src/main/rules/rules/functions/SumSubtractionRule.java
index 2b5a3802..066d7fee 100644
--- a/src/main/rules/rules/functions/SumSubtractionRule.java
+++ b/src/main/rules/rules/functions/SumSubtractionRule.java
@@ -4,23 +4,22 @@ SETTINGS: (please don't move this part)
PATH=functions.SumSubtractionRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.functions.Division;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.SumSubtraction;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.SumSubtraction;
-import org.warp.picalculator.math.functions.Number;
-import org.warp.picalculator.math.functions.Division;
/**
* SumSumbraction
diff --git a/src/main/rules/rules/functions/VariableRule.java b/src/main/rules/rules/functions/VariableRule.java
index 9ea3ab10..4cdc2d42 100644
--- a/src/main/rules/rules/functions/VariableRule.java
+++ b/src/main/rules/rules/functions/VariableRule.java
@@ -4,27 +4,26 @@ SETTINGS: (please don't move this part)
PATH=functions.VariableRule
*/
-import org.warp.picalculator.math.Function;
-import org.warp.picalculator.math.FunctionOperator;
-import org.warp.picalculator.math.FunctionDynamic;
-import org.warp.picalculator.math.FunctionSingle;
-import org.warp.picalculator.math.MathContext;
-
+import it.cavallium.warppi.Error;
+import it.cavallium.warppi.ScriptUtils;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.math.Function;
+import it.cavallium.warppi.math.FunctionDynamic;
+import it.cavallium.warppi.math.FunctionOperator;
+import it.cavallium.warppi.math.FunctionSingle;
+import it.cavallium.warppi.math.MathContext;
+import it.cavallium.warppi.math.MathematicalSymbols;
+import it.cavallium.warppi.math.functions.Multiplication;
+import it.cavallium.warppi.math.functions.Number;
+import it.cavallium.warppi.math.functions.Subtraction;
+import it.cavallium.warppi.math.functions.Sum;
+import it.cavallium.warppi.math.functions.Variable;
+import it.cavallium.warppi.math.functions.Variable.V_TYPE;
+import it.cavallium.warppi.math.rules.Rule;
+import it.cavallium.warppi.math.rules.RuleType;
+import it.cavallium.warppi.math.rules.RulesManager;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import org.nevec.rjm.BigDecimalMath;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.math.MathematicalSymbols;
-import org.warp.picalculator.Error;
-import org.warp.picalculator.ScriptUtils;
-import org.warp.picalculator.math.rules.Rule;
-import org.warp.picalculator.math.rules.RuleType;
-import org.warp.picalculator.math.rules.RulesManager;
-import org.warp.picalculator.math.functions.Multiplication;
-import org.warp.picalculator.math.functions.Sum;
-import org.warp.picalculator.math.functions.Subtraction;
-import org.warp.picalculator.math.functions.Variable;
-import org.warp.picalculator.math.functions.Variable.V_TYPE;
-import org.warp.picalculator.math.functions.Number;
/**
* Variable
diff --git a/src/teavm-specific/java/org/warp/picalculator/ConsoleUtils.java b/src/teavm-specific/java/it/cavallium/warppi/ConsoleUtils.java
similarity index 94%
rename from src/teavm-specific/java/org/warp/picalculator/ConsoleUtils.java
rename to src/teavm-specific/java/it/cavallium/warppi/ConsoleUtils.java
index 7b174970..e201d1d6 100644
--- a/src/teavm-specific/java/org/warp/picalculator/ConsoleUtils.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/ConsoleUtils.java
@@ -1,11 +1,11 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.PrintStream;
import java.io.StringWriter;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import org.warp.picalculator.math.MathematicalSymbols;
+import it.cavallium.warppi.math.MathematicalSymbols;
public class ConsoleUtils {
diff --git a/src/teavm-specific/java/org/warp/picalculator/PlatformUtils.java b/src/teavm-specific/java/it/cavallium/warppi/PlatformUtils.java
similarity index 94%
rename from src/teavm-specific/java/org/warp/picalculator/PlatformUtils.java
rename to src/teavm-specific/java/it/cavallium/warppi/PlatformUtils.java
index 499c05d5..34cc1552 100644
--- a/src/teavm-specific/java/org/warp/picalculator/PlatformUtils.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/PlatformUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -6,8 +6,9 @@ import java.lang.ref.WeakReference;
import org.teavm.jso.browser.Window;
import org.teavm.jso.dom.html.HTMLDocument;
-import org.warp.picalculator.gui.expression.blocks.Block;
-import org.warp.picalculator.math.rules.RulesManager;
+
+import it.cavallium.warppi.gui.expression.blocks.Block;
+import it.cavallium.warppi.math.rules.RulesManager;
public final class PlatformUtils {
public static final boolean isJavascript = true;
diff --git a/src/teavm-specific/java/org/warp/picalculator/ZipUtils.java b/src/teavm-specific/java/it/cavallium/warppi/ZipUtils.java
similarity index 89%
rename from src/teavm-specific/java/org/warp/picalculator/ZipUtils.java
rename to src/teavm-specific/java/it/cavallium/warppi/ZipUtils.java
index 1690c269..6820c666 100644
--- a/src/teavm-specific/java/org/warp/picalculator/ZipUtils.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/ZipUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator;
+package it.cavallium.warppi;
public class ZipUtils {
public static void zip(String targetPath, String destinationFilePath, String password) {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DAtomicInteger.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java
similarity index 96%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DAtomicInteger.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java
index 8177b840..ab47d0ec 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DAtomicInteger.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java
@@ -33,7 +33,7 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.util.function.IntUnaryOperator;
import java.util.function.IntBinaryOperator;
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DEngine.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java
similarity index 68%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DEngine.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java
index d0f14bc8..4d20fd67 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DEngine.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java
@@ -1,8 +1,8 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
-import org.warp.picalculator.ClassUtils;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.html.HtmlEngine;
+import it.cavallium.warppi.ClassUtils;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.html.HtmlEngine;
public class DEngine {
public static GraphicEngine newCPUEngine() {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DGpio.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java
similarity index 86%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DGpio.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java
index ed634cd9..de9750f1 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DGpio.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
-import org.warp.picalculator.ClassUtils;
-import org.warp.picalculator.ClassUtils.Var;
+import it.cavallium.warppi.ClassUtils;
+import it.cavallium.warppi.ClassUtils.Var;
public class DGpio {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DJDTCompiler.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java
similarity index 64%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DJDTCompiler.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java
index 4c68c567..c7f815ca 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DJDTCompiler.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java
@@ -1,9 +1,9 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.io.PrintWriter;
-import org.warp.picalculator.ClassUtils;
-import org.warp.picalculator.ClassUtils.Var;
+import it.cavallium.warppi.ClassUtils;
+import it.cavallium.warppi.ClassUtils.Var;
public class DJDTCompiler {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DSemaphore.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DSemaphore.java
similarity index 89%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DSemaphore.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DSemaphore.java
index 1019f055..9bc6b473 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DSemaphore.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DSemaphore.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.util.ArrayList;
import java.util.LinkedList;
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java
similarity index 95%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java
index 31bf39c9..8635026c 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java
@@ -23,7 +23,7 @@
*
*/
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
/**
* Defines the standard open options.
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DSystem.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java
similarity index 77%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DSystem.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java
index ec99bc07..dbdb0933 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DSystem.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
public class DSystem {
public static final void exit(int code) {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/DURLClassLoader.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java
similarity index 83%
rename from src/teavm-specific/java/org/warp/picalculator/deps/DURLClassLoader.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java
index a01c9c7a..b6f444ee 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/DURLClassLoader.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.net.URL;
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/StorageUtils.java b/src/teavm-specific/java/it/cavallium/warppi/deps/StorageUtils.java
similarity index 95%
rename from src/teavm-specific/java/org/warp/picalculator/deps/StorageUtils.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/StorageUtils.java
index a2ccf015..add9f705 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/StorageUtils.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/StorageUtils.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps;
+package it.cavallium.warppi.deps;
import java.io.BufferedReader;
import java.io.File;
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java b/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java
similarity index 97%
rename from src/teavm-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java
index dedcc2c8..a8f05605 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java
@@ -1,7 +1,7 @@
-package org.warp.picalculator.deps.jogamp;
+package it.cavallium.warppi.deps.jogamp;
-import org.warp.picalculator.ClassUtils;
-import org.warp.picalculator.ClassUtils.Var;
+import it.cavallium.warppi.ClassUtils;
+import it.cavallium.warppi.ClassUtils.Var;
public class DJogamp {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/nio/DFiles.java b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DFiles.java
similarity index 84%
rename from src/teavm-specific/java/org/warp/picalculator/deps/nio/DFiles.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/nio/DFiles.java
index 2085e499..7150c8d8 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/nio/DFiles.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DFiles.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.nio;
+package it.cavallium.warppi.deps.nio;
import java.io.File;
import java.io.IOException;
@@ -6,7 +6,8 @@ import java.nio.charset.Charset;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.warp.picalculator.deps.nio.DPaths.DPathImpl;
+
+import it.cavallium.warppi.deps.nio.DPaths.DPathImpl;
public class DFiles {
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/nio/DPath.java b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPath.java
similarity index 69%
rename from src/teavm-specific/java/org/warp/picalculator/deps/nio/DPath.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPath.java
index 31d0dc0f..685e8509 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/nio/DPath.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPath.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.nio;
+package it.cavallium.warppi.deps.nio;
import java.io.File;
import java.nio.file.Path;
diff --git a/src/teavm-specific/java/org/warp/picalculator/deps/nio/DPaths.java b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPaths.java
similarity index 88%
rename from src/teavm-specific/java/org/warp/picalculator/deps/nio/DPaths.java
rename to src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPaths.java
index c8f5c5e1..15197f2b 100644
--- a/src/teavm-specific/java/org/warp/picalculator/deps/nio/DPaths.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPaths.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.deps.nio;
+package it.cavallium.warppi.deps.nio;
import java.io.File;
diff --git a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
similarity index 91%
rename from src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java
rename to src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
index cac24bd0..a668ae00 100644
--- a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.html;
+package it.cavallium.warppi.gui.graphicengine.html;
import java.io.IOException;
import java.util.concurrent.Semaphore;
@@ -19,20 +19,21 @@ import org.teavm.jso.dom.html.HTMLElement;
import org.teavm.jso.dom.html.HTMLInputElement;
import org.teavm.jso.dom.xml.NodeList;
import org.teavm.jso.json.JSON;
-import org.warp.picalculator.PlatformUtils;
-import org.warp.picalculator.Utils;
-import org.warp.picalculator.deps.DSemaphore;
-import org.warp.picalculator.deps.StorageUtils;
-import org.warp.picalculator.device.Keyboard;
-import org.warp.picalculator.flow.BehaviorSubject;
-import org.warp.picalculator.flow.Observable;
-import org.warp.picalculator.gui.graphicengine.BinaryFont;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Renderer;
-import org.warp.picalculator.gui.graphicengine.RenderingLoop;
-import org.warp.picalculator.gui.graphicengine.Skin;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUFont;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUSkin;
+
+import it.cavallium.warppi.PlatformUtils;
+import it.cavallium.warppi.Utils;
+import it.cavallium.warppi.deps.DSemaphore;
+import it.cavallium.warppi.deps.StorageUtils;
+import it.cavallium.warppi.device.Keyboard;
+import it.cavallium.warppi.flow.BehaviorSubject;
+import it.cavallium.warppi.flow.Observable;
+import it.cavallium.warppi.gui.graphicengine.BinaryFont;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
+import it.cavallium.warppi.gui.graphicengine.RenderingLoop;
+import it.cavallium.warppi.gui.graphicengine.Skin;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUFont;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUSkin;
public class HtmlEngine implements GraphicEngine {
diff --git a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java
similarity index 90%
rename from src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java
rename to src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java
index 98a7a31a..57419beb 100644
--- a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.html;
+package it.cavallium.warppi.gui.graphicengine.html;
import java.io.IOException;
@@ -8,9 +8,10 @@ import org.teavm.jso.dom.html.HTMLCanvasElement;
import org.teavm.jso.dom.html.HTMLDocument;
import org.teavm.jso.dom.html.HTMLImageElement;
import org.teavm.jso.typedarrays.Uint8ClampedArray;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.cpu.CPUFont;
+
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.cpu.CPUFont;
public class HtmlFont extends CPUFont {
diff --git a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java
similarity index 98%
rename from src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java
rename to src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java
index 20dcdbf5..a1e17d90 100644
--- a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java
@@ -1,11 +1,12 @@
-package org.warp.picalculator.gui.graphicengine.html;
+package it.cavallium.warppi.gui.graphicengine.html;
import org.teavm.jso.canvas.CanvasImageSource;
import org.teavm.jso.canvas.CanvasRenderingContext2D;
import org.teavm.jso.dom.html.HTMLImageElement;
import org.teavm.jso.typedarrays.Uint8ClampedArray;
-import org.warp.picalculator.StaticVars;
-import org.warp.picalculator.gui.graphicengine.Renderer;
+
+import it.cavallium.warppi.StaticVars;
+import it.cavallium.warppi.gui.graphicengine.Renderer;
public class HtmlRenderer implements Renderer {
private static final boolean ENABLE_SUPERSAMPLING = false;
diff --git a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java
similarity index 88%
rename from src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java
rename to src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java
index f4edd85f..2ab734d2 100644
--- a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.html;
+package it.cavallium.warppi.gui.graphicengine.html;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -7,11 +7,11 @@ import org.teavm.jso.JSObject;
import org.teavm.jso.browser.Window;
import org.teavm.jso.dom.html.HTMLDocument;
import org.teavm.jso.dom.html.HTMLImageElement;
-import org.warp.picalculator.deps.StorageUtils;
-import org.warp.picalculator.gui.graphicengine.GraphicEngine;
-import org.warp.picalculator.gui.graphicengine.Skin;
import ar.com.hjg.pngj.PngReader;
+import it.cavallium.warppi.deps.StorageUtils;
+import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
+import it.cavallium.warppi.gui.graphicengine.Skin;
public class HtmlSkin implements Skin {
diff --git a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/InputEvent.java
similarity index 74%
rename from src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java
rename to src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/InputEvent.java
index e387d250..e28d2cb4 100644
--- a/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java
+++ b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/InputEvent.java
@@ -1,4 +1,4 @@
-package org.warp.picalculator.gui.graphicengine.html;
+package it.cavallium.warppi.gui.graphicengine.html;
import org.teavm.jso.JSProperty;
import org.teavm.jso.dom.events.Event;