From c9e275a4a26772c2e1cd8e50c837fc8eb8d27d3f Mon Sep 17 00:00:00 2001 From: DOHA Date: Mon, 28 Aug 2017 13:17:24 +0200 Subject: [PATCH] fix conflict --- .../com/baeldung/threadpool/TreeNode.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/core-java-concurrency/src/main/java/com/baeldung/threadpool/TreeNode.java b/core-java-concurrency/src/main/java/com/baeldung/threadpool/TreeNode.java index 9b43152074..a3283cf930 100644 --- a/core-java-concurrency/src/main/java/com/baeldung/threadpool/TreeNode.java +++ b/core-java-concurrency/src/main/java/com/baeldung/threadpool/TreeNode.java @@ -1,18 +1,25 @@ package com.baeldung.threadpool; -import java.util.Set; - import com.google.common.collect.Sets; +import java.util.Set; + public class TreeNode { - int value; + private int value; - Set children; + private Set children; - public TreeNode(int value, TreeNode... children) { + TreeNode(int value, TreeNode... children) { this.value = value; this.children = Sets.newHashSet(children); } -} + public int getValue() { + return value; + } + + public Set getChildren() { + return children; + } +} \ No newline at end of file