Skip to content

Commit

Permalink
Updated classes
Browse files Browse the repository at this point in the history
  • Loading branch information
DeflatedPickle committed Mar 17, 2018
1 parent a006363 commit f036af1
Show file tree
Hide file tree
Showing 12 changed files with 95 additions and 50 deletions.
10 changes: 3 additions & 7 deletions src/goddrinksjava/Circle.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package goddrinksjava;

public class Circle extends PointSet {
public interface Circle extends PointSet {
// Not sure what to return
public Object getCircumference() {
return "";
}
Object getCircumference();

public void resetCircumference() {

}
void resetCircumference();
}
2 changes: 1 addition & 1 deletion src/goddrinksjava/Eggplant.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package goddrinksjava;

public class Eggplant extends Fruit {
public interface Eggplant extends Fruit {
}
18 changes: 5 additions & 13 deletions src/goddrinksjava/Fruit.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
package goddrinksjava;

public class Fruit extends Thing {
public interface Fruit {
// Not sure what to return
public Object getNutrients() {
return "";
}
Object getNutrients();

public void resetNutrients() {

}
void resetNutrients();

// Not sure what to return
public Object getAntioxidants() {
return "";
}

public void resetAntioxidants() {
Object getAntioxidants();

}
void resetAntioxidants();
}
8 changes: 8 additions & 0 deletions src/goddrinksjava/GodDrinksJava.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,13 @@ public static void main(String[] args) {
if (world.getGod().equals(me)) {
me.setProof(you.toProof());
}

/* --------------- */

me.toggleGender();
me.toggleRoleBDSM();

world.makeHigh(me);
world.makeHigh(you);
}
}
11 changes: 7 additions & 4 deletions src/goddrinksjava/Lovable.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ public void addFeeling(String feeling) {

}

public void setSatisfaction() {
public void setSatisfaction(Integer level) {

}

// Not sure what to return
public Object toSatisfaction() {
return "";
public Integer toSatisfaction() {
return 0;
}

public Integer getFeelingIndex(String feeling) {
Expand All @@ -33,4 +32,8 @@ public Integer getFeelingIndex(String feeling) {
public void requestExecution(World world) {

}

public void toggleGender() {

}
}
15 changes: 3 additions & 12 deletions src/goddrinksjava/PointSet.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
package goddrinksjava;

public class PointSet extends Thing {
public interface PointSet {
// Not sure what to return
public Object getDimensions() {
return "";
}
Object getDimensions();

public void resetDimentions() {

}

// Not sure what to return
public Object toAttribute() {
return "";
}
void resetDimentions();
}
6 changes: 2 additions & 4 deletions src/goddrinksjava/Sequence.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package goddrinksjava;

public class Sequence extends Thing {
public void setLimit() {

}
public interface Sequence {
void setLimit(Integer limit);
}
2 changes: 1 addition & 1 deletion src/goddrinksjava/SineWave.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package goddrinksjava;

public class SineWave extends Thing {
public interface SineWave {
}
6 changes: 2 additions & 4 deletions src/goddrinksjava/TabbyCat.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package goddrinksjava;

public class TabbyCat extends Thing {
public void purr() {

}
public interface TabbyCat {
void purr();
}
61 changes: 58 additions & 3 deletions src/goddrinksjava/Thing.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package goddrinksjava;

public class Thing {
public class Thing implements Circle, PointSet, SineWave, Sequence, Fruit {
public void addAttribute() {

}
Expand All @@ -11,8 +11,8 @@ public Object getXPosition() {
}

// Not sure what to return
public Object toLimit() {
return "";
public Integer toLimit() {
return 0;
}

public void toggleCurrent() {
Expand All @@ -35,4 +35,59 @@ public void setProof(Object proof) {
public Object toProof() {
return "";
}

// Not sure what to return
public Object toAttribute() {
return "";
}

/* ----- Circle ----- */

// Not sure what to return
public Object getCircumference() {
return "";
}

public void resetCircumference() {

}

/* ----- PointSet ----- */

// Not sure what to return
public Object getDimensions() {
return "";
}

public void resetDimentions() {

}

/* ----- SineWave ----- */

/* ----- Sequence ----- */

public void setLimit(Integer limit) {

}

/* ----- Fruit ----- */

// Not sure what to return
public Object getNutrients() {
return "";
}

public void resetNutrients() {

}

// Not sure what to return
public Object getAntioxidants() {
return "";
}

public void resetAntioxidants() {

}
}
2 changes: 1 addition & 1 deletion src/goddrinksjava/Tomato.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package goddrinksjava;

public class Tomato extends Fruit {
public interface Tomato extends Fruit {
}
4 changes: 4 additions & 0 deletions src/goddrinksjava/World.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,8 @@ public void lockThing(Thing thing) {
public Lovable getGod() {
return God;
}

public void makeHigh(Thing height) {

}
}

0 comments on commit f036af1

Please sign in to comment.