CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of singleton, and refactor LauncherFactory to be a static class

Browse Source 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
This commit is contained in:
solonovamax 2022-10-27 18:01:17 -04:00 committed by TheKodeToad
parent e68dcea6bc
commit 9062d28704
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/launcher/org/prismlauncher/EntryPoint.java
View File

@ -138,10 +138,7 @@ public final class EntryPoint {
} }
try { try {
Launcher launcher = Launcher launcher = LauncherFactory.createLauncher(params);
LauncherFactory
.INSTANCE
.createLauncher(params);
launcher.launch(); launcher.launch();

13
libraries/launcher/org/prismlauncher/LauncherFactory.java
View File

@ -35,6 +35,7 @@
package org.prismlauncher; package org.prismlauncher;
import org.prismlauncher.impl.LegacyLauncher; import org.prismlauncher.impl.LegacyLauncher;
import org.prismlauncher.impl.StandardLauncher; import org.prismlauncher.impl.StandardLauncher;
import org.prismlauncher.utils.Parameters; import org.prismlauncher.utils.Parameters;
@ -42,13 +43,11 @@ import org.prismlauncher.utils.Parameters;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public final class LauncherFactory { public final class LauncherFactory {
private static final Map<String, LauncherProvider> launcherRegistry = new HashMap<>();
public static final LauncherFactory INSTANCE = new LauncherFactory(); static {
private final Map<String, LauncherProvider> launcherRegistry = new HashMap<>();
private LauncherFactory() {
launcherRegistry.put("standard", new LauncherProvider() { launcherRegistry.put("standard", new LauncherProvider() {
@Override @Override
public Launcher provide(Parameters parameters) { public Launcher provide(Parameters parameters) {
@ -62,8 +61,10 @@ public final class LauncherFactory {
} }
}); });
} }
private LauncherFactory() {
}
public Launcher createLauncher(Parameters parameters) { public static Launcher createLauncher(Parameters parameters) {
String name = parameters.first("launcher"); String name = parameters.first("launcher");
LauncherProvider launcherProvider = launcherRegistry.get(name); LauncherProvider launcherProvider = launcherRegistry.get(name);