From d9d42007f2b0160d257b075bb6642a51ffcd9b62 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 2 Sep 2018 13:36:49 +0200 Subject: [PATCH] Renamed package name from org.warp.picalculator to it.cavallium.warppi --- .settings/org.eclipse.core.resources.prefs | 4 +- MmapByteBuffer.java | 2 +- math-rules-cache.zip | Bin 51567 -> 102476 bytes pom.xml | 21 +- pom.xml.versionsBackup | 276 ------------------ .../java/ar/com/hjg/pngj/PngReaderApng.java | 2 +- .../cavallium/warppi}/ConsoleUtils.java | 4 +- .../cavallium/warppi}/PlatformUtils.java | 2 +- .../cavallium/warppi}/ZipUtils.java | 2 +- .../warppi}/deps/DAtomicInteger.java | 2 +- .../it/cavallium/warppi/deps/DEngine.java | 40 +++ .../cavallium/warppi}/deps/DGpio.java | 4 +- .../cavallium/warppi}/deps/DJDTCompiler.java | 2 +- .../cavallium/warppi}/deps/DSemaphore.java | 2 +- .../warppi}/deps/DStandardOpenOption.java | 4 +- .../cavallium/warppi}/deps/DSystem.java | 2 +- .../warppi}/deps/DURLClassLoader.java | 2 +- .../cavallium/warppi}/deps/StorageUtils.java | 5 +- .../warppi}/deps/jogamp/DJogamp.java | 2 +- .../cavallium/warppi}/deps/nio/DFiles.java | 2 +- .../cavallium/warppi}/deps/nio/DPath.java | 2 +- .../cavallium/warppi}/deps/nio/DPaths.java | 2 +- .../org/warp/picalculator/deps/DEngine.java | 40 --- .../cavallium/warppi}/BMPFile.java | 2 +- .../cavallium/warppi}/CacheUtils.java | 2 +- .../cavallium/warppi}/ClassUtils.java | 2 +- src/main/java/it/cavallium/warppi/Engine.java | 129 ++++++++ .../cavallium/warppi}/Error.java | 2 +- .../cavallium/warppi}/Errors.java | 2 +- .../cavallium/warppi}/IntegerObj.java | 2 +- .../it/cavallium/warppi/KeyboardTest.java | 16 + .../cavallium/warppi}/MmapByteBuffer.java | 2 +- .../cavallium/warppi}/ScriptUtils.java | 2 +- .../cavallium/warppi}/StaticVars.java | 8 +- .../cavallium/warppi}/TestDrivers.java | 2 +- .../cavallium/warppi}/TestGPU.java | 38 +-- .../cavallium/warppi}/TestJNI.java | 2 +- .../cavallium/warppi}/Utils.java | 44 +-- .../warppi}/boot/StartupArguments.java | 2 +- .../warppi}/boot/StartupArgumentsImpl.java | 2 +- .../cavallium/warppi/boot/WarpPI.java} | 31 +- .../cavallium/warppi}/device/CacheFile.java | 8 +- .../warppi}/device/HardwareDevice.java | 6 +- .../warppi}/device/HardwareTouchDevice.java | 6 +- .../warppi}/device/InputManager.java | 2 +- .../cavallium/warppi}/device/Keyboard.java | 32 +- .../warppi}/device/PIHardwareDisplay.java | 10 +- .../warppi}/device/PIHardwareTouchDevice.java | 14 +- .../warppi}/device/chip/ParallelToSerial.java | 4 +- .../warppi}/device/chip/SerialToParallel.java | 4 +- .../warppi}/device/graphicengine/RAWFont.java | 8 +- .../java/it/cavallium/warppi/event/Event.java | 5 + .../cavallium/warppi}/event/Key.java | 2 +- .../cavallium/warppi}/event/KeyEvent.java | 2 +- .../warppi}/event/KeyPressedEvent.java | 2 +- .../warppi}/event/KeyReleasedEvent.java | 2 +- .../warppi}/event/KeyboardEventListener.java | 2 +- .../warppi}/event/TouchCancelEvent.java | 2 +- .../warppi}/event/TouchEndEvent.java | 2 +- .../cavallium/warppi}/event/TouchEvent.java | 2 +- .../warppi}/event/TouchEventListener.java | 2 +- .../warppi}/event/TouchMoveEvent.java | 2 +- .../cavallium/warppi}/event/TouchPoint.java | 2 +- .../warppi}/event/TouchStartEvent.java | 2 +- .../warppi}/extra/mario/MarioBlock.java | 2 +- .../warppi}/extra/mario/MarioEnemy.java | 2 +- .../warppi}/extra/mario/MarioEntity.java | 2 +- .../warppi/extra/mario/MarioEvent.java | 5 + .../warppi}/extra/mario/MarioGame.java | 2 +- .../warppi}/extra/mario/MarioWorld.java | 2 +- .../warppi}/extra/mario/PlayerEntity.java | 2 +- .../warppi}/extra/mario/PositionEvent.java | 2 +- .../cavallium/warppi}/flow/Action0.java | 2 +- .../cavallium/warppi}/flow/Action1.java | 2 +- .../cavallium/warppi}/flow/Action2.java | 2 +- .../warppi}/flow/BehaviorSubject.java | 2 +- .../cavallium/warppi}/flow/Consumer.java | 2 +- .../cavallium/warppi}/flow/Disposable.java | 2 +- .../warppi}/flow/IntervalsManager.java | 4 +- .../cavallium/warppi}/flow/Observable.java | 2 +- .../flow/ObservableCombinedChanged.java | 2 +- .../flow/ObservableCombinedLatest.java | 2 +- .../warppi}/flow/ObservableInterval.java | 4 +- .../cavallium/warppi}/flow/ObservableMap.java | 2 +- .../warppi}/flow/ObservableMerged.java | 2 +- .../warppi}/flow/ObservableSource.java | 2 +- .../warppi}/flow/ObservableZipped.java | 2 +- .../cavallium/warppi}/flow/Observer.java | 2 +- .../cavallium/warppi}/flow/SimpleSubject.java | 2 +- .../cavallium/warppi}/flow/Subject.java | 2 +- .../cavallium/warppi}/flow/Subscriber.java | 2 +- .../cavallium/warppi}/flow/Subscription.java | 2 +- .../cavallium/warppi}/flow/TestFlow.java | 2 +- .../cavallium/warppi}/gui/CalculatorHUD.java | 18 +- .../cavallium/warppi}/gui/DisplayManager.java | 32 +- .../warppi}/gui/GUIErrorMessage.java | 8 +- .../cavallium/warppi}/gui/GraphicUtils.java | 2 +- .../warppi}/gui/GraphicalElement.java | 2 +- .../warppi}/gui/GraphicalInterface.java | 2 +- .../cavallium/warppi}/gui/HUD.java | 2 +- .../warppi}/gui/HardwareDisplay.java | 2 +- .../warppi}/gui/expression/Caret.java | 2 +- .../warppi}/gui/expression/CaretState.java | 2 +- .../warppi}/gui/expression/ExtraMenu.java | 10 +- .../warppi}/gui/expression/InputContext.java | 8 +- .../warppi}/gui/expression/blocks/Block.java | 18 +- .../gui/expression/blocks/BlockChar.java | 14 +- .../gui/expression/blocks/BlockContainer.java | 29 +- .../gui/expression/blocks/BlockDivision.java | 18 +- .../blocks/BlockExponentialNotation.java | 8 +- .../gui/expression/blocks/BlockLogarithm.java | 19 +- .../expression/blocks/BlockNumericChar.java | 2 +- .../expression/blocks/BlockParenthesis.java | 13 +- .../blocks/BlockParenthesisAbstract.java | 15 +- .../gui/expression/blocks/BlockPower.java | 18 +- .../gui/expression/blocks/BlockReference.java | 2 +- .../gui/expression/blocks/BlockSine.java | 19 ++ .../expression/blocks/BlockSquareRoot.java | 18 +- .../gui/expression/blocks/BlockUndefined.java | 16 +- .../gui/expression/blocks/BlockVariable.java | 30 +- .../containers/InlineInputContainer.java | 8 +- .../expression/containers/InputContainer.java | 33 +-- .../containers/NormalInputContainer.java | 33 ++- .../containers/NormalOutputContainer.java | 2 +- .../containers/OutputContainer.java | 19 +- .../gui/expression/layouts/InputLayout.java | 7 + .../gui/expression/layouts/OutputLayout.java | 3 + .../warppi}/gui/graphicengine/BinaryFont.java | 2 +- .../gui/graphicengine/GraphicEngine.java | 4 +- .../warppi}/gui/graphicengine/Renderer.java | 2 +- .../gui/graphicengine/RenderingLoop.java | 2 +- .../warppi}/gui/graphicengine/Skin.java | 2 +- .../gui/graphicengine/cpu/CPUEngine.java | 18 +- .../gui/graphicengine/cpu/CPUFont.java | 16 +- .../gui/graphicengine/cpu/CPURenderer.java | 8 +- .../gui/graphicengine/cpu/CPUSkin.java | 9 +- .../gui/graphicengine/cpu/SwingWindow.java | 27 +- .../graphicengine/framebuffer/FBEngine.java | 26 +- .../graphicengine/framebuffer/FBRenderer.java | 6 +- .../graphicengine/gpu/DeallocationHelper.java | 2 +- .../gui/graphicengine/gpu/GPUEngine.java | 18 +- .../gui/graphicengine/gpu/GPUFont.java | 11 +- .../gui/graphicengine/gpu/GPURenderer.java | 12 +- .../gui/graphicengine/gpu/GPUSkin.java | 10 +- .../gui/graphicengine/gpu/NEWTWindow.java | 27 +- .../headless24bit/Headless24bitEngine.java | 19 +- .../headless24bit/Headless24bitFont.java | 6 +- .../headless24bit/Headless24bitRenderer.java | 4 +- .../headless24bit/Headless24bitSkin.java | 6 +- .../headless256/Headless256Engine.java | 21 +- .../headless256/Headless256Font.java | 6 +- .../headless256/Headless256Renderer.java | 4 +- .../headless256/Headless256Skin.java | 6 +- .../headless8/Headless8Engine.java | 21 +- .../headless8/Headless8Font.java | 6 +- .../headless8/Headless8Renderer.java | 6 +- .../headless8/Headless8Skin.java | 6 +- .../gui/graphicengine/nogui/NoGuiEngine.java | 16 +- .../screens/ChooseVariableValueScreen.java | 14 +- .../warppi}/gui/screens/EmptyScreen.java | 2 +- .../gui/screens/KeyboardDebugScreen.java | 12 +- .../warppi}/gui/screens/LoadingScreen.java | 12 +- .../warppi}/gui/screens/MarioScreen.java | 16 +- .../warppi}/gui/screens/MathInputScreen.java | 71 +++-- .../cavallium/warppi}/gui/screens/Screen.java | 10 +- .../warppi}/gui/screens/SolveForXScreen.java | 8 +- .../cavallium/warppi}/math/AngleMode.java | 2 +- .../cavallium/warppi}/math/Function.java | 9 +- .../warppi}/math/FunctionDynamic.java | 9 +- .../warppi}/math/FunctionOperator.java | 11 +- .../warppi}/math/FunctionSingle.java | 7 +- .../cavallium/warppi}/math/MathContext.java | 13 +- .../warppi}/math/MathematicalSymbols.java | 6 +- .../warppi}/math/functions/Division.java | 17 +- .../warppi}/math/functions/EmptyNumber.java | 13 +- .../warppi}/math/functions/Expression.java | 29 +- .../warppi}/math/functions/Joke.java | 15 +- .../warppi}/math/functions/Logarithm.java | 17 +- .../math/functions/Multiplication.java | 19 +- .../warppi}/math/functions/Negative.java | 19 +- .../warppi}/math/functions/Number.java | 22 +- .../warppi}/math/functions/Power.java | 17 +- .../warppi}/math/functions/Root.java | 15 +- .../warppi}/math/functions/RootSquare.java | 17 +- .../warppi}/math/functions/Subtraction.java | 17 +- .../cavallium/warppi}/math/functions/Sum.java | 17 +- .../math/functions/SumSubtraction.java | 17 +- .../warppi}/math/functions/Undefined.java | 15 +- .../warppi}/math/functions/Variable.java | 15 +- .../math/functions/equations/Equation.java | 15 +- .../functions/equations/EquationResult.java | 4 +- .../functions/equations/EquationsSystem.java | 13 +- .../equations/EquationsSystemPart.java | 11 +- .../functions/trigonometry/ArcCosine.java | 15 +- .../math/functions/trigonometry/ArcSine.java | 15 +- .../functions/trigonometry/ArcTangent.java | 15 +- .../math/functions/trigonometry/Cosine.java | 15 +- .../math/functions/trigonometry/Sine.java | 17 +- .../math/functions/trigonometry/Tangent.java | 13 +- .../warppi}/math/parser/MathParser.java | 61 ++-- .../warppi}/math/parser/MathParserStep.java | 9 +- .../math/parser/features/FeatureChar.java | 20 ++ .../math/parser/features/FeatureDivision.java | 6 +- .../parser/features/FeatureDoubleImpl.java | 6 +- .../parser/features/FeatureLogarithm.java | 8 +- .../features/FeatureMultiplication.java | 6 +- .../math/parser/features/FeatureNumber.java | 12 +- .../parser/features/FeatureParenthesis.java | 10 +- .../math/parser/features/FeaturePower.java | 8 +- .../parser/features/FeaturePowerChar.java | 8 +- .../math/parser/features/FeatureSine.java | 19 ++ .../parser/features/FeatureSingleImpl.java | 6 +- .../parser/features/FeatureSquareRoot.java | 8 +- .../parser/features/FeatureSubtraction.java | 10 +- .../math/parser/features/FeatureSum.java | 8 +- .../features/FeatureSumSubtraction.java | 8 +- .../math/parser/features/FeatureVariable.java | 10 +- .../parser/features/interfaces/Feature.java | 11 + .../features/interfaces/FeatureBasic.java | 3 + .../features/interfaces/FeatureDouble.java | 2 +- .../features/interfaces/FeatureMultiple.java | 2 +- .../features/interfaces/FeatureSingle.java | 2 +- .../steps/AddImplicitMultiplications.java | 13 +- .../steps/FixMultiplicationsAndDivisions.java | 17 +- .../parser/steps/FixSingleFunctionArgs.java | 15 +- .../parser/steps/FixSumsAndSubtractions.java | 19 +- .../parser/steps/JoinNumberAndVariables.java | 19 +- .../math/parser/steps/RemoveParentheses.java | 13 +- .../cavallium/warppi}/math/rules/Rule.java | 7 +- .../warppi}/math/rules/RuleType.java | 2 +- .../warppi}/math/rules/RulesManager.java | 39 ++- .../math/rules/methods/DivisionRule1.java | 15 +- .../rules/methods/MultiplicationMethod1.java | 11 +- .../math/rules/methods/SumMethod1.java | 19 +- .../warppi}/math/solver/MathSolver.java | 17 +- .../warppi}/math/solver/SolveMethod.java | 5 +- src/main/java/org/nevec/rjm/Bernoulli.java | 2 +- .../java/org/nevec/rjm/BigDecimalMath.java | 2 +- .../java/org/nevec/rjm/BigIntegerMath.java | 2 +- .../java/org/nevec/rjm/BigIntegerPoly.java | 2 +- src/main/java/org/nevec/rjm/BigSurd.java | 4 +- src/main/java/org/nevec/rjm/BigSurdVec.java | 4 +- src/main/java/org/nevec/rjm/Ifactor.java | 2 +- src/main/java/org/nevec/rjm/RatPoly.java | 2 +- src/main/java/org/nevec/rjm/Rational.java | 4 +- .../java/org/nevec/rjm/SafeMathContext.java | 2 +- src/main/java/org/nevec/rjm/Wigner3j.java | 2 +- src/main/java/org/nevec/rjm/Wigner3jGUI.java | 2 +- .../org/warp/picalculator/KeyboardTest.java | 15 - .../org/warp/picalculator/PICalculator.java | 87 ------ .../org/warp/picalculator/event/Event.java | 5 - .../picalculator/extra/mario/MarioEvent.java | 5 - .../gui/expression/blocks/BlockSine.java | 19 -- .../gui/expression/layouts/InputLayout.java | 7 - .../gui/expression/layouts/OutputLayout.java | 3 - .../math/parser/features/FeatureChar.java | 20 -- .../math/parser/features/FeatureSine.java | 19 -- .../parser/features/interfaces/Feature.java | 11 - .../features/interfaces/FeatureBasic.java | 3 - src/main/jni/makefileOLD | 4 +- src/main/rules/rules/ExpandRule1.java | 24 +- src/main/rules/rules/ExpandRule2.java | 25 +- src/main/rules/rules/ExpandRule5.java | 28 +- src/main/rules/rules/ExponentRule1.java | 26 +- src/main/rules/rules/ExponentRule15.java | 28 +- src/main/rules/rules/ExponentRule16.java | 30 +- src/main/rules/rules/ExponentRule17.java | 30 +- src/main/rules/rules/ExponentRule2.java | 25 +- src/main/rules/rules/ExponentRule3.java | 25 +- src/main/rules/rules/ExponentRule4.java | 30 +- src/main/rules/rules/ExponentRule8.java | 28 +- src/main/rules/rules/ExponentRule9.java | 26 +- src/main/rules/rules/FractionsRule1.java | 15 +- src/main/rules/rules/FractionsRule10.java | 29 +- src/main/rules/rules/FractionsRule11.java | 24 +- src/main/rules/rules/FractionsRule12.java | 25 +- src/main/rules/rules/FractionsRule14.java | 25 +- src/main/rules/rules/FractionsRule2.java | 16 +- src/main/rules/rules/FractionsRule3.java | 25 +- src/main/rules/rules/FractionsRule4.java | 27 +- src/main/rules/rules/FractionsRule5.java | 29 +- src/main/rules/rules/FractionsRule6.java | 29 +- src/main/rules/rules/FractionsRule7.java | 29 +- src/main/rules/rules/FractionsRule8.java | 29 +- src/main/rules/rules/FractionsRule9.java | 29 +- src/main/rules/rules/NumberRule1.java | 25 +- src/main/rules/rules/NumberRule2.java | 25 +- src/main/rules/rules/NumberRule3.java | 33 +-- src/main/rules/rules/NumberRule4.java | 27 +- src/main/rules/rules/NumberRule5.java | 32 +- src/main/rules/rules/NumberRule7.java | 27 +- src/main/rules/rules/UndefinedRule1.java | 27 +- src/main/rules/rules/UndefinedRule2.java | 27 +- src/main/rules/rules/VariableRule1.java | 28 +- src/main/rules/rules/VariableRule2.java | 30 +- src/main/rules/rules/VariableRule3.java | 30 +- .../rules/rules/functions/DivisionRule.java | 34 +-- .../rules/functions/EmptyNumberRule.java | 19 +- .../rules/rules/functions/ExpressionRule.java | 31 +- src/main/rules/rules/functions/JokeRule.java | 19 +- .../rules/functions/MultiplicationRule.java | 31 +- .../rules/rules/functions/NegativeRule.java | 28 +- .../rules/rules/functions/NumberRule.java | 24 +- src/main/rules/rules/functions/PowerRule.java | 35 ++- src/main/rules/rules/functions/RootRule.java | 39 ++- .../rules/functions/SubtractionRule.java | 31 +- src/main/rules/rules/functions/SumRule.java | 31 +- .../rules/functions/SumSubtractionRule.java | 31 +- .../rules/rules/functions/VariableRule.java | 37 ++- .../cavallium/warppi}/ConsoleUtils.java | 4 +- .../cavallium/warppi}/PlatformUtils.java | 7 +- .../cavallium/warppi}/ZipUtils.java | 2 +- .../warppi}/deps/DAtomicInteger.java | 2 +- .../cavallium/warppi}/deps/DEngine.java | 8 +- .../cavallium/warppi}/deps/DGpio.java | 6 +- .../cavallium/warppi}/deps/DJDTCompiler.java | 6 +- .../cavallium/warppi}/deps/DSemaphore.java | 2 +- .../warppi}/deps/DStandardOpenOption.java | 2 +- .../cavallium/warppi}/deps/DSystem.java | 2 +- .../warppi}/deps/DURLClassLoader.java | 2 +- .../cavallium/warppi}/deps/StorageUtils.java | 2 +- .../warppi}/deps/jogamp/DJogamp.java | 6 +- .../cavallium/warppi}/deps/nio/DFiles.java | 5 +- .../cavallium/warppi}/deps/nio/DPath.java | 2 +- .../cavallium/warppi}/deps/nio/DPaths.java | 2 +- .../gui/graphicengine/html/HtmlEngine.java | 31 +- .../gui/graphicengine/html/HtmlFont.java | 9 +- .../gui/graphicengine/html/HtmlRenderer.java | 7 +- .../gui/graphicengine/html/HtmlSkin.java | 8 +- .../gui/graphicengine/html/InputEvent.java | 2 +- 330 files changed, 1994 insertions(+), 2443 deletions(-) delete mode 100644 pom.xml.versionsBackup rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/ConsoleUtils.java (94%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/PlatformUtils.java (93%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/ZipUtils.java (94%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DAtomicInteger.java (83%) create mode 100644 src/jar-specific/java/it/cavallium/warppi/deps/DEngine.java rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DGpio.java (91%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DJDTCompiler.java (85%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DSemaphore.java (87%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DStandardOpenOption.java (94%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DSystem.java (67%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DURLClassLoader.java (90%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/StorageUtils.java (95%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/jogamp/DJogamp.java (96%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/nio/DFiles.java (89%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/nio/DPath.java (79%) rename src/jar-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/nio/DPaths.java (75%) delete mode 100644 src/jar-specific/java/org/warp/picalculator/deps/DEngine.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/BMPFile.java (96%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/CacheUtils.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/ClassUtils.java (96%) create mode 100755 src/main/java/it/cavallium/warppi/Engine.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/Error.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/Errors.java (85%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/IntegerObj.java (69%) create mode 100755 src/main/java/it/cavallium/warppi/KeyboardTest.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/MmapByteBuffer.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/ScriptUtils.java (92%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/StaticVars.java (82%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/TestDrivers.java (92%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/TestGPU.java (79%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/TestJNI.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/Utils.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/boot/StartupArguments.java (90%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/boot/StartupArgumentsImpl.java (96%) rename src/main/java/{org/warp/picalculator/boot/Main.java => it/cavallium/warppi/boot/WarpPI.java} (59%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/CacheFile.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/HardwareDevice.java (80%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/HardwareTouchDevice.java (72%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/InputManager.java (85%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/Keyboard.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/PIHardwareDisplay.java (64%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/PIHardwareTouchDevice.java (85%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/chip/ParallelToSerial.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/chip/SerialToParallel.java (84%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/device/graphicengine/RAWFont.java (93%) create mode 100644 src/main/java/it/cavallium/warppi/event/Event.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/Key.java (95%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/KeyEvent.java (61%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/KeyPressedEvent.java (76%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/KeyReleasedEvent.java (76%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/KeyboardEventListener.java (80%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchCancelEvent.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchEndEvent.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchEvent.java (77%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchEventListener.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchMoveEvent.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchPoint.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/event/TouchStartEvent.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/MarioBlock.java (84%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/MarioEnemy.java (81%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/MarioEntity.java (93%) create mode 100644 src/main/java/it/cavallium/warppi/extra/mario/MarioEvent.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/MarioGame.java (98%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/MarioWorld.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/PlayerEntity.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/extra/mario/PositionEvent.java (52%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Action0.java (51%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Action1.java (54%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Action2.java (58%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/BehaviorSubject.java (92%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Consumer.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Disposable.java (67%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/IntervalsManager.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Observable.java (95%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableCombinedChanged.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableCombinedLatest.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableInterval.java (90%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableMap.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableMerged.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableSource.java (70%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/ObservableZipped.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Observer.java (77%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/SimpleSubject.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Subject.java (92%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Subscriber.java (77%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/Subscription.java (63%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/flow/TestFlow.java (95%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/CalculatorHUD.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/DisplayManager.java (90%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/GUIErrorMessage.java (77%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/GraphicUtils.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/GraphicalElement.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/GraphicalInterface.java (84%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/HUD.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/HardwareDisplay.java (75%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/Caret.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/CaretState.java (54%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/ExtraMenu.java (71%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/InputContext.java (65%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/Block.java (66%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockChar.java (69%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockContainer.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockDivision.java (82%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockExponentialNotation.java (70%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockLogarithm.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockNumericChar.java (63%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockParenthesis.java (55%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockParenthesisAbstract.java (85%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockPower.java (75%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockReference.java (91%) create mode 100644 src/main/java/it/cavallium/warppi/gui/expression/blocks/BlockSine.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockSquareRoot.java (80%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockUndefined.java (67%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/blocks/BlockVariable.java (83%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/containers/InlineInputContainer.java (69%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/containers/InputContainer.java (81%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/containers/NormalInputContainer.java (71%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/containers/NormalOutputContainer.java (82%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/expression/containers/OutputContainer.java (82%) create mode 100755 src/main/java/it/cavallium/warppi/gui/expression/layouts/InputLayout.java create mode 100755 src/main/java/it/cavallium/warppi/gui/expression/layouts/OutputLayout.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/BinaryFont.java (74%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/GraphicEngine.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/Renderer.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/RenderingLoop.java (52%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/Skin.java (83%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/cpu/CPUEngine.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/cpu/CPUFont.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/cpu/CPURenderer.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/cpu/CPUSkin.java (90%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/cpu/SwingWindow.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/framebuffer/FBEngine.java (83%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/framebuffer/FBRenderer.java (88%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/gpu/DeallocationHelper.java (97%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/gpu/GPUEngine.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/gpu/GPUFont.java (92%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/gpu/GPURenderer.java (95%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/gpu/GPUSkin.java (82%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/gpu/NEWTWindow.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless24bit/Headless24bitEngine.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless24bit/Headless24bitFont.java (75%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless24bit/Headless24bitRenderer.java (98%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless24bit/Headless24bitSkin.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless256/Headless256Engine.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless256/Headless256Font.java (75%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless256/Headless256Renderer.java (98%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless256/Headless256Skin.java (88%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless8/Headless8Engine.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless8/Headless8Font.java (75%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless8/Headless8Renderer.java (98%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/headless8/Headless8Skin.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/nogui/NoGuiEngine.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/ChooseVariableValueScreen.java (88%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/EmptyScreen.java (86%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/KeyboardDebugScreen.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/LoadingScreen.java (84%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/MarioScreen.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/MathInputScreen.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/Screen.java (73%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/gui/screens/SolveForXScreen.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/AngleMode.java (50%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/Function.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/FunctionDynamic.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/FunctionOperator.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/FunctionSingle.java (91%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/MathContext.java (90%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/MathematicalSymbols.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Division.java (74%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/EmptyNumber.java (74%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Expression.java (94%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Joke.java (78%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Logarithm.java (72%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Multiplication.java (84%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Negative.java (70%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Number.java (88%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Power.java (70%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Root.java (67%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/RootSquare.java (68%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Subtraction.java (67%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Sum.java (68%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/SumSubtraction.java (67%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Undefined.java (72%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/Variable.java (82%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/equations/Equation.java (78%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/equations/EquationResult.java (62%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/equations/EquationsSystem.java (65%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/equations/EquationsSystemPart.java (67%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/trigonometry/ArcCosine.java (62%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/trigonometry/ArcSine.java (62%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/trigonometry/ArcTangent.java (62%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/trigonometry/Cosine.java (62%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/trigonometry/Sine.java (66%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/functions/trigonometry/Tangent.java (61%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/MathParser.java (80%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/MathParserStep.java (73%) create mode 100755 src/main/java/it/cavallium/warppi/math/parser/features/FeatureChar.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureDivision.java (61%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureDoubleImpl.java (74%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureLogarithm.java (58%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureMultiplication.java (63%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureNumber.java (70%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureParenthesis.java (50%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeaturePower.java (57%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeaturePowerChar.java (52%) create mode 100644 src/main/java/it/cavallium/warppi/math/parser/features/FeatureSine.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureSingleImpl.java (64%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureSquareRoot.java (55%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureSubtraction.java (53%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureSum.java (57%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureSumSubtraction.java (59%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/FeatureVariable.java (50%) create mode 100755 src/main/java/it/cavallium/warppi/math/parser/features/interfaces/Feature.java create mode 100755 src/main/java/it/cavallium/warppi/math/parser/features/interfaces/FeatureBasic.java rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/interfaces/FeatureDouble.java (71%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/interfaces/FeatureMultiple.java (78%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/features/interfaces/FeatureSingle.java (62%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/steps/AddImplicitMultiplications.java (76%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/steps/FixMultiplicationsAndDivisions.java (75%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/steps/FixSingleFunctionArgs.java (73%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/steps/FixSumsAndSubtractions.java (73%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/steps/JoinNumberAndVariables.java (68%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/parser/steps/RemoveParentheses.java (71%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/rules/Rule.java (81%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/rules/RuleType.java (83%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/rules/RulesManager.java (88%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/rules/methods/DivisionRule1.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/rules/methods/MultiplicationMethod1.java (89%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/rules/methods/SumMethod1.java (87%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/solver/MathSolver.java (93%) rename src/main/java/{org/warp/picalculator => it/cavallium/warppi}/math/solver/SolveMethod.java (65%) delete mode 100755 src/main/java/org/warp/picalculator/KeyboardTest.java delete mode 100755 src/main/java/org/warp/picalculator/PICalculator.java delete mode 100644 src/main/java/org/warp/picalculator/event/Event.java delete mode 100644 src/main/java/org/warp/picalculator/extra/mario/MarioEvent.java delete mode 100644 src/main/java/org/warp/picalculator/gui/expression/blocks/BlockSine.java delete mode 100755 src/main/java/org/warp/picalculator/gui/expression/layouts/InputLayout.java delete mode 100755 src/main/java/org/warp/picalculator/gui/expression/layouts/OutputLayout.java delete mode 100755 src/main/java/org/warp/picalculator/math/parser/features/FeatureChar.java delete mode 100644 src/main/java/org/warp/picalculator/math/parser/features/FeatureSine.java delete mode 100755 src/main/java/org/warp/picalculator/math/parser/features/interfaces/Feature.java delete mode 100755 src/main/java/org/warp/picalculator/math/parser/features/interfaces/FeatureBasic.java rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/ConsoleUtils.java (94%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/PlatformUtils.java (94%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/ZipUtils.java (89%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DAtomicInteger.java (96%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DEngine.java (68%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DGpio.java (86%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DJDTCompiler.java (64%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DSemaphore.java (89%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DStandardOpenOption.java (95%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DSystem.java (77%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/DURLClassLoader.java (83%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/StorageUtils.java (95%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/jogamp/DJogamp.java (97%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/nio/DFiles.java (84%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/nio/DPath.java (69%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/deps/nio/DPaths.java (88%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/html/HtmlEngine.java (91%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/html/HtmlFont.java (90%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/html/HtmlRenderer.java (98%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/html/HtmlSkin.java (88%) rename src/teavm-specific/java/{org/warp/picalculator => it/cavallium/warppi}/gui/graphicengine/html/InputEvent.java (74%) 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 8b961d68bab70e494ed1fb86b4c5a9433ad573e9..74244bd40c133a225f1ef7411107988b13711a15 100644 GIT binary patch delta 48904 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 delta 1101 zcmYk5Ye-XJ7{~X#r6+V-o40C-cZ!Xfnvs`ss34Rkt-z3mm4;d-THbOx@7HCz@(@o% z7ZoW=C`~FO%Lsx33B(T-B!(Y~E~NFPBD*~AIiA_}VbAmX|DVg=_ngT-&-vaJqcy`3 zzbGoRdhA!=ybC+-^2;hj7%qQee4(BOO?7_it5n{X-#0&v(4Ca4wlpTh7r z51&!E5qH;snp$B_4Foa+h$%nKc&!FZtPF5Z9Yl#%Z$X>@0d=(me|RoKiy+|Yd{ARZ zBdkPcEf|==TamR`-2yuN#_5=r(*$ur>xr}Of*c1)FZ8l>>4|{%9W)@(Uji6Z2QkdD zjweNIFp&SoV?!bM%G1>KRQxGkoSw3{(OQsYZmZz7d41zBv=s5A=(>ZGrJor#qW3=8Yh_--mgMi6ZLf@ zO4{Ql(q37lII@}6@<^3pO|i21a5Hr^rb+aqn+CQJ9oj)OnID{qRb)zznHK6XZI$Ak ztrUA_VZR3?<9I8X(z7MOSpvQxKDl9;s{cM)+_8?L3pShzhdAtN10!3s;a5FuMQbSp zp;tQuFRb0 zKq^Z9 zgWU60y#_OmE7#V`rGaL-q9hj9@=ceXM|Brz-`iyEKo@LhZ=7^mX8fB3UKm)Z+{Xv* zOX^l6JucSKpWSZFSI-tZF(bX^DqaHdH|EnB|lY_o!bWxsiV<}hTY8$ 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 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;