From 170b338a98bacf2c59b48f0e3b60e2a64a180799 Mon Sep 17 00:00:00 2001
From: mikowhychuck <adam.mikolajczak111@gmail.com>
Date: Wed, 26 Apr 2023 16:36:28 +0200
Subject: [PATCH] dalsze prace xs

---
 bin/whychuck/Alejka.class | Bin 375 -> 662 bytes
 bin/whychuck/Grob.class   | Bin 370 -> 1756 bytes
 bin/whychuck/Main.class   | Bin 672 -> 1095 bytes
 bin/whychuck/Zmarly.class | Bin 1475 -> 1723 bytes
 src/whychuck/Alejka.java  |  14 ++++++++++++
 src/whychuck/Grob.java    |  45 ++++++++++++++++++++++++++++++++++++++
 src/whychuck/Main.java    |   6 +++++
 src/whychuck/Zmarly.java  |  17 +++++++++-----
 8 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/bin/whychuck/Alejka.class b/bin/whychuck/Alejka.class
index 5bae068fbbd2d8e271e8163c9f9c4ba3d88f2dfa..20c4553f3df1201f25c308e8791f309ad856f52b 100644
GIT binary patch
literal 662
zcmZXROHaZ;6ot?5C@>UIe4+S2SHMCx?ldOG#Ds*n(XbzC1BKcq1vL7b+?e=CT=)b0
zQN}ZEQ;9CxJ3X26-E(ihzCS(z9N{2`ltATv^k9wV)}(Xh+T)4JAtSJwh&_LzT<1|)
zV<nLC0s+w#FisrLnVkx(HG5-qr#i0khMlWf;CRF1R$m}<?%&uFX%tQ5U<#z0t$qOl
zWfK)F31mI>cu!>YzhB#`CRUIa$WQIrWpuOBb3FTUemk&(Yc+6f?e#6?_Eq5M?^w*t
zM$S}VxtEL(&2`LB&2FnN8Dh&s9W{o~bdHoAMwKDEI^>>-EDQm8<<A4lzHoH6V#GPr
z^P<69X>O4_(N}rO@W~-hrNC2{dWyBweur$gUr>6-@-u}LR{1W6W`ia!ho&`Z>yd$V
zgI~1jMG>d5wHSL5V`Ye~zhUz)vp}X~gyI5ICQKQI<v+wWc4B6SRd>lU<?a&?QA8sY
s%OS>$F2oq2mq$g<c^U^Y+VxlL{)Um^Fjcl&SqNezL5w6wBkZ{U1EaBC1^@s6

delta 162
zcmbQn`kjgE)W2Q(7#J8#7$hcg8BTQ36654yU}fN9WMJ0N4C7>AWZ>ap;AP;O*rLcL
zz{4QOz&3HU|72}Or4$CB90O1(8<1uPvOF1>fRKTKS8F>1hnChB2JY<){2PG+ObkLm
pl8=EINU{JSD+3QulQ57c2GPJE!XOId0kwi`0vg8%lmY1z2LQcj5jFq-

diff --git a/bin/whychuck/Grob.class b/bin/whychuck/Grob.class
index 08c82a737925ca7d33774e6622244694ad176c36..51702437a0ee24011660393e3278db3ec95f83b1 100644
GIT binary patch
literal 1756
zcmZ`(T~8W86g>louw6wFzqL}e3iyFq`=z$^qt%d5Uu;Z#Tydi-6bxdUwtuM)HmR7j
zNne}vM>Rcnb_EOgGBZ2ed(OG{p5f2mAHM)BW2YTHg^rIWpK>P`xqN!3Tsmw=Kp|GU
z%9iq0!TD_EPAvtWbEKd$3gP2|eOStu&T|Sut6-nz`D=H!mbIa;Ru$Tc)|qpz5Y3)i
zAFOo2DjuizDrKj5EI%IGl?)O6i6k)tTcsmA423QeZ3rqvvQE+7y?B3Um)}{31zS)`
zIjgX5l^yx^E(4VlVTjb(r3`^Tci{txOmbhrB-_r7Y~dL+(JnkD<7z)hZFa@guh5f7
z)?vM(B=x?D5W<XQ>P>7c(G)7QA;RstO^6Y#sSN@*X~Mug#uCnp?M*a?3S4l_DLR#x
zx@r3c{79LYM#3P<tchOqDfA^Wt#TzKZQ>!ONK`4gQ)tJMLVu&E%?qb+WS2u&W~g*C
zUM$BAEaHifP08t*iRW06>7Sk1MGkR<U2dZFfL0}A&BOx6L!kChTvxfGG1moYLt(B}
z#djixuth5xbnjlp%H`i$XPzC5z0yTFXKy=Vn6QYSm+}y2`F^@S0H4^4C!dU8@0_LH
zIRx$|BTaO0?c`UQyW-xK`i{s~9oEe?s4opfd6onQpa(JTN~XY7l3$X<$32)DzCz?1
zPd-Stp>I2w)2R{q+$ax0&_$vU_qP->&?uy<rI4Z4LIxUz^pGxghY;zJ2pPr**T#;F
zUe;=IJJQ!u$e3>b{~ejR!f2zAK?)hVLx>DXggn4_3n3GYLPlB&q5Hk$`e-O*qEW~g
zg~aa=A}*1E^VxY=YaE~47^!O{Q~oMu>Uf>nb>sBi1PhqFrOK#{dm3{d(gBggr4fxZ
zOr+Fo74vntD1pEt0;CU9KqrzKGVZ3;AS0fG2qph5+F#Q(J8bh?eCY}nnmU6kI7NmT
zGR)p;LS3-op(}aPp7bwNAWc~3Lz(!E{-0Pph(5Z;V|h4LJgs8&vhgnZqKa1%&n>#i
kMS_Uo*RRA?lIAmAp#7F^wQk+3^R<pu!z6ygqYvBv0G&YqIsgCw

delta 129
zcmcb^`-zF`)W2Q(7#J8#7{n)X)yc8hWaed-*fBCNYiNcsGO#%3r=)T*Ff$17Fz_(&
zPF(6V`7V=_2P04ekjucxzz1aM18I;5tJZb~{*6Ee6N4a-WCIH_GYA3MJP-v8!VDrn
L9wUP&Sd|z6a#9gh

diff --git a/bin/whychuck/Main.class b/bin/whychuck/Main.class
index 12fa137f4993d9b964b8dee7c2a5dbfd1bb8e040..c2b2dd89bb9a27c6462c779172ef3f869ab0016a 100644
GIT binary patch
delta 547
zcmYk3O-~w86o#K`!NGA9C6?5cSfdUg9cjh-QKi_bF+n#b8kXZoa2P5^{D^G$2i>^o
zvPpk|E+8q1TazyPgPI-$h0RUwd!F~a=bro1{}|B!{QLa?EU<m2e^)h)8Ab5=<i<I<
zbUZ6l$`?IbXByMMPgLPEccKRxamCOJwS8Vb3Xo7t9lH5S)u~3#%B70uMl#3tx5%#R
zcy9jM6*;+-O6kO~TFvGaVRI*2w6AQdWS<tS{fqOOds<kH9<-SE1|L{Z3{>(L?J*Q%
zX7(kttv$gbEE;@dNii&Nw(Qv@w`w~@TQT0_=qYq;D+a545?i5Tn|$`YF{9n6UgPZ#
zwU*M_;Yr14m+B0p@E2qsQVVu#tqtA&RcEzd@^GK*JKba?7Yc>OMzwT<aQ2?@c%6wR
z(>Y&*+1)0woG&!j;N4zgu1+$ZsFP|#%fj7Bi#~KY-x83spCB4x2AB{v#vm4keCiPE
n49gACTCrA|HIWc}o;06PVu+AoL)yi7%@@A%O4LnZ`q=sp96)~S

delta 122
zcmX@kv4EB9)W2Q(7#J8#7_>KX^)XJ~&SX1ThdDPcn1Pjn2`DbUn?WE_NJvOTkllVe
zgP6}I21)I04DuU+QcMh7K$4Gv8A!4*@H4P8h%s<5a07W_5UmWV3~E3gKTuSiL4$!2
L2sMFxCI&44<jN4@

diff --git a/bin/whychuck/Zmarly.class b/bin/whychuck/Zmarly.class
index 96e8130e306b9d0910c53406c3fe80f5b1deef7f..bba423d3aea077288227b0c1bac6076aee923941 100644
GIT binary patch
delta 771
zcmZvZO-~b16o%hBGlg<{t);cGwX_tW(oQP_Xe$EN?+>Ja3Kq)7Oe!g*NE0X$yK&*p
zrFZF{kcCqtiHR|8{0sgU<GF1kgt$3#?mh2$&U?@N@Eo1tzy5sv2H+~z4|$Z?-pWR!
zP_NnB)uvtEvKd0jRN-LrO?h*_T(eG8X8OP|AmBzHgLm&#S2+3qrc_ZT*wpYvfk6y2
z=*d)(Lq|g35=I$%i8J@Ay1@{X6D%;+sip)>RrOGH(QY18_iA-c(=!4AoKyW{0v5*Q
zclLr^lS5i;{JOw2vIL~(C?Lly^1Zmh;M=la+t#+dQ?ZsCyVaeFz)jqebuH`9;g0e(
z%8|o8f%|wM9W4`kBrvB~9%3Dj&tYCk3Lo^z<RW4DOS@sme}1H4yXES1Tp4^Kz~NE2
zXG*&)*Y&}EH=Z*vu5MQa?L8~s>3Nr%<XkQpLHS!xFeaHXPjSJRrTE@hm1~AriF~3T
zrQs~a9+Cq=_$Z2Y?m|EObYh4iMp00nC$&c39y9$JkweNl-MoDpf(v138Ry^9Kco&u
zZ;y97_eo)pK5VuyWTsmfF*7YB&8UO4skd<X7<Pfo01=W85GD#QjSmniL@;H~?0~xV
z2#E<y(ioLpp-e+lr7ptgbWIECdMLHefOUjiiF{0b!AuLceQ^hO>G;sWWB&pL)4`I1
Zr~Vbn9TZP5Y2?I`tba>dqxl+2e*uHzfI|QP

delta 557
zcmZ8dO-~b16g_X=(1zCslwyG*EiIN>hDt{il<yA}!7BI_2rDuvO*4X!l%k0n_io?P
zKOvhAfxw2aVZnk0|AHNB!hM4Y37eC1?>+b2lY7u`91^G3`$qtt<MXbFGxdiJwRTFx
z5NF`o-X#H!E{P;k>Vjpmk0jDaF@&~D)dlC*Pj`ELOMoFG(SiqBoR#Q>rP9Xg;!}pU
zZ_W=Vzu|0_^IxhJce6aR<8G{#Dq8tW($zdeuw1Ine|Jj)LwFg)3x@FhEs0@_sB>d5
zVq;9FO9|MRkeI}jit$`xM&gzB3X#`cE*o#OWL6dVKz5FN#hO!fk|%%ZTBYcYBz5$6
z5&|LZ_g;%Xs6*Z*bh#+ekG#6%6FdMz^_yeNQ0r!a8;B~~jH)xUhdNj0^6woOFzJgi
z%fmyf&qKn>dFZy{9(pY9;qfjF4KxvUAV3%;c`NGChDNm0>tci*2-C#6H9|8YRFNh6
zkfWHIJt1cJtd3kbbtxcWQBw1(-ynkn*ejG{U=M>HM#IS(#;KgH;dSIK0rB}73N<YJ
YqpjOe0slb44<LPR{SUzK(N}%C0TI1kX#fBK

diff --git a/src/whychuck/Alejka.java b/src/whychuck/Alejka.java
index afafc00..1acb760 100644
--- a/src/whychuck/Alejka.java
+++ b/src/whychuck/Alejka.java
@@ -1,7 +1,21 @@
 package whychuck;
 
 class Alejka extends Lokalizacja {
+	private int nr;
+	
 	Alejka(String nazwa){
 		super.setNazwa(this.nazwa);
 	}
+	Alejka(int nr){
+		setNr(nr);
+	}
+
+	public int getNr() {
+		return nr;
+	}
+
+	public void setNr(int nr) {
+		this.nr = nr;
+	}
+	
 }
diff --git a/src/whychuck/Grob.java b/src/whychuck/Grob.java
index bf7ecf8..a0d275d 100644
--- a/src/whychuck/Grob.java
+++ b/src/whychuck/Grob.java
@@ -5,4 +5,49 @@ class Grob extends Lokalizacja {
 	private int glebokosc;
 	private Alejka alejka;
 	private String napis;
+	
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public int getGlebokosc() {
+		return glebokosc;
+	}
+	public void setGlebokosc(int glebokosc) {
+		this.glebokosc = glebokosc;
+	}
+	public Alejka getAlejka() {
+		return alejka;
+	}
+	public void setAlejka(Alejka alejka) {
+		this.alejka = alejka;
+	}
+	public String getNapis() {
+		return napis;
+	}
+	public void setNapis(String napis) {
+		this.napis = napis;
+	}
+	
+	Grob(){
+		setId(0);
+	}
+	
+	Grob(int id, String napis){
+		setId(id);
+		setNapis(napis);
+	}
+	Grob(int id){
+		setId(id);
+	}
+	
+	public String toString() {
+		if(napis == null) {
+			return("Grob nr " + id);
+		}else {
+			return("Grob nr " + id + " Napis: " + napis + "\n");
+		}
+	}
 }
diff --git a/src/whychuck/Main.java b/src/whychuck/Main.java
index f482ab5..f108737 100644
--- a/src/whychuck/Main.java
+++ b/src/whychuck/Main.java
@@ -5,6 +5,12 @@ class Main {
 	public static void main(String[] args) {
 		Zmarly zmarly1 = new Zmarly("Adam", "Mickiewicz", 1855);
 		System.out.print(zmarly1);
+		
+		Alejka Alejka1 = new Alejka(1);
+		Grob grob1 = new Grob(1, "Wieszcz polski Adam Mickiewicz 1855");
+		grob1.setAlejka(Alejka1);
+		zmarly1.setLokalizacja(grob1);
+		System.out.print(zmarly1.getLokalizacja());
 	}
 
 }
diff --git a/src/whychuck/Zmarly.java b/src/whychuck/Zmarly.java
index fc0d617..c171b79 100644
--- a/src/whychuck/Zmarly.java
+++ b/src/whychuck/Zmarly.java
@@ -5,18 +5,24 @@ class Zmarly extends Osoba {
 	private int rokNarodzin;
 	private Lokalizacja lokalizacja;
 	
-	private int getRokSmierci() {
+	public int getRokSmierci() {
 		return rokSmierci;
 	}
-	private void setRokSmierci(int rokSmierci) {
+	public void setRokSmierci(int rokSmierci) {
 		this.rokSmierci = rokSmierci;
 	}
-	private int getRokNarodzin() {
+	public int getRokNarodzin() {
 		return rokNarodzin;
 	}
-	private void setRokNarodzin(int rokNarodzin) {
+	public void setRokNarodzin(int rokNarodzin) {
 		this.rokNarodzin = rokNarodzin;
 	}
+	public Lokalizacja getLokalizacja() {
+		return lokalizacja;
+	}
+	public void setLokalizacja(Lokalizacja lokalizacja) {
+		this.lokalizacja = lokalizacja;
+	}
 	
 	public Zmarly(String imie, String nazwisko, int rokSmierci) {
 		super.setImie(imie);
@@ -27,6 +33,7 @@ class Zmarly extends Osoba {
 	
 	@Override
 	public String toString() {
-		return(super.getImie() + ' ' + super.getNazwisko() + "\ndata śmierci: " + getRokSmierci());
+		return(super.getImie() + ' ' + super.getNazwisko() + "\ndata śmierci: " + getRokSmierci() + "\n");
 	}
+	
 }