diff --git a/.gitignore b/.gitignore index 0f182a0..118b353 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.class +bin/* + # Package Files # *.jar *.war diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..4a6b241 --- /dev/null +++ b/build.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Goldfish.java b/src/Goldfish.java index b31df93..d3f3489 100644 --- a/src/Goldfish.java +++ b/src/Goldfish.java @@ -1,3 +1,8 @@ +package edu.stuy.goldfish; + + +import edu.stuy.goldfish.rules.*; + public class Goldfish { private Grid _grid; @@ -10,5 +15,6 @@ public class Goldfish { public static void main (String[] args) { Goldfish g = new Goldfish(); + Conway c = new Conway(); } } diff --git a/src/Grid.java b/src/Grid.java index 0d265ba..4eb28cb 100644 --- a/src/Grid.java +++ b/src/Grid.java @@ -1,3 +1,5 @@ +package edu.stuy.goldfish; + public class Grid { private Patch[][] _grid; diff --git a/src/Patch.java b/src/Patch.java index 63ae173..264220f 100644 --- a/src/Patch.java +++ b/src/Patch.java @@ -1,3 +1,5 @@ +package edu.stuy.goldfish; + public class Patch { private int _pxcor, _pycor; private String _plabel; @@ -9,6 +11,10 @@ public class Patch { _pycor = ycor; } + public Patch () { + this(new Grid(), 0, 0); + } + public String toString() { return _plabel; } diff --git a/src/Render.java b/src/Render.java index eaeea53..de3fe2e 100644 --- a/src/Render.java +++ b/src/Render.java @@ -1,3 +1,5 @@ +package edu.stuy.goldfish; + import java.awt.Color; diff --git a/src/rules/Conway.java b/src/rules/Conway.java index 33ccab0..9daae4b 100644 --- a/src/rules/Conway.java +++ b/src/rules/Conway.java @@ -1,2 +1,9 @@ +package edu.stuy.goldfish.rules; + +import edu.stuy.goldfish.Patch; public class Conway extends RuleSet { + + public Conway () { + Patch p = new Patch(); + } } diff --git a/src/rules/RuleSet.java b/src/rules/RuleSet.java index a2a5357..309fe15 100644 --- a/src/rules/RuleSet.java +++ b/src/rules/RuleSet.java @@ -1,2 +1,4 @@ +package edu.stuy.goldfish.rules; + public class RuleSet { }