EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix failed merge

Browse Source
This commit is contained in:
Alexander Söderberg 2020-07-17 18:00:08 +02:00
parent 3a1b56494a
commit 2a72f274c9
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java
View File

@ -36,10 +36,9 @@ public class ObjectTaskRunnable<T> implements Runnable {
private final RunnableVal<T> task; private final RunnableVal<T> task;
public ObjectTaskRunnable(final Iterator<T> iterator, public ObjectTaskRunnable(final Iterator<T> iterator,
final RunnableVal<T> task, final Runnable whenDone) { final RunnableVal<T> task) {
this.iterator = iterator; this.iterator = iterator;
this.task = task; this.task = task;
this.whenDone = whenDone;
} }
public CompletableFuture<Void> getCompletionFuture() { public CompletableFuture<Void> getCompletionFuture() {

16
Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java
View File

@ -25,9 +25,6 @@
*/ */
package com.plotsquared.core.util.task; package com.plotsquared.core.util.task;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.util.RuntimeExceptionRunnableVal;
import javax.annotation.Nonnegative; import javax.annotation.Nonnegative;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -72,7 +69,7 @@ public abstract class TaskManager {
* Remove a string from the teleport queue * Remove a string from the teleport queue
* *
* @param string String to remove * @param string String to remove
* return {@code true} if the value was stored in the map, or {@code false} * return {@code true} if the value was stored in the map, or {@code false}
*/ */
public static boolean removeFromTeleportQueue(@Nonnull final String string) { public static boolean removeFromTeleportQueue(@Nonnull final String string) {
return teleportQueue.remove(string); return teleportQueue.remove(string);
@ -200,15 +197,14 @@ public abstract class TaskManager {
return taskRunnable.getCompletionFuture(); return taskRunnable.getCompletionFuture();
} }
@Nonnull public static TaskManager getPlatformImplementation() { @Nullable public static TaskManager getPlatformImplementation() {
return implementation; return platformImplementation;
} }
@Nonnull public static void setPlatformImplementation(TaskManager implementation) { public static void setPlatformImplementation(@Nonnull final TaskManager implementation) {
implementation = implementation; platformImplementation = implementation;
} }
public <T> T sync(final RunnableVal<T> function) {
/** /**
* Make a synchronous method call and return the result * Make a synchronous method call and return the result
* *
@ -217,7 +213,7 @@ public abstract class TaskManager {
* @return Method result * @return Method result
* @throws Exception If the call fails * @throws Exception If the call fails
*/ */
public <T> T sync(@Nonnull final Callable<T> function) throws Exception { public <T> T sync(@Nonnull final Callable<T>function) throws Exception {
return sync(function, Integer.MAX_VALUE); return sync(function, Integer.MAX_VALUE);
} }