[PR] Merge pull request #93 from CSC207-2022F-UofT/patch-tracker

[F] Patch plugin tracker

Author: hykilpikonna

src/main/java/org/hydev/mcpm/client/DatabaseManager.java

@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client;
 
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 import org.hydev.mcpm.client.search.SearchPackagesInput;
 import org.hydev.mcpm.client.search.SearchPackagesResult;
@@ -15,10 +15,10 @@
  * (Goal: avoid the dependency and cluster of parameters to connect to database).
  */
 public class DatabaseManager {
-    private final SuperPluginTracker localPluginTracker;
+    private final PluginTracker localPluginTracker;
     private final SearchPackagesBoundary searchInteractor;
 
-    public DatabaseManager(SuperPluginTracker tracker, SearchPackagesBoundary searcher) {
+    public DatabaseManager(PluginTracker tracker, SearchPackagesBoundary searcher) {
         this.localPluginTracker = tracker;
         this.searchInteractor = searcher;
     }
@@ -78,8 +78,6 @@ public boolean checkPluginInstalledByVersion(PluginVersion pluginVersion) {
      * */
     public void addManualInstalled(long id, PluginVersion pluginVersion, boolean isManuallyInstalled) {
         localPluginTracker.addEntry(pluginVersion.meta().name(),
-                isManuallyInstalled,
-                pluginVersion.id() + "",
-                id + "");
+                isManuallyInstalled, pluginVersion.id(), id);
     }
 }

src/main/java/org/hydev/mcpm/client/arguments/CommandsFactory.java

@@ -29,7 +29,7 @@
 import org.hydev.mcpm.client.commands.controllers.UninstallController;
 import org.hydev.mcpm.client.commands.controllers.UnloadController;
 import org.hydev.mcpm.client.commands.controllers.UpdateController;
-import org.hydev.mcpm.client.local.SuperLocalPluginTracker;
+import org.hydev.mcpm.client.local.LocalPluginTracker;
 import org.hydev.mcpm.client.updater.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.list.ListAllInteractor;
 import org.hydev.mcpm.client.matcher.MatchPluginsInteractor;
@@ -68,7 +68,7 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var mirror = new MirrorSelector();
         var fetcher = new LocalDatabaseFetcher(mirror.selectedMirrorSupplier());
         // TODO: Change all implementation to SuperLocalPluginTracker
-        var superTracker = new SuperLocalPluginTracker();
+        var superTracker = new LocalPluginTracker();
         var jarFinder = new LocalJarFinder();
 
         var loader = isMinecraft ? new PluginLoader(jarFinder) : null;

src/main/java/org/hydev/mcpm/client/commands/controllers/InfoController.java

@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.WordUtils;
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.utils.ColorLogger;
 
 import javax.annotation.Nullable;
@@ -14,7 +14,7 @@
 /**
  * Controller for the info use case
  */
-public record InfoController(SuperPluginTracker tracker)
+public record InfoController(PluginTracker tracker)
 {
     private static final int LEN_LEFT = 12;
     private static final int LEN_RIGHT = 60;