Move around presenters into presenters folder

1whatleytay · 1whatleytay · commit 206bf2e03b50 · 2022-12-02T14:36:40.000-05:00
diff --git a/src/main/java/org/hydev/mcpm/client/arguments/parsers/InstallParser.java b/src/main/java/org/hydev/mcpm/client/arguments/parsers/InstallParser.java
@@ -4,8 +4,8 @@
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import org.hydev.mcpm.client.commands.controllers.InstallController;
-import org.hydev.mcpm.client.installer.presenter.InstallPresenter;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.display.presenters.InstallPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.search.SearchPackagesType;
 
 import java.util.function.Consumer;
diff --git a/src/main/java/org/hydev/mcpm/client/arguments/parsers/UpdateParser.java b/src/main/java/org/hydev/mcpm/client/arguments/parsers/UpdateParser.java
@@ -6,8 +6,8 @@
 
 import org.hydev.mcpm.client.commands.controllers.UpdateController;
 import org.hydev.mcpm.client.display.presenters.LogUpdatePresenter;
-import org.hydev.mcpm.client.installer.presenter.InstallPresenter;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.display.presenters.InstallPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/InstallController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/InstallController.java
@@ -3,7 +3,7 @@
 import org.hydev.mcpm.client.search.SearchPackagesType;
 import org.hydev.mcpm.client.installer.InstallBoundary;
 import org.hydev.mcpm.client.installer.input.InstallInput;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 
 /**
  * Controller class for the installation use case.
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/ListController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/ListController.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import static org.hydev.mcpm.client.commands.presenter.Table.tabulate;
+import static org.hydev.mcpm.client.display.presenters.Table.tabulate;
 
 /**
  * Controller class for the ListAll use case.
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/MirrorController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/MirrorController.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import static org.hydev.mcpm.client.commands.presenter.Table.tabulate;
+import static org.hydev.mcpm.client.display.presenters.Table.tabulate;
 
 /**
  * Controller for the mirror selection command
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/PageBoundary.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/PageBoundary.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.commands.controllers;
 
-import org.hydev.mcpm.client.commands.presenter.PagedPresenter;
+import org.hydev.mcpm.client.commands.presenters.PagedPresenter;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/PageController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/PageController.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.commons.lang3.StringUtils;
 import org.hydev.mcpm.Constants;
-import org.hydev.mcpm.client.commands.presenter.PagedPresenter;
+import org.hydev.mcpm.client.commands.presenters.PagedPresenter;
 
 import javax.annotation.Nullable;
 import java.io.File;
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/SearchPackagesController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/SearchPackagesController.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.commands.controllers;
 
-import org.hydev.mcpm.client.commands.presenter.Table;
+import org.hydev.mcpm.client.display.presenters.Table;
 import org.hydev.mcpm.client.models.PluginModel;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 import org.hydev.mcpm.client.search.SearchPackagesInput;
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/UpdateController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/UpdateController.java
@@ -1,7 +1,7 @@
 package org.hydev.mcpm.client.commands.controllers;
 
 import org.hydev.mcpm.client.commands.presenters.UpdatePresenter;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.updater.UpdateBoundary;
 import org.hydev.mcpm.client.updater.UpdateInput;
 
diff --git a/src/main/java/org/hydev/mcpm/client/commands/presenters/InstallResultPresenter.java b/src/main/java/org/hydev/mcpm/client/commands/presenters/InstallResultPresenter.java
@@ -1,4 +1,4 @@
-package org.hydev.mcpm.client.installer.presenter;
+package org.hydev.mcpm.client.commands.presenters;
 
 import org.hydev.mcpm.client.installer.InstallResult;
 
diff --git a/src/main/java/org/hydev/mcpm/client/commands/presenters/PagedPresenter.java b/src/main/java/org/hydev/mcpm/client/commands/presenters/PagedPresenter.java
@@ -1,4 +1,4 @@
-package org.hydev.mcpm.client.commands.presenter;
+package org.hydev.mcpm.client.commands.presenters;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
diff --git a/src/main/java/org/hydev/mcpm/client/display/presenters/InstallPresenter.java b/src/main/java/org/hydev/mcpm/client/display/presenters/InstallPresenter.java
@@ -1,5 +1,6 @@
-package org.hydev.mcpm.client.installer.presenter;
+package org.hydev.mcpm.client.display.presenters;
 
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.installer.InstallResult;
 
 import java.util.function.Consumer;
diff --git a/src/main/java/org/hydev/mcpm/client/display/presenters/LogUpdatePresenter.java b/src/main/java/org/hydev/mcpm/client/display/presenters/LogUpdatePresenter.java
@@ -1,6 +1,5 @@
 package org.hydev.mcpm.client.display.presenters;
 
-import org.hydev.mcpm.client.commands.presenter.Table;
 import org.hydev.mcpm.client.commands.presenters.UpdatePresenter;
 import org.hydev.mcpm.client.updater.UpdateInput;
 import org.hydev.mcpm.client.updater.UpdateOutcome;
diff --git a/src/main/java/org/hydev/mcpm/client/display/presenters/Table.java b/src/main/java/org/hydev/mcpm/client/display/presenters/Table.java
@@ -1,7 +1,8 @@
-package org.hydev.mcpm.client.commands.presenter;
+package org.hydev.mcpm.client.display.presenters;
 
 import com.google.common.collect.Streams;
 import org.apache.commons.lang3.StringUtils;
+import org.hydev.mcpm.client.commands.presenters.PagedPresenter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/hydev/mcpm/client/installer/InstallBoundary.java b/src/main/java/org/hydev/mcpm/client/installer/InstallBoundary.java
@@ -2,7 +2,7 @@
 
 
 import org.hydev.mcpm.client.installer.input.InstallInput;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 
 /**
  * Interface for installing plugin to the jar file.
diff --git a/src/main/java/org/hydev/mcpm/client/installer/InstallInteractor.java b/src/main/java/org/hydev/mcpm/client/installer/InstallInteractor.java
@@ -11,8 +11,8 @@
 import org.hydev.mcpm.client.injector.PluginNotFoundException;
 import org.hydev.mcpm.client.installer.InstallResult.Type;
 import org.hydev.mcpm.client.installer.input.InstallInput;
-import org.hydev.mcpm.client.installer.presenter.InstallPresenter;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.display.presenters.InstallPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.models.PluginModel;
 
 import java.io.File;
diff --git a/src/main/java/org/hydev/mcpm/client/updater/UpdateInput.java b/src/main/java/org/hydev/mcpm/client/updater/UpdateInput.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.updater;
 
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 
 import java.util.List;
 
diff --git a/src/main/java/org/hydev/mcpm/client/updater/UpdateInteractor.java b/src/main/java/org/hydev/mcpm/client/updater/UpdateInteractor.java
@@ -7,7 +7,7 @@
 import org.hydev.mcpm.client.matcher.PluginVersionState;
 import org.hydev.mcpm.client.installer.InstallBoundary;
 import org.hydev.mcpm.client.installer.input.InstallInput;
-import org.hydev.mcpm.client.installer.presenter.InstallResultPresenter;
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.models.PluginModel;
 import org.hydev.mcpm.client.models.PluginYml;
 import org.hydev.mcpm.utils.Pair;
diff --git a/src/test/java/org/hydev/mcpm/client/commands/presenter/TableTest.java b/src/test/java/org/hydev/mcpm/client/commands/presenter/TableTest.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.commands.presenter;
 
-import org.hydev.mcpm.client.commands.presenter.Table;
+import org.hydev.mcpm.client.display.presenters.Table;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.hydev.mcpm.client.installer.presenter;`
	`1`	`+package org.hydev.mcpm.client.commands.presenters;`
`2`	`2`
`3`	`3`	`import org.hydev.mcpm.client.installer.InstallResult;`
`4`	`4`