From 5a3f0d0eacaded5b68302a7835e9ac5cba80ee5c Mon Sep 17 00:00:00 2001 From: RosmaryFC Date: Thu, 30 Apr 2015 22:00:02 -0400 Subject: [PATCH 1/4] initial commit, started oop --- .DS_Store | Bin 0 -> 6148 bytes exercises/5_OOP-and-Intents/oop/.idea/.name | 1 + .../5_OOP-and-Intents/oop/.idea/compiler.xml | 23 + .../oop/.idea/copyright/profiles_settings.xml | 3 + .../5_OOP-and-Intents/oop/.idea/encodings.xml | 4 + .../5_OOP-and-Intents/oop/.idea/misc.xml | 243 ++++++++++ .../5_OOP-and-Intents/oop/.idea/modules.xml | 8 + .../oop/.idea/scopes/scope_settings.xml | 5 + exercises/5_OOP-and-Intents/oop/.idea/vcs.xml | 6 + .../5_OOP-and-Intents/oop/.idea/workspace.xml | 439 ++++++++++++++++++ exercises/5_OOP-and-Intents/oop/oop.iml | 11 + .../5_OOP-and-Intents/oop/src/Clarinet.java | 32 ++ .../oop/src/ClarinetPlayer.java | 37 ++ .../oop/src/ReedInstrument.java | 20 + .../5_OOP-and-Intents/oop/src/ReedPlayer.java | 18 + 15 files changed, 850 insertions(+) create mode 100644 .DS_Store create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/.name create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/compiler.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/encodings.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/misc.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/modules.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/vcs.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/workspace.xml create mode 100644 exercises/5_OOP-and-Intents/oop/oop.iml create mode 100644 exercises/5_OOP-and-Intents/oop/src/Clarinet.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f7961951398b3e367c85175b2f65cade6b00d188 GIT binary patch literal 6148 zcmeHKOHRWu5Pegs(uhr$EWKof#0^4~B6Y#0Tmbr!Kn(;X;kD84U`$mUBs9N>_N(?}5IrNJ_-Cx}fC?K_^Sl>rj{nGj zu3f?vd#9FYtY5KO=Eah|x;3t-XWw4f((Q1M0*}mjBbM0C^H%(4C;k|@?h0N7o^*FK zqh-;FPO!iXm&kBUJm)y;PR3U!W5hXZ@XFoC8MR~m+&@}#ukg&cJ8Wso?rflQZ^rZ1 z#27FJjDZ7VfHhlXd=k*CF<=ZB13L!v`{1aGX~a69|8&s!BLHzow->hchf#A}#57_Z zkUbO$sl<>f@rWTIoqiYN(uj4ykPeB54~Zj7JfVmmozHhZ9Fhh!YYZ3zZ3d3Q?L_PU z?C + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml b/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml b/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/misc.xml b/exercises/5_OOP-and-Intents/oop/.idea/misc.xml new file mode 100644 index 00000000..cb973731 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/misc.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + 1.7 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/modules.xml b/exercises/5_OOP-and-Intents/oop/.idea/modules.xml new file mode 100644 index 00000000..b67b02b8 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml b/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml b/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml b/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml new file mode 100644 index 00000000..ed569a90 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430441608157 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/oop.iml b/exercises/5_OOP-and-Intents/oop/oop.iml new file mode 100644 index 00000000..c90834f2 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/oop.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/Clarinet.java b/exercises/5_OOP-and-Intents/oop/src/Clarinet.java new file mode 100644 index 00000000..4ca37690 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/Clarinet.java @@ -0,0 +1,32 @@ +/** + * Created by c4q-rosmary on 4/30/15. + */ + +//Create the concrete class Clarinet, which inherits from ReedInstrument. +public class Clarinet extends ReedInstrument +{ + + @Override + boolean has_reed() + { + return true; + } + + @Override + void place_reed() + { + + } + + @Override + void remove_reed() + { + + } + + @Override + public String play() + { + return "*Clarinet Sound* "; + } +} diff --git a/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java b/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java new file mode 100644 index 00000000..4c29fab8 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java @@ -0,0 +1,37 @@ +/** + * Created by c4q-rosmary on 4/30/15. + */ + +//Create the concrete class ClarinetPlayer, which extends Musician. +public class ClarinetPlayer extends Musician +{ + protected Clarinet clarinet; + + + //The ClarinetPlayer constructor should take in a Clarinet, and save it in a field called myClarinet + public ClarinetPlayer (Clarinet clarinet) { + this.clarinet = clarinet; + + } + + //Add a method toggle_reed, which puts a reed on the Clarinet if it doesn't have one, and takes the reed off it if does. + public void toggle_reed(){ + if (clarinet.has_reed()) {//if true + clarinet.remove_reed(); + } else { // if false + clarinet.place_reed(); + } + } + + //Implement the play_instrument method such that if the instrument doesn't have a reed on, + // it returns null, and otherwise plays the instrument sound. + @Override + public String play_instrument() + { + if (!clarinet.has_reed()) { + return null; + } + + return clarinet.play(); + } +} diff --git a/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java b/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java new file mode 100644 index 00000000..9e663854 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java @@ -0,0 +1,20 @@ +/** + * Created by c4q-rosmary on 4/30/15. + */ + +//Create an abstract class ReedInstrument, which implements Instrument. +public abstract class ReedInstrument implements Instrument +{ + //A ReedInstrument needs a boolean field reed, which represents if the instrument currently has a reed in it. + boolean reed; + + //It also needs methods, has_reed which tells us if the instrument currently has a reed, + abstract boolean has_reed (); + + //place_reed, which puts a reed on the instrument, + abstract void place_reed (); + + + //and remove_reed which removes the reed from the instrument + abstract void remove_reed (); +} diff --git a/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java b/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java new file mode 100644 index 00000000..2d715507 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java @@ -0,0 +1,18 @@ +/** + * Created by c4q-rosmary on 4/30/15. + */ + +//Create the abstract class ReedPlayer, which extends Musician. +//Port the functionality of ClarinetPlayer to ReedPlayer, +// including having the ReedPlayer keep a ReedInstrument field set in the constructor. +public abstract class ReedPlayer extends Musician +{ + protected ClarinetPlayer clarinetPlayer; + protected ReedInstrument reedInstrument; + + public ReedPlayer (ReedInstrument reedInstrument){ + this.reedInstrument = reedInstrument; + } + + +} From f4597bab1ef65ac658124582c58b93e60661aa75 Mon Sep 17 00:00:00 2001 From: RosmaryFC Date: Sun, 3 May 2015 11:37:49 -0400 Subject: [PATCH 2/4] copied exercises to unit 1 homework folder --- homework/.DS_Store | Bin 0 -> 6148 bytes homework/RosmaryFermin/.DS_Store | Bin 0 -> 8196 bytes .../Problem 1 Animal Sort/.DS_Store | Bin 0 -> 6148 bytes .../Problem 1 Animal Sort/.idea/compiler.xml | 23 + .../.idea/copyright/profiles_settings.xml | 3 + .../.idea/description.html | 1 + .../Problem 1 Animal Sort/.idea/encodings.xml | 4 + .../Problem 1 Animal Sort/.idea/misc.xml | 12 + .../Problem 1 Animal Sort/.idea/modules.xml | 8 + .../.idea/project-template.xml | 3 + .../.idea/scopes/scope_settings.xml | 5 + .../.idea/uiDesigner.xml | 124 ++++++ .../Problem 1 Animal Sort/.idea/vcs.xml | 6 + .../Problem 1 Animal Sort/.idea/workspace.xml | 417 ++++++++++++++++++ .../Problem 1 Animal Sort.iml | 12 + .../nyc/c4q/RosmaryFC/Animal.class | Bin 0 -> 998 bytes .../nyc/c4q/RosmaryFC/Domestic.class | Bin 0 -> 215 bytes .../nyc/c4q/RosmaryFC/DomesticCat.class | Bin 0 -> 992 bytes .../nyc/c4q/RosmaryFC/Main.class | Bin 0 -> 2948 bytes .../Problem 1 Animal Sort/src/.DS_Store | Bin 0 -> 6148 bytes .../Problem 1 Animal Sort/src/nyc/.DS_Store | Bin 0 -> 6148 bytes .../src/nyc/c4q/.DS_Store | Bin 0 -> 6148 bytes .../src/nyc/c4q/RosmaryFC/.DS_Store | Bin 0 -> 6148 bytes .../src/nyc/c4q/RosmaryFC/Animal.java | 31 ++ .../src/nyc/c4q/RosmaryFC/Domestic.java | 13 + .../src/nyc/c4q/RosmaryFC/DomesticCat.java | 43 ++ .../src/nyc/c4q/RosmaryFC/Main.java | 86 ++++ .../RosmaryFermin/Problem 2 Cards/.DS_Store | Bin 0 -> 6148 bytes .../Problem 2 Cards/.idea/compiler.xml | 23 + .../.idea/copyright/profiles_settings.xml | 3 + .../Problem 2 Cards/.idea/description.html | 1 + .../Problem 2 Cards/.idea/encodings.xml | 4 + .../Problem 2 Cards/.idea/misc.xml | 12 + .../Problem 2 Cards/.idea/modules.xml | 8 + .../.idea/project-template.xml | 3 + .../.idea/scopes/scope_settings.xml | 5 + .../Problem 2 Cards/.idea/vcs.xml | 6 + .../Problem 2 Cards/.idea/workspace.xml | 244 ++++++++++ .../Problem 2 Cards/Problem 2 Cards.iml | 12 + .../Problem 2 Cards/src/.DS_Store | Bin 0 -> 6148 bytes .../Problem 2 Cards/src/nyc/.DS_Store | Bin 0 -> 6148 bytes .../Problem 2 Cards/src/nyc/c4q/.DS_Store | Bin 0 -> 6148 bytes .../src/nyc/c4q/RosmaryFC/.DS_Store | Bin 0 -> 6148 bytes .../src/nyc/c4q/RosmaryFC/Main.java | 8 + .../src/nyc/c4q/RosmaryFC/PlayingCards.java | 10 + .../src/nyc/c4q/RosmaryFC/cardGame.java | 11 + 46 files changed, 1141 insertions(+) create mode 100644 homework/.DS_Store create mode 100644 homework/RosmaryFermin/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/compiler.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/copyright/profiles_settings.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/description.html create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/encodings.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/misc.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/modules.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/project-template.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/scopes/scope_settings.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/uiDesigner.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/vcs.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/workspace.xml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/Problem 1 Animal Sort.iml create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Animal.class create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Domestic.class create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/DomesticCat.class create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Main.class create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Animal.java create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Domestic.java create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/DomesticCat.java create mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Main.java create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/compiler.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/copyright/profiles_settings.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/description.html create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/encodings.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/misc.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/modules.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/project-template.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/scopes/scope_settings.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/vcs.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/workspace.xml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/Problem 2 Cards.iml create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/.DS_Store create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/Main.java create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/PlayingCards.java create mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/cardGame.java diff --git a/homework/.DS_Store b/homework/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dade144eb0f19656c8f14bd5a4b17ab05e74e0bd GIT binary patch literal 6148 zcmeHKTTc@~6g~r0TM$`pf{135#)t`;dLf9KSPDXjA`K;60$6w3p-kBB)ZHx=2}vJ~ z&;9`81@*!IV2Hl?2lT;T;De96;hEW~+>{p*W5}M(neXhGbI$I5)0yc207(?HmjN^Y z2%`!N)nM}n5&c52``DkyxxH`3u*EZ`#Z8P7i^_Y{bEsr<6We_=&5~PCnHy%oVy+j9eI-@Z zp(96+g(Ee!;?f#w=28p1l=2L(=q3zjM&7Y3HIWxa*8){=DS5~d~%n@%v7napC|ayTNcwAQ+^a=p7t zztY>Y+NH1b^u)UKYgc<#SGAAf@aYTPeIwI_)n_kXy?(Ry_TBm?$pH{tEu}OmtiWe9 z_8AS9SyBvk9@)3m)UPJ3$>6aoTVk!_Lvf@|h+Kn$T<3ff}Z7dg7ZxWclJ*n>j+R75|Os3QjP)6uW1xVXZykA6B3b@(9a$wZw{ zh xUaO-%L=__9%09{zY}9rv4Y3usp-RC%T^NXQg=HVngA)7^kTe8Mz`#Fc;1`)${|f*B literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/.DS_Store b/homework/RosmaryFermin/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d87ef8e6c7d2fec9a11e8b817776c3d8eba19e82 GIT binary patch literal 8196 zcmeHMO=}ZT6uqyFbz(PF^OTPmiIG}dgBv?4Bq;FK1zT4&5?2BtG%W|Al&khMR< z@1G%v{s(`FxT@!U7;IuFSu}{g8}2>t>%JGxnauP~iHJ42tuj%8h%C53dkx_aCgz1t z*^(Z~0~zv(Lh|W|IF;eX3GHFkl$?8yUbeTbMQDxvyqTGz=I9{!0eL{ei;; z)-;Y3%3BA5ECGNy3`;{Bb%4y_8fzLy3S}zxRMi91sZ5s`Or>LF6ngLO}uTzr}ipe`szt<_E0M)#UQBDr#6Uy#}@l!91 zJ!FX=+GF?zJa>GIIM+^IKkew9et4ZQNV8Ju8(Uh=om)9?`Pq&+H*8bJrjpK0KcD=p8?;qNix8o>tgUC;QOFh^RqE_5*#NDWs9yn^h z{h*b#5AF44;`fl+bR&N+NCPhjgY2c17oS7BFc@rc@|%_FaA<$B ztgF|z>h~UWhOb_~dHe4DhmW7XNK%ODdlp?%{c-#{A7wo!iNZK~jx4d`g(=xKA=EYm zOQ=QZgjC;=aSeV&OLa=Nk%vgga|%rplH8b*qykCqamUC0ul7t=GujM^CGw2Sxx zJx+Cq)yg_)xV z^Aw$!uhF(v0jt2O0(ISW<^F&7_vioBBHObHSOxwm1z2M{*zRLVW^X;QIJwt)@Mmyo pl2>UwDnX#OVsPbFya`u^ye9*oZ?Mvc49tEAC>d;H75JkH`~Wu_hIjw~ literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/compiler.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/compiler.xml new file mode 100644 index 00000000..a8523149 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/copyright/profiles_settings.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/description.html b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/description.html new file mode 100644 index 00000000..db5f1295 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/description.html @@ -0,0 +1 @@ +Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/encodings.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/misc.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/misc.xml new file mode 100644 index 00000000..ccf24ce4 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/modules.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/modules.xml new file mode 100644 index 00000000..42f4fce1 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/project-template.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/project-template.xml new file mode 100644 index 00000000..1f08b887 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/project-template.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/scopes/scope_settings.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/uiDesigner.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/uiDesigner.xml new file mode 100644 index 00000000..e96534fb --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/vcs.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/workspace.xml b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/workspace.xml new file mode 100644 index 00000000..20ff3cc6 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/.idea/workspace.xml @@ -0,0 +1,417 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430530681436 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/Problem 1 Animal Sort.iml b/homework/RosmaryFermin/Problem 1 Animal Sort/Problem 1 Animal Sort.iml new file mode 100644 index 00000000..d5c07432 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/Problem 1 Animal Sort.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Animal.class b/homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Animal.class new file mode 100644 index 0000000000000000000000000000000000000000..3c43f097f517bdcdac66802b9ddff965af478a27 GIT binary patch literal 998 zcmZ`%U2D@&7=GR~ZI(3My4mTR?d)`FKfnljw+|eZ!k|uA#_msJ=(4p*O;d4y#XsPU z7YaJT3-Q|DB;tFLux5-Ba+3GsdEVzd=luEi^A~{UXd5V?u0zG9fd_b~Vawp)k%q?_ zo)C(YvFmv5Uq9< zI34xf@L2SRFSk8-g)=@ASiSVM^vG#p$B!)b4ao|RF zR#>Icyg8eoJHcoyLiacz)Ee^{n+Jq^5S_XqK}&Z`AkLQTNI2)O#W+=WZI5sIXRZ@% zOSJOg*>!u;8f&nRGy3p z0}T@k&^0to+(L`6HqS>{uMojN0fg-OaM_nlV07mNvsMY=sE61GkfIETPO1<6>6HzKoTW z)8a32E#LYEbAZP3y5#4k7MElu>wyesWRS|MOx8~}Dbx?jFV0OY zs&sSKhpAv>5I{J4CKg5pW(F1p1|ZGKzy=fnIu0bxzySa^ Cb~gF| literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/DomesticCat.class b/homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/DomesticCat.class new file mode 100644 index 0000000000000000000000000000000000000000..64ff146a8be596545b0751d0366f4c9dd288d9c3 GIT binary patch literal 992 zcmah{%Wl&^6g}f4xN*`ZDQPGrY10R79tbaB$3s9+rAnbvN!9(-j8a2v2ipbpSNH)o zEI{HRvET#vCWJVCv+Pb!_O^)UhRy zb)};O7W>cTD`}3TJ2VHOZ@a@g0+;UEt{vVN*lA6}(>LuS()GM&q$~ApSM8rV$I3sH z$D_D_XUWl#^zFz`FSFr^9SE%T-80LyZof32dVwSTv)!Kg*mG16+E!17R8k1W%Cc3k zAB)w8Dom_ut39nlKo8CXwr41xo#Lw331{B&oU!!Pp(n7>`j52so&}1eT}qhpz3& zk-*9{bY4+lY1Tyea^*iiz+Xc5u+D#!1HT6sBGKHlwDT~y7w8>8LxyLe)BOU`x$z0w z2f7-H+!tbKffOYsR4~uGW)e=UM30FmlQyC+#050k6)dLoCeH}Vbv{CSPa`2t^weU) zViJ%N3S34tO@72^jX6fAOIg1&7%@_(v_{NQOCm318CZ&C2|m%4lyA(KsMlsh)#dt( z%)R;>R3`kl$kyL6CKC@JsnVj|o@l;#QKgAxjzJKw;wo0ie~r0w(0*W5JcwGa)7Q}W E1<1F?_5c6? literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Main.class b/homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..0cb0b52a9f647c530841541307fb41f715afde07 GIT binary patch literal 2948 zcma)8+iw(A9RAK;=FH5_ZfnZ`0~S_AC`v69SYf#dtq8J|$`-WZZMq%Gz~0ykx~Oo{X#1$-T6b)3_YSF?gdQKBTE?e>d)ZLdJMf8$Ak z$Z%=O6X?qLMQ^lTnDi>+?qr@TJ(*I@&7X8DzM2P%k=hx*DzGwBY~%)W+s+RjFI5X} zrEze0@Tlt-cQIdqqrme1Q<<~w1$Qv-7N-ZZwTfSy-lgh^X9QMt2;X1y3vON|a4VH{ z0;^B`r&Hc5(n%Z^2>HtJ1=e;57%3IJYR%6LyEUdxcFMWfh1I8dz}^n%$=FnBn%|sT zBg{#^G9_SD%U;g+s-rFo3B>EgYN=B5rh<8Qi-da3&ktt&ssa&PV% zj%;TdzOj^OMb0lQU)-Wbx!tBsHvB|Suu9l==-A2-{ zrj;v?*0=O%3)tiN4wNR7>>{N!UMi?lzRGKvEuU!=2{?MZe!5O6S@dW^t2VK{hD*Fv zOEW881-j=?*#aeynCD2*BVhM;zL8;fib7tr+sd(PZn^9gnSP*C@g;bI-Y_sct@>>DAKtjYDS*YZaX09m zYM#Kd{)K+Qb3@70N-euBnZ*Fvin4;6zroCj_A`0>5`~Hpo$MjNUa1@j-KY9lu(0QQ}V8R?7kFv4JxK{n*GA21i#T zf^KHqa2276p71OpnWhz`b+l<|v_`d0xE;PbI}zEGorn%((~+x?6SL6MQ74kt9BnQo z!zta?ZTU7O-E*s&=+RHO6?P<9arA83 zXu~rdBOP;Mb15sFiraD9Qt)DSd?=l8OeYb*i?`s#?3hBl1YVzlXWFp<-ijHlnWrSy zq{LW2NsKiu$C^vU!>NRwu;Z$xWhaKxT~5sD3Th@=H7(n6n0QIeCM7Z3>R8iKHI=*~ zQ1W`SDW#P#;b0k7VGVA@X7phvHJYV5ALp2(XN3ZMgX3G2+&j1%?_(3bzyQAC_$?!T z#1;|9X3>l7!og0l9%-=^yTvf}hz$0L)3{HRIbOi9coie!J&qsZ0Wpii;!_+E-ytKe zar_C##2*+7C2=gYo(L#=aiEFC#9gdwU=QWLiIp`RAijHeZzS#~?#;AxoF?)uv^1h? zMVR;?h>(~GB6M5{A`E;NL`Y&(5kp9bv1Y_p#Kegp!V-@J5pmH7B4R|{is%xb1re6` zGKh$auY-t$_&JEM)D^`xY$x+(s1GTgh%Z;D7x&T%VNJ-u4q9O{`5R*f*rlD~7o@QZ zQM@lMVmB>KtQUej3_+6PU$K{#PNuJ6AOF8J$oKcSkA5bZoyLAzF>(c-t(|T7Mz&#Q zYx$4d@E@W7{q+AF-PdUt5(gz7X#XCPI4p692=F`l{z6Fni5=G|AG4ERC)W`q{>Ak{ b3H}~wRyeY>Lf8KYW5Jsu$#90J3E}8J*pQTU literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/src/.DS_Store b/homework/RosmaryFermin/Problem 1 Animal Sort/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8200a883be065c66a7a3b7ec14053b9c77ec665f GIT binary patch literal 6148 zcmeHKQA^xF5Z=AJ)||eiR6+11j~1?Q_S)WSJgwkE;UGmRTF%6T-a^P8mz;+j2YL2q zSZ)0oh0^|q{uH0=%unwX2Fu9E-#4^w#=qLC-3vyt*#!dDvR~Fqeoes?+13gT@@Gop1af?CP$Fk4YOoNu=u=rYEPL&dxu7x%l?oOjtoLRn58=V2%cH=EQ*mCUZASkA(|eM5dRW`G&^R}A3(;DI9ggr!BZ zbwFcE0Kgi!jeu=_{sBF70Q!WbMeu+~n+j-CC6ySGY6of4q2H(Y(xOcl(mWZ)p(jhK zP$ZQe(lg;g`WCrm2AF}{3}EdC;^O)L=Fj!N3F3wsUWjwv|c)Jc3*-L%j{!Jv{5lHy8{h!=#`vE-Ow3_ABQ z`u`Y#ki0`4rKfaecN`MZUfZ zq(Yu5pu{osL6qtU?r=Dke}Ms9yQ(-4>*DBjdTae&LC*@Pyt*odLwH-#=DjE0O zr58FYLX{=M8>#y{DvR~Fqeoes?+13g9TgY-p8L2vOpYP78)nJ2%2lLNRh&3=yn62P zWU{)p+3;GeXVZo^X}6mVZ@tx?PTf<-dGd7Q`J3Ir^uxzbpTB(l_WkVKOjt t^gSpF#+4SYQ@}7sF~s6gybNjt{2m&BK4EDQJRtldU})fm8Tg|N`~=N#XQcoD literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/.DS_Store b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ea006daf8050041b8336469c2bd09b2fcf9a8e72 GIT binary patch literal 6148 zcmeHKUyIW~5TET;P48YJo^asHJ}Ok`S+%dRcOLj46eD+tCp9s_F2rm}(kn+P}CK!^e4$SfDZs3Dq*9AW`)o=>5?>D zWDQZ6IU*?F81`W2QMQ!Lfs4ohy}K4X0SzU*fiv$2#mNcUl@;-{ z9J`8N@i~cjkV^b%U8VC`UYM8)%6$QNKeBmswQPWDxRA=m87xr2T?Uz_)oRY zPW>p}SLt-;4id3E!XG#wbRG#Q*Ur+L+JPhr82P&yXL;w1qNRO~|5asE-9QqdAHk}&;75ScjMN*2alhP=WpM=|M2nC=P%#B zn}-L1AG?uj4j1qPofTvrg+-p}{56g)Di;-u%m6dM44exCZZq;W&SiC8lo?hmmTe!@yx}5l2vjEk(4Y!nGK}mSbGHyue{?(Uya7 z&4+L+3)i6tvpUW%O*)9cB3ovF8TgX{>itlBI{zR3z5h2!Y?uLN;QwSmGMVVw0|YhBG{4 zg(t52d;RrQ(=HcHyI_XOb4fq`%*F^fM1_`|2fScS_Hz5>L+1N{S?n;+IrI7_zT6D> z2e@Ybifi6zJ(y8G1`JliLV-{q6bJ=E0at)$w%T-N7-c9B3WNe%1$2K%bj8xKGt65D zi~Iy2>NPqWW4$aZCpngmogsT@VpO70#h(~rbhanYD;+ySqeJ}hAwKiw@gjM4j-PTm zq%@2&6bJ?S3hZ08(DVO-zs%?(zfXx;C=d$#GX-Q)-Bxpcl%K6TpQmSSqTkWgG_TWu n#<+J0U`6+lqugozNn_@fj-8>7qV1VZjEg`PB#Kbr7ZmscoqtCH literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Animal.java b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Animal.java new file mode 100644 index 00000000..6546abfd --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Animal.java @@ -0,0 +1,31 @@ +package nyc.c4q.RosmaryFC; +/** + * Created by c4q-rosmary on 5/1/15. + */ + +//Create an Animal class that includes a "species name" field and implements the Comparable interface. +public class Animal implements Comparable +{ + public String speciesName; + + public Animal (String speciesName){ + this.speciesName = speciesName; + } + + public String getSpeciesName() { + return this.speciesName; + } + + + //// Compare two animals by species name, alphabetically. + @Override + public int compareTo(Animal other) // todo: looked this up, not sure how it works + // compareTo should return < 0 if this is supposed to be + // less than other, > 0 if this is supposed to be greater than + // other and 0 if they are supposed to be equal + { + //Implement equals to compare by species name. + int species = this.speciesName.compareTo(other.speciesName); + return species == 0 ? this.speciesName.compareTo(other.speciesName) : species; + } +} diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Domestic.java b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Domestic.java new file mode 100644 index 00000000..f22ab0d7 --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Domestic.java @@ -0,0 +1,13 @@ +package nyc.c4q.RosmaryFC; +/** + * Created by c4q-rosmary on 5/2/15. + */ + +//Create the Domestic interface. +// This interface should include getters and setters for a name field, since pets tend to have their own names. +public interface Domestic +{ + String getName(); + String setName(String newName); + +} diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/DomesticCat.java b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/DomesticCat.java new file mode 100644 index 00000000..cf6903dd --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/DomesticCat.java @@ -0,0 +1,43 @@ +package nyc.c4q.RosmaryFC; +/** + * Created by c4q-rosmary on 5/2/15. + */ + +//Create a class for a Domestic Animal, perhaps a DomesticCat, +// that both inherits from Animal and implements the Domesitic interface. +public class DomesticCat extends Animal implements Domestic +{ + String name; + + public DomesticCat(String speciesName, String name) + { + super(speciesName); + this.name = name; + + } + + @Override + public String getName() + { + return this.name; + } + + @Override + public String setName(String newName) + { + this.name = newName; + return name; + } + + //Implement the compareTo function for your Domestic animal so that + // it compares two such animals by their given name instead of their species name. + public int compareTo(DomesticCat other) // todo: looked this up, not sure how it works -- did you want me to have it available for any domestic animal? + // compareTo should return < 0 if this is supposed to be + // less than other, > 0 if this is supposed to be greater than + // other and 0 if they are supposed to be equal + { + //Implement equals to compare by given name. + int names = this.name.compareTo(other.name); + return names == 0 ? this.name.compareTo(other.name) : names; + } +} diff --git a/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Main.java b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Main.java new file mode 100644 index 00000000..98a8d23a --- /dev/null +++ b/homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Main.java @@ -0,0 +1,86 @@ +package nyc.c4q.RosmaryFC; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class Main { + /** + * Create an Animal class that includes a "species name" field and implements the Comparable interface. Compare two animals by species name, alphabetically. + Implement equals to compare by species name. + Test your compareTo function by creating an array of Animal instances and calling sort. + Create the Domestic interface. This interface should include getters and setters for a name field, since pets tend to have their own names. + Create a class for a Domestic Animal, perhaps a DomesticCat, that both inherits from Animal and implements the Domesitc interface. + Implement the compareTo function for your Domestic animal so that it compares two such animals by their given name instead of their species name. + Implement equals to compare by given name. + Create a constructor for your Domestic animal that takes in both the species name and given name. + Test your compareTo function by creating an array and calling sort. + * + */ + + public static void main(String[] args) { + //Test your compareTo function by creating an array of Animal instances and calling sort. + + Animal dog = new Animal ("Pitbull"); + Animal cat = new Animal("Tiger"); + Animal bird = new Animal("Parakeet"); + + Animal speciesNames [] = {dog, cat, bird}; + List unsortedNames = new ArrayList(); + + + for(Animal x : speciesNames) { + unsortedNames.add(x); + } + + for(int i = 0; i < unsortedNames.size(); i++) { //was trying to print array but only speciesName of animal. ex: dog.speciesName + System.out.println("Species Name = " + unsortedNames.get(i).getSpeciesName()); + } + + //todo: I don't understand how to test by calling sort. + Arrays.sort(speciesNames); + + List sortedNames = new ArrayList(); + for(Animal x : speciesNames) { + sortedNames.add(x); + } + + for(int i = 0; i < sortedNames.size(); i++) { + System.out.println("The sorted Object array is:" + sortedNames.get(i).getSpeciesName()); + + } + + System.out.println(); + + + //Test your compareTo function by creating an array and calling sort. + DomesticCat cat1 = new DomesticCat("Bob Cat", "Tom"); + DomesticCat cat2 = new DomesticCat("Sphynx", "Rufus"); + + DomesticCat catNames [] = {cat1, cat2}; + List unsortedCatNames = new ArrayList(); + + for(DomesticCat x : catNames) { + unsortedCatNames.add(x); + } + + for(int i = 0; i < unsortedCatNames.size(); i++) { + System.out.println("Cat Names = " + unsortedCatNames.get(i).getName()); + } + + Arrays.sort(catNames); + + List sortedCatNames = new ArrayList(); + + for(DomesticCat x : catNames) { + sortedCatNames.add(x); + } + + for(int i = 0; i < sortedCatNames.size(); i++) { + System.out.println("The sorted Object array is:" + sortedCatNames.get(i).getName()); + } + + } + + +} diff --git a/homework/RosmaryFermin/Problem 2 Cards/.DS_Store b/homework/RosmaryFermin/Problem 2 Cards/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3d4f993d29a215c87e406cb33f9ea02361b229c6 GIT binary patch literal 6148 zcmeHK&1%~~5T3Q&Moum&X(7^D1_8L{8m`vU;1H;z^TTmW!T32RMk{vh<8 z^orDsr-8^+jRazN3mn!^t=t3#XzrGw4;e@Z;o|(QLxA20a(D~^XEoVMa|)`W!bv_dwa&s(BJ!f${>f_f#;w~6PIGaI9{0}T zD}N{_ei0PoyccBqswbj2G4 zjq(Fu*V`3QF&wz}`dNI0sr?|0cSJ5ik%;2hY0@)rSEkcPtIt}z(^;Ff__W(?xA>Dz zcQ$jsIL`ftPoKZs8_nLmKl$+S)92H#-_(GC;a@|^vcU?zqhUxp^0PFN=^OM^(N&a1 z%YbFTGH?wHn5D*9x`x`eq-DS|aI+bp^?{=jdIn34YU#j6T>%j37^wtpIvi3CH|QBG zHR2l-rc)7hDl=CMrqj{SO`K=2)Tq;enac+=UuNcp!qnHXK3CzuJdL)s3|Iy(Gf>xE zm-he7zu*5aC)u85z%uY(F~Axd{zeanWcJo8gQLBcqrOHZp}11xc?ue8E5=ybidRsT apr4b0=ou_Eq6ftu1QZRnu?+lE27Up|EqHAJ literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/compiler.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/compiler.xml new file mode 100644 index 00000000..a8523149 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/copyright/profiles_settings.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/description.html b/homework/RosmaryFermin/Problem 2 Cards/.idea/description.html new file mode 100644 index 00000000..db5f1295 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/description.html @@ -0,0 +1 @@ +Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/encodings.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/misc.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/misc.xml new file mode 100644 index 00000000..ccf24ce4 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/modules.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/modules.xml new file mode 100644 index 00000000..7a6ef3b8 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/project-template.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/project-template.xml new file mode 100644 index 00000000..1f08b887 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/project-template.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/scopes/scope_settings.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/vcs.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/.idea/workspace.xml b/homework/RosmaryFermin/Problem 2 Cards/.idea/workspace.xml new file mode 100644 index 00000000..ff714160 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/.idea/workspace.xml @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430549389474 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/homework/RosmaryFermin/Problem 2 Cards/Problem 2 Cards.iml b/homework/RosmaryFermin/Problem 2 Cards/Problem 2 Cards.iml new file mode 100644 index 00000000..d5c07432 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/Problem 2 Cards.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/homework/RosmaryFermin/Problem 2 Cards/src/.DS_Store b/homework/RosmaryFermin/Problem 2 Cards/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8200a883be065c66a7a3b7ec14053b9c77ec665f GIT binary patch literal 6148 zcmeHKQA^xF5Z=AJ)||eiR6+11j~1?Q_S)WSJgwkE;UGmRTF%6T-a^P8mz;+j2YL2q zSZ)0oh0^|q{uH0=%unwX2Fu9E-#4^w#=qLC-3vyt*#!dDvR~Fqeoes?+13gT@@Gop1af?CP$Fk4YOoNu=u=rYEPL&dxu7x%l?oOjtoLRn58=V2%cH=EQ*mCUZASkA(|eM5dRW`G&^R}A3(;DI9ggr!BZ zbwFcE0Kgi!jeu=_{sBF70Q!WbMeu+~n+j-CC6ySGY6of4q2H(Y(xOcl(mWZ)p(jhK zP$ZQe(lg;g`WCrm2AF}{3}EdC;^O)L=Fj!N3F3wsUWjwv|c)Jc3*-L%j{!Jv{5lHy8{h!=#`vE-Ow3_ABQ z`u`Y#ki0`4rKfaecN`MZUfZ zq(Yu5pu{osL6qtU?r=Dke}Ms9yQ(-4>*DBjdTae&LC*@Pyt*odLwH-#=DjE0O zr58FYLX{=M8>#y{DvR~Fqeoes?+13g9TgY-p8L2vOpYP78)nJ2%2lLNRh&3=yn62P zWU{)p+3;GeXVZo^X}6mVZ@tx?PTf<-dGd7Q`J3Ir^uxzbpTB(l_WkVKOjt t^gSpF#+4SYQ@}7sF~s6gybNjt{2m&BK4EDQJRtldU})fm8Tg|N`~=N#XQcoD literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/.DS_Store b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ea006daf8050041b8336469c2bd09b2fcf9a8e72 GIT binary patch literal 6148 zcmeHKUyIW~5TET;P48YJo^asHJ}Ok`S+%dRcOLj46eD+tCp9s_F2rm}(kn+P}CK!^e4$SfDZs3Dq*9AW`)o=>5?>D zWDQZ6IU*?F81`W2QMQ!Lfs4ohy}K4X0SzU*fiv$2#mNcUl@;-{ z9J`8N@i~cjkV^b%U8VC`UYM8)%6$QNKeBmswQPWDxRA=m87xr2T?Uz_)oRY zPW>p}SLt-;4id3E!XG#wbRG#Q*Ur+L+JPhr82P&yXL;w1qNRO~|5asE-9QqdAHk}&;75ScjMN*2alhP=WpM=|M2nC=P%#B zn}-L1AG?uj4j1qPofTvrg+-p}{56g)Di;-u%m6dM44exCZZq;W&SiC8lo?hmmTe!@yx}5l2vjEk(4Y!nGK}mSbGHyue{?(Uya7 z&4+L+3)i6tvpUW%O*)9cB3ovF8TgX{>itlBI{zR3z5h2!Y?uLN;QwSmGdGhdZY>B6yQ1mg599?r@EL+;$}Ti$l8iZA`iE z2h8ww|23XbpEir>q*+WDr4k*p?Y)`N1GaER<{bC-#a)co6~+$E(U9|EtQ#E0%8x%~ zkc*WJx^7x3kP4&%sX!|5dj)uBtMvzt*{1@jKq~O5fSwP9O|c4W9qs5~XC(l!$6+)2 z`cPI*39JHJN6yg1sYItrlo;Z4j+cn50$WF?L!$VQSox!P5nG-4i-kif$Lv#qRA5;F zt$k@jz5kE+m+36>EhM{CAQkwp3P^8!IUe!r;%@!+oqE?6wktL@jce7R(O-H5@Q0ow eyEf_bMSaFqfvuxv(Q%^_^C4h@WS0u8L4kMBA~?nX literal 0 HcmV?d00001 diff --git a/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/Main.java b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/Main.java new file mode 100644 index 00000000..9978aa10 --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/Main.java @@ -0,0 +1,8 @@ +package nyc.c4q.RosmaryFC; + +public class Main { + + public static void main(String[] args) { + // write your code here + } +} diff --git a/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/PlayingCards.java b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/PlayingCards.java new file mode 100644 index 00000000..337c188f --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/PlayingCards.java @@ -0,0 +1,10 @@ +package nyc.c4q.RosmaryFC; +/** + * Created by c4q-rosmary on 5/2/15. + */ +//Create a class that extends your Game class, PlayingCards. + +public class PlayingCards extends cardGame +{ + +} diff --git a/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/cardGame.java b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/cardGame.java new file mode 100644 index 00000000..3921195e --- /dev/null +++ b/homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/cardGame.java @@ -0,0 +1,11 @@ +package nyc.c4q.RosmaryFC; +/** + * Created by c4q-rosmary on 5/2/15. + */ +public class cardGame +{ + + public void getPieces(){ + + } +} From e7f79b42eb04bf7bf1062aca60c0b96812a8cc28 Mon Sep 17 00:00:00 2001 From: RosmaryFC Date: Fri, 15 May 2015 15:20:26 -0400 Subject: [PATCH 3/4] removed homework from master branch --- .DS_Store | Bin 6148 -> 6148 bytes .../nyc/c4q/RosmaryFC => exercises}/.DS_Store | Bin 6148 -> 6148 bytes .../MyPhone/app/build.gradle | 25 - .../MyPhone/app/proguard-rules.pro | 17 - .../accesscode/myphone/ApplicationTest.java | 13 - .../MyPhone/app/src/main/AndroidManifest.xml | 22 - .../accesscode/myphone/DialerActivity.java | 33 -- .../accesscode/myphone/EmailActivity.java | 37 -- .../accesscode/myphone/MainActivity.java | 66 --- .../src/main/res/layout/activity_dialer.xml | 25 - .../src/main/res/layout/activity_email.xml | 30 -- .../app/src/main/res/layout/activity_main.xml | 27 -- .../app/src/main/res/menu/menu_main.xml | 6 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 0 bytes .../app/src/main/res/values-w820dp/dimens.xml | 6 - .../app/src/main/res/values/dimens.xml | 5 - .../app/src/main/res/values/strings.xml | 6 - .../app/src/main/res/values/styles.xml | 8 - .../5_OOP-and-Intents/MyPhone/build.gradle | 19 - .../MyPhone/gradle/wrapper/gradle-wrapper.jar | Bin 49896 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - exercises/5_OOP-and-Intents/MyPhone/gradlew | 164 ------- .../5_OOP-and-Intents/MyPhone/gradlew.bat | 90 ---- .../5_OOP-and-Intents/MyPhone/settings.gradle | 1 - exercises/5_OOP-and-Intents/oop/.idea/.name | 1 - .../5_OOP-and-Intents/oop/.idea/compiler.xml | 23 - .../oop/.idea/copyright/profiles_settings.xml | 3 - .../5_OOP-and-Intents/oop/.idea/encodings.xml | 4 - .../5_OOP-and-Intents/oop/.idea/misc.xml | 243 ---------- .../5_OOP-and-Intents/oop/.idea/modules.xml | 8 - .../oop/.idea/scopes/scope_settings.xml | 5 - exercises/5_OOP-and-Intents/oop/.idea/vcs.xml | 6 - .../5_OOP-and-Intents/oop/.idea/workspace.xml | 439 ------------------ exercises/5_OOP-and-Intents/oop/oop.iml | 11 - .../5_OOP-and-Intents/oop/src/Clarinet.java | 32 -- .../oop/src/ClarinetPlayer.java | 37 -- .../5_OOP-and-Intents/oop/src/Instrument.java | 7 - .../5_OOP-and-Intents/oop/src/Musician.java | 7 - .../oop/src/ReedInstrument.java | 20 - .../5_OOP-and-Intents/oop/src/ReedPlayer.java | 18 - homework/.DS_Store | Bin 6148 -> 6148 bytes homework/RosmaryFermin/.DS_Store | Bin 8196 -> 0 bytes .../Problem 1 Animal Sort/.DS_Store | Bin 6148 -> 0 bytes .../Problem 1 Animal Sort/.idea/compiler.xml | 23 - .../.idea/copyright/profiles_settings.xml | 3 - .../.idea/description.html | 1 - .../Problem 1 Animal Sort/.idea/encodings.xml | 4 - .../Problem 1 Animal Sort/.idea/misc.xml | 12 - .../Problem 1 Animal Sort/.idea/modules.xml | 8 - .../.idea/project-template.xml | 3 - .../.idea/scopes/scope_settings.xml | 5 - .../.idea/uiDesigner.xml | 124 ----- .../Problem 1 Animal Sort/.idea/vcs.xml | 6 - .../Problem 1 Animal Sort/.idea/workspace.xml | 417 ----------------- .../Problem 1 Animal Sort.iml | 12 - .../nyc/c4q/RosmaryFC/Animal.class | Bin 998 -> 0 bytes .../nyc/c4q/RosmaryFC/Domestic.class | Bin 215 -> 0 bytes .../nyc/c4q/RosmaryFC/DomesticCat.class | Bin 992 -> 0 bytes .../nyc/c4q/RosmaryFC/Main.class | Bin 2948 -> 0 bytes .../Problem 1 Animal Sort/src/.DS_Store | Bin 6148 -> 0 bytes .../Problem 1 Animal Sort/src/nyc/.DS_Store | Bin 6148 -> 0 bytes .../src/nyc/c4q/.DS_Store | Bin 6148 -> 0 bytes .../src/nyc/c4q/RosmaryFC/Animal.java | 31 -- .../src/nyc/c4q/RosmaryFC/Domestic.java | 13 - .../src/nyc/c4q/RosmaryFC/DomesticCat.java | 43 -- .../src/nyc/c4q/RosmaryFC/Main.java | 86 ---- .../RosmaryFermin/Problem 2 Cards/.DS_Store | Bin 6148 -> 0 bytes .../Problem 2 Cards/.idea/compiler.xml | 23 - .../.idea/copyright/profiles_settings.xml | 3 - .../Problem 2 Cards/.idea/description.html | 1 - .../Problem 2 Cards/.idea/encodings.xml | 4 - .../Problem 2 Cards/.idea/misc.xml | 12 - .../Problem 2 Cards/.idea/modules.xml | 8 - .../.idea/project-template.xml | 3 - .../.idea/scopes/scope_settings.xml | 5 - .../Problem 2 Cards/.idea/vcs.xml | 6 - .../Problem 2 Cards/.idea/workspace.xml | 244 ---------- .../Problem 2 Cards/Problem 2 Cards.iml | 12 - .../Problem 2 Cards/src/.DS_Store | Bin 6148 -> 0 bytes .../Problem 2 Cards/src/nyc/.DS_Store | Bin 6148 -> 0 bytes .../Problem 2 Cards/src/nyc/c4q/.DS_Store | Bin 6148 -> 0 bytes .../src/nyc/c4q/RosmaryFC/.DS_Store | Bin 6148 -> 0 bytes .../src/nyc/c4q/RosmaryFC/Main.java | 8 - .../src/nyc/c4q/RosmaryFC/PlayingCards.java | 10 - .../src/nyc/c4q/RosmaryFC/cardGame.java | 11 - 88 files changed, 2611 deletions(-) rename {homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC => exercises}/.DS_Store (94%) delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/build.gradle delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/proguard-rules.pro delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/androidTest/java/com/example/accesscode/myphone/ApplicationTest.java delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/AndroidManifest.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/DialerActivity.java delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/EmailActivity.java delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/MainActivity.java delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/layout/activity_dialer.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/layout/activity_email.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/layout/activity_main.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/menu/menu_main.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/values-w820dp/dimens.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/values/dimens.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/values/strings.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/values/styles.xml delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/build.gradle delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/gradle/wrapper/gradle-wrapper.jar delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/gradle/wrapper/gradle-wrapper.properties delete mode 100755 exercises/5_OOP-and-Intents/MyPhone/gradlew delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/gradlew.bat delete mode 100644 exercises/5_OOP-and-Intents/MyPhone/settings.gradle delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/.name delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/compiler.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/encodings.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/misc.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/modules.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/vcs.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/workspace.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/oop.iml delete mode 100644 exercises/5_OOP-and-Intents/oop/src/Clarinet.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/Instrument.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/Musician.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java delete mode 100644 homework/RosmaryFermin/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/compiler.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/copyright/profiles_settings.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/description.html delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/encodings.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/misc.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/modules.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/project-template.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/scopes/scope_settings.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/uiDesigner.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/vcs.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/.idea/workspace.xml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/Problem 1 Animal Sort.iml delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Animal.class delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Domestic.class delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/DomesticCat.class delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/out/production/Problem 1 Animal Sort/nyc/c4q/RosmaryFC/Main.class delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Animal.java delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Domestic.java delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/DomesticCat.java delete mode 100644 homework/RosmaryFermin/Problem 1 Animal Sort/src/nyc/c4q/RosmaryFC/Main.java delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/compiler.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/copyright/profiles_settings.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/description.html delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/encodings.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/misc.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/modules.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/project-template.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/scopes/scope_settings.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/vcs.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/.idea/workspace.xml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/Problem 2 Cards.iml delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/.DS_Store delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/Main.java delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/PlayingCards.java delete mode 100644 homework/RosmaryFermin/Problem 2 Cards/src/nyc/c4q/RosmaryFC/cardGame.java diff --git a/.DS_Store b/.DS_Store index f7961951398b3e367c85175b2f65cade6b00d188..b106be90cffd0ceb4aeedfa6a8beaa2ca26d1f1d 100644 GIT binary patch literal 6148 zcmeHKO>fgc5S?v9>ZAya0I3oeABz-KX$j<-h7{35rKmxz5JkaGtj5%}Bil(pQKX#t z1)TZ*8Au3D95}*H;S}C}1SL+mB7}CVnK!#Tvsu5`J6$Rr{I$}y9NSt5L# z>w>JPo{K;x=4g>eF}W1)`wP*!Lo=Wm_}3WV?`{rn>@#RYGw*NMa{SQ2DBl|HL${!p zCKK4D8O|W?s*Imb*Z1P2Sp30ORx=l}Yep`=&M)&y{&Axd4jPG_^x~==JrXUi?K;Y@ z+ev5YKL|trw{JT~o;zro*Y1WvVtaub&7__jdqF!KRKs4-j!znLzGJVQbeiV%dgS(z zTDJrD$csJ4^S$J`k>gj>+!zkGcS;3o=T2!9e?bV%Y42Tva%QFL0KS*>6OF9|orw<(UR`D5P@`J^)5^w(rl8{S7gj z(94SKg?LRh5vO{Am=w`jRHJjU=~PyvS(4cy@?TDbz$02CpGV;eDd6>MA$oHzx{E(9 zq^HPfQId-Oo|-#HhqOn#RHFmn7S_~Wk}*4f7PGt5$NKS*%*WEb)a(Y<+(n#CXRuLv z?esMjkERm!7#r);4vm@t&46Y=F~Ii+3(B#ga4b=59Wdeu0L-9U2z>s*z;i5x6@_Do z7=bXE3Y4i#9Wj_pN57@wDhkIEWjZl+_+aXnnL42`@#~o165+%u61CL~Xa?pPSd~qa z*Z;jgpa18RbW1a!8ThXlV3}H@R>du;+PZLayw+OKCr~atZY)uxz^HO89A1hyph7Ta YaR*pYIF^VWi2e`|G-#t4_^S;30=}OirvLx| delta 113 zcmZoMXfc=|#>B)qu~2NHo+2aL#(>?7jBJzbSj1#JbMljua`KZH7#IYA*bRs^{(}Jn z!{lmKW!5twk;xqFmXq_@XKYsBU}u@waB?#{2R{eUz|Ddj-cA%g)!JcB#3EQ1R} zDo|A^Lpl&1GJto2uN%E p2Lm9Bfq|337pOiHXg}0d42ftuZXk4QW@KVxo7f<_nVsV=KLF0(Gb#W8 diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/build.gradle b/exercises/5_OOP-and-Intents/MyPhone/app/build.gradle deleted file mode 100644 index f2d962df..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" - - defaultConfig { - applicationId "com.example.accesscode.myphone" - minSdkVersion 15 - targetSdkVersion 21 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.0.0' -} diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/proguard-rules.pro b/exercises/5_OOP-and-Intents/MyPhone/app/proguard-rules.pro deleted file mode 100644 index 1109d47e..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/amyquispe/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/src/androidTest/java/com/example/accesscode/myphone/ApplicationTest.java b/exercises/5_OOP-and-Intents/MyPhone/app/src/androidTest/java/com/example/accesscode/myphone/ApplicationTest.java deleted file mode 100644 index 1f9ab7ae..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/src/androidTest/java/com/example/accesscode/myphone/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.accesscode.myphone; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/AndroidManifest.xml b/exercises/5_OOP-and-Intents/MyPhone/app/src/main/AndroidManifest.xml deleted file mode 100644 index 832d95e8..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/DialerActivity.java b/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/DialerActivity.java deleted file mode 100644 index 09e62463..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/DialerActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.accesscode.myphone; - -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; - -/** - * Created by amyquispe on 4/30/15. - */ -public class DialerActivity extends Activity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_dialer); - Button callButton = (Button) findViewById(R.id.call_button); - final EditText dialerText = (EditText) findViewById(R.id.dialer_text); - callButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - /* get text input */ - String phoneNumber = dialerText.getText().toString(); - - /* - Use an implicit intent to open the user's phone app to call this number. - http://developer.android.com/guide/components/intents-common.html#Phone - */ - } - }); - } -} diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/EmailActivity.java b/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/EmailActivity.java deleted file mode 100644 index 24934ce9..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/EmailActivity.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.accesscode.myphone; - -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; - -/** - * Created by amyquispe on 4/30/15. - */ -public class EmailActivity extends Activity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_email); - final EditText emailSubject = (EditText) findViewById(R.id.email_subject); - final EditText emailBody = (EditText) findViewById(R.id.email_body); - Button mailButton = (Button) findViewById(R.id.mail_button); - mailButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - String myEmailAddress = ""; /* put your email address here */ - String subject = emailSubject.getText().toString(); - String body = emailBody.getText().toString(); - - /* - Use an implicit intent to open up the user's email program and send - and email with this subject and body to you. - - http://developer.android.com/guide/components/intents-common.html#Email - - */ - } - }); - } -} diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/MainActivity.java b/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/MainActivity.java deleted file mode 100644 index 2e0460c9..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/java/com/example/accesscode/myphone/MainActivity.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.example.accesscode.myphone; - -import android.support.v7.app.ActionBarActivity; -import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.Button; -import android.widget.Toast; - - -public class MainActivity extends ActionBarActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - /* DialerActivity */ - Button dialerButton = (Button) findViewById(R.id.dialer_button); - dialerButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(getApplicationContext(), "Dialer clicked", Toast.LENGTH_SHORT).show(); - /* - Use Explicit Intent to start DialerActivity here. - */ - } - }); - /* EmailActivity */ - Button emailButton = (Button) findViewById(R.id.email_button); - emailButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(getApplicationContext(), "Email clicked", Toast.LENGTH_SHORT).show(); - /* - Use Explicit Intent to start EmailActivity here. - */ - - } - }); - } - - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } -} diff --git a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/layout/activity_dialer.xml b/exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/layout/activity_dialer.xml deleted file mode 100644 index d4bc14d3..00000000 --- a/exercises/5_OOP-and-Intents/MyPhone/app/src/main/res/layout/activity_dialer.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - -