Stabla, dodati komentari i ideje za veliki test

[spa2-materijali.git] / Stabla / Primeri za test / StabloIOClassic.java

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