Skip to content

Commit

Permalink
Merge pull request DaivsP#14 from JeremyMcCray/storageDave
Browse files Browse the repository at this point in the history
wrote storage, removed pom
  • Loading branch information
JeremyMcCray authored Feb 26, 2020
2 parents 5272f51 + 3c33922 commit 328049b
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ local.properties
.settings/
.loadpath
.recommenders
pom.xml

# External tool builders
.externalToolBuilders/
Expand Down
7 changes: 5 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
<project> xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.zipcoder</groupId>
<artifactId>casino</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
maven.compiler.source1.8/maven.compiler.source
maven.compiler.target1.8/maven.compiler.target
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/zipcoder/casino/CasinoClasses/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public void runCasino(){
}
public static void main(String[] args) {
// write your tests before you start fucking with this
System.out.println("Hello");
}


Expand Down
18 changes: 17 additions & 1 deletion src/main/java/io/zipcoder/casino/CasinoClasses/Storage.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
package io.zipcoder.casino.CasinoClasses;

import java.util.HashMap;

public class Storage {
}
private HashMap<Integer,Membership> memberStorage;

public Storage(Membership membership){
this.memberStorage.put(membership.getIdNumber(), membership);
}

public HashMap<Integer, Membership> getMemberStorage() {
return memberStorage;
}

public void setMemberStorage(HashMap<Integer, Membership> memberStorage) {
this.memberStorage = memberStorage;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ public Player playerBuilder() {
public Boolean isTurn() {
return null;
}
}

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/java/io/zipcoder/casino/Player/GoFishPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@ public GoFishPlayer(Membership playerAccount){
this.age = playerAccount.getAge();
this.playerAccount = playerAccount;
}

}



0 comments on commit 328049b

Please sign in to comment.