diff --git a/app/src/main/java/com/example/myhabitat/PiecesActivity.java b/app/src/main/java/com/example/myhabitat/PiecesActivity.java index 7fd4ec4a3a68f7056344349b7f68f7af4350db89..7b032392d62aea52c186bc67816a75244fd51052 100644 --- a/app/src/main/java/com/example/myhabitat/PiecesActivity.java +++ b/app/src/main/java/com/example/myhabitat/PiecesActivity.java @@ -33,7 +33,7 @@ public class PiecesActivity extends AppCompatActivity { } public void addPiece(View view) { - Piece piece1 = new Piece(habitat); + Piece piece1 = new Piece("p", habitat); Mur murN = new Mur(piece1, Orientation.NORD, habitat); Mur murE = new Mur(piece1, Orientation.EST, habitat); Mur murS = new Mur(piece1, Orientation.SUD, habitat); diff --git a/app/src/main/java/habitat/Habitat.java b/app/src/main/java/habitat/Habitat.java index d27cd398ace0ef1ebacdbab25e7ab14920202b60..53c43556bbe9860e2a011363dbcb07cae0a7d5fd 100644 --- a/app/src/main/java/habitat/Habitat.java +++ b/app/src/main/java/habitat/Habitat.java @@ -33,14 +33,14 @@ public class Habitat implements Parcelable { }; public void createHabitat(){ - Piece piece1 = new Piece(this); + Piece piece1 = new Piece("p1", this); Mur murN = new Mur(piece1, Orientation.NORD, this); Mur murE = new Mur(piece1, Orientation.EST, this); Mur murS = new Mur(piece1, Orientation.SUD, this); Mur murO = new Mur(piece1, Orientation.OUEST, this); piece1.setMurs(murS, murO, murN, murE); pieces.add(piece1); - Piece piece2 = new Piece(this); + Piece piece2 = new Piece("p2", this); murN = new Mur(piece1, Orientation.NORD, this); murE = new Mur(piece1, Orientation.EST, this); murS = new Mur(piece1, Orientation.SUD, this); diff --git a/app/src/main/java/habitat/Mur.java b/app/src/main/java/habitat/Mur.java index a07191daebf03c48d8957c9e8de8e02aec884340..27203cca86c20526d1db17107b1e63a820ca00fa 100644 --- a/app/src/main/java/habitat/Mur.java +++ b/app/src/main/java/habitat/Mur.java @@ -22,8 +22,6 @@ public class Mur implements Parcelable { } protected Mur(Parcel in) { - //piece = in.readParcelable(Piece.class.getClassLoader()); - //in.readParcelable(Piece.class.getClassLoader()); orientation = (Orientation) in.readSerializable(); } @@ -55,6 +53,14 @@ public class Mur implements Parcelable { this.orientation = orientation; } + public Habitat getHabitat() { + return habitat; + } + + public void setHabitat(Habitat habitat) { + this.habitat = habitat; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -70,6 +76,8 @@ public class Mur implements Parcelable { '}'; */ + + } @Override diff --git a/app/src/main/java/habitat/Piece.java b/app/src/main/java/habitat/Piece.java index b70d2316e3c0ecb9c672e19cf9abbf5dd39286e1..9bd1d4a9065f39a25ff7a69c8562e6ae9dfc40cb 100644 --- a/app/src/main/java/habitat/Piece.java +++ b/app/src/main/java/habitat/Piece.java @@ -2,22 +2,23 @@ package habitat; import android.os.Parcel; import android.os.Parcelable; -import android.util.Log; - import java.util.ArrayList; -import java.util.Collection; public class Piece implements Parcelable { private Habitat habitat; + private String nom; private ArrayList<Mur> murs; - public Piece(Habitat habitat) { + public Piece(String nom, Habitat habitat) { + this.nom = nom; this.habitat = habitat; murs = new ArrayList<>(4); } protected Piece(Parcel in) { habitat = new Habitat(); + nom = new String(); + nom = in.readString(); murs = new ArrayList<Mur>(4); in.readList(murs, Mur.class.getClassLoader()); } @@ -34,6 +35,14 @@ public class Piece implements Parcelable { } }; + public String getNom() { + return nom; + } + + public void setNom(String nom) { + this.nom = nom; + } + public ArrayList<Mur> getMurs() { return murs; } @@ -54,8 +63,8 @@ public class Piece implements Parcelable { @Override public String toString() { - return "Piece{" + - "murs=" + murs.toString() + + return "Piece{nom=" + nom + + ", murs=" + murs.toString() + '}'; } @@ -66,13 +75,14 @@ public class Piece implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { + dest.writeString(nom); dest.writeList(murs); } public void setCorrectly() { for(Mur mur : murs){ mur.setPiece(this); - + mur.setHabitat(habitat); } } }