From bec95321acb40289a459f6f1eab91094cad4b453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 18 Feb 2015 12:30:24 +0100 Subject: [PATCH] Moved some files around --- src/{ => Fractals}/Main.java | 22 ++++++++++-------- .../NumberCalculation/Fibonacci.java | 2 +- .../PythagorasTree/PythagorasTree.java | 6 ++--- .../PythagorasTree/PythagorasTreeQueue.java | 2 +- .../PythagorasTree/PythagorasTreeSeed.java | 2 +- .../PythagorasTree/PythagorasTriangle.java | 6 ++--- .../PythagorasTriangleList.java | 4 +++- .../TurtleTools/DrawingTools.java | 2 +- .../TurtleTools/TurtleState.java | 2 +- aplu5.jar => src/aplu.jar | Bin 10 files changed, 26 insertions(+), 22 deletions(-) rename src/{ => Fractals}/Main.java (93%) rename src/{ => Fractals}/NumberCalculation/Fibonacci.java (92%) rename src/{ => Fractals}/PythagorasTree/PythagorasTree.java (96%) rename src/{ => Fractals}/PythagorasTree/PythagorasTreeQueue.java (94%) rename src/{ => Fractals}/PythagorasTree/PythagorasTreeSeed.java (94%) rename src/{ => Fractals}/PythagorasTree/PythagorasTriangle.java (95%) rename src/{ => Fractals}/PythagorasTree/PythagorasTriangleList.java (92%) rename src/{ => Fractals}/TurtleTools/DrawingTools.java (95%) rename src/{ => Fractals}/TurtleTools/TurtleState.java (93%) rename aplu5.jar => src/aplu.jar (100%) diff --git a/src/Main.java b/src/Fractals/Main.java similarity index 93% rename from src/Main.java rename to src/Fractals/Main.java index 796182c..68a011a 100644 --- a/src/Main.java +++ b/src/Fractals/Main.java @@ -1,9 +1,11 @@ -import PythagorasTree.PythagorasTree; +package Fractals; + +import Fractals.PythagorasTree.PythagorasTree; import ch.aplu.turtle.Options; import ch.aplu.turtle.Playground; import ch.aplu.turtle.Turtle; -import PythagorasTree.*; +import Fractals.PythagorasTree.*; import java.awt.*; import java.util.Scanner; @@ -158,7 +160,7 @@ public class Main { public static void playgroundSettings() { Scanner scanner = new Scanner(System.in); - Options.setFrameTitle("PythagorasTree"); + Options.setFrameTitle("Fractals/PythagorasTree"); System.out.println("How wide should the window be?"); int width = Integer.parseInt(scanner.nextLine()); @@ -231,11 +233,11 @@ public class Main { System.out.println("PisanoPythagorasTreeOne:"); System.out.println(""); System.out.println("This creates an asymetric Pythagoras Tree."); - System.out.println("The angles used in this tree are generated from the NumberCalculation.Fibonacci Numbers."); + System.out.println("The angles used in this tree are generated from the Fractals.NumberCalculation.Fibonacci Numbers."); System.out.println("This (and the following variants) are similar to the regular random trees, "); - System.out.println("just with angles generated from the NumberCalculation.Fibonacci Numbers."); + System.out.println("just with angles generated from the Fractals.NumberCalculation.Fibonacci Numbers."); System.out.println("The angles of this variant calculated like this: "); - System.out.println("NumberCalculation.Fibonacci number of the Level modulo 4 multiplied by 10 plus 30"); + System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 4 multiplied by 10 plus 30"); System.out.println(""); System.out.println(""); System.out.println(""); @@ -243,7 +245,7 @@ public class Main { System.out.println("PisanoPythagorasTreeTwo:"); System.out.println(""); System.out.println("The angles of this variant calculated like this: "); - System.out.println("NumberCalculation.Fibonacci number of the Level modulo 2 multiplied by 30 plus 30"); + System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 2 multiplied by 30 plus 30"); System.out.println(""); System.out.println(""); System.out.println(""); @@ -251,7 +253,7 @@ public class Main { System.out.println("PisanoPythagorasTreeThree:"); System.out.println(""); System.out.println("The angles of this variant calculated like this: "); - System.out.println("NumberCalculation.Fibonacci number of the Level modulo 7 multiplied by 5 plus 30"); + System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 7 multiplied by 5 plus 30"); System.out.println(""); System.out.println(""); System.out.println(""); @@ -259,7 +261,7 @@ public class Main { System.out.println("PisanoPythagorasTreeFour:"); System.out.println(""); System.out.println("The angles of this variant calculated like this: "); - System.out.println("NumberCalculation.Fibonacci number of the Level modulo 31 plus 30"); + System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 31 plus 30"); System.out.println(""); System.out.println(""); System.out.println(""); @@ -267,7 +269,7 @@ public class Main { System.out.println("PisanoPythagorasTreeFive:"); System.out.println(""); System.out.println("The angles of this variant calculated like this: "); - System.out.println("NumberCalculation.Fibonacci number of the Level modulo 9 multiplied by 4 plus 29"); + System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 9 multiplied by 4 plus 29"); System.out.println(""); System.out.println(""); System.out.println(""); diff --git a/src/NumberCalculation/Fibonacci.java b/src/Fractals/NumberCalculation/Fibonacci.java similarity index 92% rename from src/NumberCalculation/Fibonacci.java rename to src/Fractals/NumberCalculation/Fibonacci.java index 5ab04bf..1858755 100644 --- a/src/NumberCalculation/Fibonacci.java +++ b/src/Fractals/NumberCalculation/Fibonacci.java @@ -1,4 +1,4 @@ -package NumberCalculation; +package Fractals.NumberCalculation; import java.util.LinkedList; diff --git a/src/PythagorasTree/PythagorasTree.java b/src/Fractals/PythagorasTree/PythagorasTree.java similarity index 96% rename from src/PythagorasTree/PythagorasTree.java rename to src/Fractals/PythagorasTree/PythagorasTree.java index bb172ae..0defb3a 100644 --- a/src/PythagorasTree/PythagorasTree.java +++ b/src/Fractals/PythagorasTree/PythagorasTree.java @@ -1,11 +1,11 @@ -package PythagorasTree; +package Fractals.PythagorasTree; import ch.aplu.turtle.Turtle; -import TurtleTools.TurtleState; +import Fractals.TurtleTools.TurtleState; import java.awt.*; -import static TurtleTools.DrawingTools.drawSquare; +import static Fractals.TurtleTools.DrawingTools.drawSquare; /** * Created by Christian on 10.02.2015. diff --git a/src/PythagorasTree/PythagorasTreeQueue.java b/src/Fractals/PythagorasTree/PythagorasTreeQueue.java similarity index 94% rename from src/PythagorasTree/PythagorasTreeQueue.java rename to src/Fractals/PythagorasTree/PythagorasTreeQueue.java index 98c69bc..2d24eef 100644 --- a/src/PythagorasTree/PythagorasTreeQueue.java +++ b/src/Fractals/PythagorasTree/PythagorasTreeQueue.java @@ -1,4 +1,4 @@ -package PythagorasTree; +package Fractals.PythagorasTree; import ch.aplu.turtle.Turtle; diff --git a/src/PythagorasTree/PythagorasTreeSeed.java b/src/Fractals/PythagorasTree/PythagorasTreeSeed.java similarity index 94% rename from src/PythagorasTree/PythagorasTreeSeed.java rename to src/Fractals/PythagorasTree/PythagorasTreeSeed.java index 1694c22..3fc4d11 100644 --- a/src/PythagorasTree/PythagorasTreeSeed.java +++ b/src/Fractals/PythagorasTree/PythagorasTreeSeed.java @@ -1,4 +1,4 @@ -package PythagorasTree; +package Fractals.PythagorasTree; /** * Created by Christian on 11.02.2015. diff --git a/src/PythagorasTree/PythagorasTriangle.java b/src/Fractals/PythagorasTree/PythagorasTriangle.java similarity index 95% rename from src/PythagorasTree/PythagorasTriangle.java rename to src/Fractals/PythagorasTree/PythagorasTriangle.java index b395536..c31fc01 100644 --- a/src/PythagorasTree/PythagorasTriangle.java +++ b/src/Fractals/PythagorasTree/PythagorasTriangle.java @@ -1,9 +1,9 @@ -package PythagorasTree; +package Fractals.PythagorasTree; -import NumberCalculation.Fibonacci; +import Fractals.NumberCalculation.Fibonacci; /** - * Class PythagorasTree.PythagorasTriangle + * Class Fractals.PythagorasTree.PythagorasTriangle * @author Jan Christian Grünhage */ public class PythagorasTriangle { diff --git a/src/PythagorasTree/PythagorasTriangleList.java b/src/Fractals/PythagorasTree/PythagorasTriangleList.java similarity index 92% rename from src/PythagorasTree/PythagorasTriangleList.java rename to src/Fractals/PythagorasTree/PythagorasTriangleList.java index 6b67bb6..65df442 100644 --- a/src/PythagorasTree/PythagorasTriangleList.java +++ b/src/Fractals/PythagorasTree/PythagorasTriangleList.java @@ -1,7 +1,9 @@ -package PythagorasTree; +package Fractals.PythagorasTree; import java.util.LinkedList; +import Fractals.NumberCalculation.Fibonacci; + /** * Created by Christian on 10.02.2015. */ diff --git a/src/TurtleTools/DrawingTools.java b/src/Fractals/TurtleTools/DrawingTools.java similarity index 95% rename from src/TurtleTools/DrawingTools.java rename to src/Fractals/TurtleTools/DrawingTools.java index 2e75a1c..8de795f 100644 --- a/src/TurtleTools/DrawingTools.java +++ b/src/Fractals/TurtleTools/DrawingTools.java @@ -1,4 +1,4 @@ -package TurtleTools; +package Fractals.TurtleTools; import ch.aplu.turtle.Turtle; diff --git a/src/TurtleTools/TurtleState.java b/src/Fractals/TurtleTools/TurtleState.java similarity index 93% rename from src/TurtleTools/TurtleState.java rename to src/Fractals/TurtleTools/TurtleState.java index c96a615..d09be9f 100644 --- a/src/TurtleTools/TurtleState.java +++ b/src/Fractals/TurtleTools/TurtleState.java @@ -1,4 +1,4 @@ -package TurtleTools; +package Fractals.TurtleTools; import ch.aplu.turtle.Turtle; diff --git a/aplu5.jar b/src/aplu.jar similarity index 100% rename from aplu5.jar rename to src/aplu.jar