From ddb1a0c3a27c9a226601a7d909dcbca0c7a9da18 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@google.com>
Date: Thu, 18 Aug 2022 18:10:47 +0200
Subject: [PATCH] WorkTreeUpdater#Result: hide data members

This is the standard across JGit.

Change-Id: Ie52ad7000d8725657b33dd4f3adcc05ab9666875
---
 .../org/eclipse/jgit/merge/ResolveMerger.java |  8 ++---
 .../eclipse/jgit/util/WorkTreeUpdater.java    | 29 ++++++++++++++-----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index ab82dd0c3..d79f5d410 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -1181,12 +1181,12 @@ protected boolean mergeTrees(AbstractTreeIterator baseTree,
 			workTreeUpdater.writeWorkTreeChanges(true);
 			if (getUnmergedPaths().isEmpty() && !failed()) {
 				WorkTreeUpdater.Result result = workTreeUpdater.writeIndexChanges();
-				resultTree = result.treeId;
-				modifiedFiles = result.modifiedFiles;
-				for (String f : result.failedToDelete) {
+				resultTree = result.getTreeId();
+				modifiedFiles = result.getModifiedFiles();
+				for (String f : result.getFailedToDelete()) {
 					failingPaths.put(f, MergeFailureReason.COULD_NOT_DELETE);
 				}
-				return result.failedToDelete.isEmpty();
+				return result.getFailedToDelete().isEmpty();
 			}
 			resultTree = null;
 			return false;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
index 98eaf931b..a9f56c2ac 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
@@ -74,20 +74,33 @@ public class WorkTreeUpdater implements Closeable {
 	 */
 	public static class Result {
 
-		/**
-		 * Files modified during this operation.
-		 */
-		public List<String> modifiedFiles = new LinkedList<>();
+		private final List<String> modifiedFiles = new LinkedList<>();
+
+
+		private final List<String> failedToDelete = new LinkedList<>();
+
+		private ObjectId treeId = null;
 
 		/**
-		 * Files in this list were failed to be deleted.
+		 * @return Modified tree ID if any, or null otherwise.
 		 */
-		public List<String> failedToDelete = new LinkedList<>();
+		public ObjectId getTreeId() {
+			return treeId;
+		}
 
 		/**
-		 * Modified tree ID if any, or null otherwise.
+		 * @return Files that couldn't be deleted.
 		 */
-		public ObjectId treeId = null;
+		public List<String> getFailedToDelete() {
+			return failedToDelete;
+		}
+
+		/**
+		 * @return Files modified during this operation.
+		 */
+		public List<String> getModifiedFiles() {
+			return modifiedFiles;
+		}
 	}
 
 	Result result = new Result();