From 273f157e096f27b06389f49239e0aafbdb4d99b3 Mon Sep 17 00:00:00 2001 From: Amcbri15 Date: Tue, 19 May 2015 20:43:17 -0400 Subject: [PATCH 1/6] Anthony Initial Commit --- .../java/nyc/c4q/AbstractAwesomeClass.java | 6 +- src/main/java/nyc/c4q/AwesomeContainer.java | 9 ++- .../java/nyc/c4q/ConcreteAwesomeClass.java | 2 +- src/main/java/nyc/c4q/SubFunClass.java | 12 +++- src/main/res/layout/activity_initial.xml | 57 +++++++++++++++++-- 5 files changed, 74 insertions(+), 12 deletions(-) diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java index e3f9c21..74d884e 100644 --- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java +++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java @@ -5,13 +5,15 @@ */ public abstract class AbstractAwesomeClass implements AwesomeInterface { + int num = 4; + @Override public int getData() { - return 0; + return num; } @Override public void setData(int someData) { - + num = someData; } } diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java index 64e9fd9..e9a5e30 100644 --- a/src/main/java/nyc/c4q/AwesomeContainer.java +++ b/src/main/java/nyc/c4q/AwesomeContainer.java @@ -3,16 +3,21 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import java.util.List; /** * Created by amyquispe on 5/19/15. */ public class AwesomeContainer { + + private static List myList; + public static Collection createAwesomeContainer(){ - return null; + + return myList; } public static void addAwesomeObject(Collection awesomeContainer){ - return; + } } diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java index f39acca..8f060b1 100644 --- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java +++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java @@ -3,7 +3,7 @@ /** * Created by amyquispe on 5/19/15. */ -public class ConcreteAwesomeClass extends AbstractAwesomeClass { +public class ConcreteAwesomeClass extends AbstractAwesomeClass implements AwesomeInterface { public ConcreteAwesomeClass(){ } public ConcreteAwesomeClass(int startData){ diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java index ef94dce..d0559c7 100644 --- a/src/main/java/nyc/c4q/SubFunClass.java +++ b/src/main/java/nyc/c4q/SubFunClass.java @@ -3,7 +3,17 @@ /** * Created by amyquispe on 5/19/15. */ -public class SubFunClass { +public class SubFunClass extends SuperFunClass implements AwesomeInterface { public SubFunClass(){ } + + @Override + public int getData() { + return 0; + } + + @Override + public void setData(int someData) { + + } } diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml index 49e22b0..7829dba 100644 --- a/src/main/res/layout/activity_initial.xml +++ b/src/main/res/layout/activity_initial.xml @@ -9,10 +9,55 @@ tools:context="nyc.c4q.InitialActivity" android:id="@+id/activity_initial"> - + + + + +