andreacavalli/WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved blocks to block package

Browse Source
This commit is contained in:
XDrake99 2017-04-12 13:04:35 +02:00
parent 57fc8cfa44
commit 74dc027642
16 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/warp/picalculator/TestGPU.java
View File

@ -8,7 +8,7 @@ import org.warp.picalculator.gui.graphicengine.RenderingLoop;
import org.warp.picalculator.device.Keyboard; import org.warp.picalculator.device.Keyboard;
import org.warp.picalculator.device.Keyboard.Key; import org.warp.picalculator.device.Keyboard.Key;
import org.warp.picalculator.device.KeyboardEventListener; import org.warp.picalculator.device.KeyboardEventListener;
import org.warp.picalculator.gui.expression.BlockContainer; import org.warp.picalculator.gui.expression.blocks.BlockContainer;
import org.warp.picalculator.gui.expression.containers.NormalInputContainer; import org.warp.picalculator.gui.expression.containers.NormalInputContainer;
import org.warp.picalculator.gui.graphicengine.BinaryFont; import org.warp.picalculator.gui.graphicengine.BinaryFont;
import org.warp.picalculator.gui.graphicengine.Skin; import org.warp.picalculator.gui.graphicengine.Skin;

3
src/org/warp/picalculator/gui/expression/Block.java → src/org/warp/picalculator/gui/expression/blocks/Block.java
View File

@ -1,6 +1,7 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import org.warp.picalculator.gui.GraphicalElement; import org.warp.picalculator.gui.GraphicalElement;
import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

3
src/org/warp/picalculator/gui/expression/BlockChar.java → src/org/warp/picalculator/gui/expression/blocks/BlockChar.java
View File

@ -1,5 +1,6 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

4
src/org/warp/picalculator/gui/expression/BlockContainer.java → src/org/warp/picalculator/gui/expression/blocks/BlockContainer.java
View File

@ -1,8 +1,10 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import org.warp.picalculator.gui.GraphicalElement; 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.BinaryFont;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

3
src/org/warp/picalculator/gui/expression/BlockDivision.java → src/org/warp/picalculator/gui/expression/blocks/BlockDivision.java
View File

@ -1,5 +1,6 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

2
src/org/warp/picalculator/gui/expression/BlockExponentialNotation.java → src/org/warp/picalculator/gui/expression/blocks/BlockExponentialNotation.java
View File

@ -1,4 +1,4 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
public class BlockExponentialNotation extends BlockPower { public class BlockExponentialNotation extends BlockPower {
@Override @Override

3
src/org/warp/picalculator/gui/expression/BlockParenthesis.java → src/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java
View File

@ -1,5 +1,6 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.graphicengine.BinaryFont; import org.warp.picalculator.gui.graphicengine.BinaryFont;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

6
src/org/warp/picalculator/gui/expression/BlockPower.java → src/org/warp/picalculator/gui/expression/blocks/BlockPower.java
View File

@ -1,8 +1,8 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import org.warp.picalculator.gui.expression.Block;
import org.warp.picalculator.gui.expression.BlockContainer;
import org.warp.picalculator.gui.expression.Caret; import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.expression.blocks.Block;
import org.warp.picalculator.gui.expression.blocks.BlockContainer;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

3
src/org/warp/picalculator/gui/expression/BlockSquareRoot.java → src/org/warp/picalculator/gui/expression/blocks/BlockSquareRoot.java
View File

@ -1,5 +1,6 @@
package org.warp.picalculator.gui.expression; package org.warp.picalculator.gui.expression.blocks;
import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

4
src/org/warp/picalculator/gui/expression/containers/InlineInputContainer.java
View File

@ -1,7 +1,7 @@
package org.warp.picalculator.gui.expression.containers; package org.warp.picalculator.gui.expression.containers;
import org.warp.picalculator.gui.expression.Block; import org.warp.picalculator.gui.expression.blocks.Block;
import org.warp.picalculator.gui.expression.BlockChar; import org.warp.picalculator.gui.expression.blocks.BlockChar;
import org.warp.picalculator.math.MathematicalSymbols; import org.warp.picalculator.math.MathematicalSymbols;
public class InlineInputContainer extends InputContainer { public class InlineInputContainer extends InputContainer {

4
src/org/warp/picalculator/gui/expression/containers/InputContainer.java
View File

@ -4,10 +4,10 @@ import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
import org.warp.picalculator.gui.GraphicalElement; import org.warp.picalculator.gui.GraphicalElement;
import org.warp.picalculator.gui.expression.Block;
import org.warp.picalculator.gui.expression.BlockContainer;
import org.warp.picalculator.gui.expression.Caret; import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.expression.CaretState; 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.InputLayout; import org.warp.picalculator.gui.expression.layouts.InputLayout;
import org.warp.picalculator.gui.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

12
src/org/warp/picalculator/gui/expression/containers/NormalInputContainer.java
View File

@ -1,11 +1,11 @@
package org.warp.picalculator.gui.expression.containers; package org.warp.picalculator.gui.expression.containers;
import org.warp.picalculator.gui.expression.Block; import org.warp.picalculator.gui.expression.blocks.Block;
import org.warp.picalculator.gui.expression.BlockChar; import org.warp.picalculator.gui.expression.blocks.BlockChar;
import org.warp.picalculator.gui.expression.BlockDivision; import org.warp.picalculator.gui.expression.blocks.BlockDivision;
import org.warp.picalculator.gui.expression.BlockParenthesis; import org.warp.picalculator.gui.expression.blocks.BlockParenthesis;
import org.warp.picalculator.gui.expression.BlockPower; import org.warp.picalculator.gui.expression.blocks.BlockPower;
import org.warp.picalculator.gui.expression.BlockSquareRoot; import org.warp.picalculator.gui.expression.blocks.BlockSquareRoot;
import org.warp.picalculator.math.MathematicalSymbols; import org.warp.picalculator.math.MathematicalSymbols;
public class NormalInputContainer extends InputContainer { public class NormalInputContainer extends InputContainer {

4
src/org/warp/picalculator/gui/expression/containers/OutputContainer.java
View File

@ -3,10 +3,10 @@ package org.warp.picalculator.gui.expression.containers;
import java.io.Serializable; import java.io.Serializable;
import org.warp.picalculator.gui.GraphicalElement; import org.warp.picalculator.gui.GraphicalElement;
import org.warp.picalculator.gui.expression.Block;
import org.warp.picalculator.gui.expression.BlockContainer;
import org.warp.picalculator.gui.expression.Caret; import org.warp.picalculator.gui.expression.Caret;
import org.warp.picalculator.gui.expression.CaretState; 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.graphicengine.GraphicEngine; import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.Renderer;

2
src/org/warp/picalculator/gui/expression/layouts/InputLayout.java
View File

@ -1,6 +1,6 @@
package org.warp.picalculator.gui.expression.layouts; package org.warp.picalculator.gui.expression.layouts;
import org.warp.picalculator.gui.expression.Block; import org.warp.picalculator.gui.expression.blocks.Block;
public interface InputLayout { public interface InputLayout {
public Block parseChar(char c); public Block parseChar(char c);

4
src/org/warp/picalculator/gui/screens/MathInputScreen.java
View File

@ -17,8 +17,8 @@ import org.warp.picalculator.Utils;
import org.warp.picalculator.device.Keyboard; import org.warp.picalculator.device.Keyboard;
import org.warp.picalculator.device.Keyboard.Key; import org.warp.picalculator.device.Keyboard.Key;
import org.warp.picalculator.gui.DisplayManager; import org.warp.picalculator.gui.DisplayManager;
import org.warp.picalculator.gui.expression.Block; import org.warp.picalculator.gui.expression.blocks.Block;
import org.warp.picalculator.gui.expression.BlockContainer; import org.warp.picalculator.gui.expression.blocks.BlockContainer;
import org.warp.picalculator.gui.expression.containers.InputContainer; import org.warp.picalculator.gui.expression.containers.InputContainer;
import org.warp.picalculator.gui.expression.containers.NormalInputContainer; import org.warp.picalculator.gui.expression.containers.NormalInputContainer;
import org.warp.picalculator.gui.expression.containers.NormalOutputContainer; import org.warp.picalculator.gui.expression.containers.NormalOutputContainer;

16
src/org/warp/picalculator/math/parser/MathParser.java
View File

@ -6,14 +6,14 @@ import java.util.Arrays;
import org.warp.picalculator.Error; import org.warp.picalculator.Error;
import org.warp.picalculator.Errors; import org.warp.picalculator.Errors;
import org.warp.picalculator.gui.expression.Block; import org.warp.picalculator.gui.expression.blocks.Block;
import org.warp.picalculator.gui.expression.BlockChar; import org.warp.picalculator.gui.expression.blocks.BlockChar;
import org.warp.picalculator.gui.expression.BlockContainer; import org.warp.picalculator.gui.expression.blocks.BlockContainer;
import org.warp.picalculator.gui.expression.BlockDivision; import org.warp.picalculator.gui.expression.blocks.BlockDivision;
import org.warp.picalculator.gui.expression.BlockExponentialNotation; import org.warp.picalculator.gui.expression.blocks.BlockExponentialNotation;
import org.warp.picalculator.gui.expression.BlockParenthesis; import org.warp.picalculator.gui.expression.blocks.BlockParenthesis;
import org.warp.picalculator.gui.expression.BlockPower; import org.warp.picalculator.gui.expression.blocks.BlockPower;
import org.warp.picalculator.gui.expression.BlockSquareRoot; import org.warp.picalculator.gui.expression.blocks.BlockSquareRoot;
import org.warp.picalculator.gui.expression.containers.InputContainer; import org.warp.picalculator.gui.expression.containers.InputContainer;
import org.warp.picalculator.math.Function; import org.warp.picalculator.math.Function;
import org.warp.picalculator.math.FunctionOperator; import org.warp.picalculator.math.FunctionOperator;