X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=spa2-materijali.git;a=blobdiff_plain;f=Stabla%2FPrimeri%20za%20test%2FStabloIOClassic.java;h=d6b0445360490a2d4be70571d6505710e2f93026;hp=dcf1d9f20304ba1ecaf5ea2892d4b67ea3d36773;hb=8ce9bb7b0e2a94776b901111b90f2070734267d7;hpb=cfa94f3c006a9ca193333a3efca1e48b512f55e8

diff --git a/Stabla/Primeri za test/StabloIOClassic.java b/Stabla/Primeri za test/StabloIOClassic.java
index dcf1d9f..d6b0445 100644
--- a/Stabla/Primeri za test/StabloIOClassic.java	
+++ b/Stabla/Primeri za test/StabloIOClassic.java	
@@ -3,11 +3,16 @@ import java.util.NoSuchElementException;
 import org.svetovid.io.SvetovidReader;
 import org.svetovid.io.SvetovidWriter;
 
-/**
- * Format:
+/*
+ * Ova klasa sluzi za ucitavanje i snimanje stabala. Nije potrebno znati je,
+ * i bice data, prilikom izrade prakticnih zadataka.
+ *
+ * Ocekivani format fajla je sledeci:
  *
  * br
  * id leviId desniId vrednost (x br)
+ *
+ * Primer fajla je classic.txt
  */
 public class StabloIOClassic implements StabloIO {
 
@@ -32,13 +37,13 @@ public class StabloIOClassic implements StabloIO {
         if (stablo == null) {
             return element;
         }
-        Stablo found = find(stablo, element.id);
+        Stablo found = find(stablo, element.getId());
         if (found == null) {
-            throw new NoSuchElementException("id: " + element.id);
+            throw new NoSuchElementException("id: " + element.getId());
         }
-        found.vrednost = element.vrednost;
-        found.levi = element.levi;
-        found.desni = element.desni;
+        found.setVrednost(element.getVrednost());
+        found.setLevi(element.getLevi());
+        found.setDesni(element.getDesni());
         return stablo;
     }
 
@@ -46,14 +51,14 @@ public class StabloIOClassic implements StabloIO {
         if (stablo == null) {
             return null;
         }
-        if (stablo.id == id) {
+        if (stablo.getId() == id) {
             return stablo;
         }
-        Stablo rezultat = find(stablo.levi, id);
+        Stablo rezultat = find(stablo.getLevi(), id);
         if (rezultat != null) {
             return rezultat;
         }
-        return find(stablo.desni, id);
+        return find(stablo.getDesni(), id);
     }
 
     @Override
@@ -67,19 +72,19 @@ public class StabloIOClassic implements StabloIO {
         if (stablo == null) {
             return 0;
         }
-        return 1 + count(stablo.levi) + count(stablo.desni);
+        return 1 + count(stablo.getLevi()) + count(stablo.getDesni());
     }
 
     private static void iterate(SvetovidWriter out, Stablo stablo) {
         if (stablo == null) {
             return;
         }
-        int id = stablo.id;
-        int leviId = stablo.levi == null ? -1 : stablo.levi.id;
-        int desniId = stablo.desni == null ? -1 : stablo.desni.id;
-        String vrednost = stablo.vrednost;
+        int id = stablo.getId();
+        int leviId = stablo.getLevi() == null ? -1 : stablo.getLevi().getId();
+        int desniId = stablo.getDesni() == null ? -1 : stablo.getDesni().getId();
+        String vrednost = stablo.getVrednost();
         out.println(id, leviId, desniId, vrednost);
-        iterate(out, stablo.levi);
-        iterate(out, stablo.desni);
+        iterate(out, stablo.getLevi());
+        iterate(out, stablo.getDesni());
     }
 }