1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-21 08:57:38 +00:00

A wee bit of a cleanup of the API

- Move some method over to defaulted methods
 - Use Objects rather than Preconditions
This commit is contained in:
SquidDev
2018-12-17 21:33:49 +00:00
parent 3537f49ced
commit 741ee447ca
38 changed files with 184 additions and 260 deletions

View File

@@ -19,8 +19,8 @@ import javax.annotation.Nullable;
*/
public final class TurtleCommandResult
{
private static final TurtleCommandResult s_success = new TurtleCommandResult( true, null, null );
private static final TurtleCommandResult s_emptyFailure = new TurtleCommandResult( false, null, null );
private static final TurtleCommandResult EMPTY_SUCCESS = new TurtleCommandResult( true, null, null );
private static final TurtleCommandResult EMPTY_FAILURE = new TurtleCommandResult( false, null, null );
/**
* Create a successful command result with no result.
@@ -30,7 +30,7 @@ public final class TurtleCommandResult
@Nonnull
public static TurtleCommandResult success()
{
return success( null );
return EMPTY_SUCCESS;
}
/**
@@ -42,14 +42,8 @@ public final class TurtleCommandResult
@Nonnull
public static TurtleCommandResult success( @Nullable Object[] results )
{
if( results == null || results.length == 0 )
{
return s_success;
}
else
{
return new TurtleCommandResult( true, null, results );
}
if( results == null || results.length == 0 ) return EMPTY_SUCCESS;
return new TurtleCommandResult( true, null, results );
}
/**
@@ -60,7 +54,7 @@ public final class TurtleCommandResult
@Nonnull
public static TurtleCommandResult failure()
{
return failure( null );
return EMPTY_FAILURE;
}
/**
@@ -72,25 +66,19 @@ public final class TurtleCommandResult
@Nonnull
public static TurtleCommandResult failure( @Nullable String errorMessage )
{
if( errorMessage == null )
{
return s_emptyFailure;
}
else
{
return new TurtleCommandResult( false, errorMessage, null );
}
if( errorMessage == null ) return EMPTY_FAILURE;
return new TurtleCommandResult( false, errorMessage, null );
}
private final boolean m_success;
private final String m_errorMessage;
private final Object[] m_results;
private final boolean success;
private final String errorMessage;
private final Object[] results;
private TurtleCommandResult( boolean success, String errorMessage, Object[] results )
{
m_success = success;
m_errorMessage = errorMessage;
m_results = results;
this.success = success;
this.errorMessage = errorMessage;
this.results = results;
}
/**
@@ -100,7 +88,7 @@ public final class TurtleCommandResult
*/
public boolean isSuccess()
{
return m_success;
return success;
}
/**
@@ -111,7 +99,7 @@ public final class TurtleCommandResult
@Nullable
public String getErrorMessage()
{
return m_errorMessage;
return errorMessage;
}
/**
@@ -122,6 +110,6 @@ public final class TurtleCommandResult
@Nullable
public Object[] getResults()
{
return m_results;
return results;
}
}