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

diff --git a/Stabla/Primeri za test/StabloIOPretty.java b/Stabla/Primeri za test/StabloIOPretty.java
index 6fcc069..2df3c03 100644
--- a/Stabla/Primeri za test/StabloIOPretty.java	
+++ b/Stabla/Primeri za test/StabloIOPretty.java	
@@ -6,11 +6,17 @@ import java.util.regex.Pattern;
 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:
+ *
  *   /-- desni
  * -(id) vrednost
  *   \-- levi
+ *
+ * Primer fajla je pretty.txt
  */
 public class StabloIOPretty implements StabloIO {
 
@@ -124,8 +130,8 @@ public class StabloIOPretty implements StabloIO {
         Stablo stablo = elements.get(minIndex);
         Stablo levi = formStablo(minIndex + 1, endIndex, levels, elements);
         Stablo desni = formStablo(beginIndex, minIndex, levels, elements);
-        stablo.levi = levi;
-        stablo.desni = desni;
+        stablo.setLevi(levi);
+        stablo.setDesni(desni);
         return stablo;
     }
 
@@ -149,9 +155,9 @@ public class StabloIOPretty implements StabloIO {
             builder.append(nullSymbol);
         } else {
             builder.append("(");
-            builder.append(stablo.id);
+            builder.append(stablo.getId());
             builder.append(") ");
-            builder.append(stablo.vrednost);
+            builder.append(stablo.getVrednost());
         }
         builder.append("\n");
     }
@@ -160,8 +166,8 @@ public class StabloIOPretty implements StabloIO {
         if (stablo == null) {
             return;
         }
-        if ((nullSymbol != null) || (stablo.desni != null)) {
-            appendSubtree(builder, stablo.desni, nullSymbol, separated, buildingBlocks, true, prefix);
+        if ((nullSymbol != null) || (stablo.getDesni() != null)) {
+            appendSubtree(builder, stablo.getDesni(), nullSymbol, separated, buildingBlocks, true, prefix);
             if (separated) {
                 appendEmpty(builder, buildingBlocks, prefix);
             }
@@ -172,11 +178,11 @@ public class StabloIOPretty implements StabloIO {
         if (stablo == null) {
             return;
         }
-        if ((nullSymbol != null) || (stablo.levi != null)) {
+        if ((nullSymbol != null) || (stablo.getLevi() != null)) {
             if (separated) {
                 appendEmpty(builder, buildingBlocks, prefix);
             }
-            appendSubtree(builder, stablo.levi, nullSymbol, separated, buildingBlocks, false, prefix);
+            appendSubtree(builder, stablo.getLevi(), nullSymbol, separated, buildingBlocks, false, prefix);
         }
     }