twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-26 01:43:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Generic cleanup of warnings, whitespace and style.

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
Bukkit/Spigot
2011-12-25 16:02:30 +01:00
parent 98960fd73e
commit aaab1cba23
257 changed files with 1408 additions and 1152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
paper-api/src/main/java/org/bukkit/permissions/Permissible.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.permissions;
import java.util.Set;

9
paper-api/src/main/java/org/bukkit/permissions/PermissibleBase.java
View File

@@ -23,12 +23,12 @@ public class PermissibleBase implements Permissible {
this.opable = opable;
if (opable instanceof Permissible) {
this.parent = (Permissible)opable;
this.parent = (Permissible) opable;
}
recalculatePermissions();
}
public boolean isOp() {
if (opable == null) {
return false;
@@ -90,11 +90,8 @@ public class PermissibleBase implements Permissible {
if (isPermissionSet(name)) {
return permissions.get(name).getValue();
} else if (perm != null) {
return perm.getDefault().getValue(isOp());
} else {
return Permission.DEFAULT_PERMISSION.getValue(isOp());
}
return perm.getDefault().getValue(isOp());
}
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {

29
paper-api/src/main/java/org/bukkit/permissions/Permission.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.permissions;
import java.util.ArrayList;
@@ -53,7 +52,7 @@ public class Permission {
this.name = name;
this.description = (description == null) ? "" : description;
this.defaultValue = (defaultValue == null) ? PermissionDefault.FALSE : defaultValue;
if (children != null) {
this.children.putAll(children);
}
@@ -282,7 +281,7 @@ public class Permission {
if (data.containsKey("description")) {
try {
desc = (String)data.get("description");
desc = (String) data.get("description");
} catch (ClassCastException ex) {
throw new IllegalArgumentException("'description' key is of wrong type", ex);
}
@@ -295,7 +294,7 @@ public class Permission {
Object parents = data.get("parents");
if (parents instanceof String) {
result.addParent((String)parents, true);
result.addParent((String) parents, true);
}
} catch (ClassCastException ex) {
throw new IllegalArgumentException("'parents' key is of wrong type", ex);
@@ -305,33 +304,31 @@ public class Permission {
return result;
}
@SuppressWarnings("unchecked")
private static Map<String, Boolean> extractChildren(Map<String, Object> data, String name, PermissionDefault def, List<Permission> output) {
Map<String, Object> input = (Map<String, Object>)data.get("children");
Map<String, Boolean> children = new LinkedHashMap();
Map<String, Object> input = (Map<String, Object>) data.get("children");
Map<String, Boolean> children = new LinkedHashMap<String, Boolean>();
for (Map.Entry<String, Object> entry : input.entrySet()) {
if ((entry.getValue() instanceof Boolean)) {
children.put(entry.getKey(), (Boolean)entry.getValue());
children.put(entry.getKey(), (Boolean) entry.getValue());
} else if ((entry.getValue() instanceof Map)) {
try {
try
{
Permission perm = loadPermission((String)entry.getKey(), (Map<String, Object>)entry.getValue(), def, output);
try {
Permission perm = loadPermission((String) entry.getKey(), (Map<String, Object>) entry.getValue(), def, output);
children.put(perm.getName(), Boolean.valueOf(true));
if (output != null) {
output.add(perm);
}
}
catch (Throwable ex) {
Bukkit.getServer().getLogger().log(Level.SEVERE, "Permission node '" + (String)entry.getKey() + "' in child of " + name + " is invalid", ex);
} catch (Throwable ex) {
Bukkit.getServer().getLogger().log(Level.SEVERE, "Permission node '" + (String) entry.getKey() + "' in child of " + name + " is invalid", ex);
}
} catch (ClassCastException ex) {
throw new IllegalArgumentException("Child '" + (String)entry.getKey() + "' contains invalid map type");
throw new IllegalArgumentException("Child '" + (String) entry.getKey() + "' contains invalid map type");
}
} else {
throw new IllegalArgumentException("Child '" + (String)entry.getKey() + "' contains invalid value");
throw new IllegalArgumentException("Child '" + (String) entry.getKey() + "' contains invalid value");
}
}

1
paper-api/src/main/java/org/bukkit/permissions/PermissionAttachment.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.permissions;
import java.util.LinkedHashMap;

1
paper-api/src/main/java/org/bukkit/permissions/PermissionAttachmentInfo.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.permissions;
/**

22
paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
View File

@@ -27,16 +27,16 @@ public enum PermissionDefault {
*/
public boolean getValue(boolean op) {
switch (this) {
case TRUE:
return true;
case FALSE:
return false;
case OP:
return op;
case NOT_OP:
return !op;
default:
return false;
case TRUE:
return true;
case FALSE:
return false;
case OP:
return op;
case NOT_OP:
return !op;
default:
return false;
}
}
@@ -54,7 +54,7 @@ public enum PermissionDefault {
public String toString() {
return names[0];
}
static {
for (PermissionDefault value : values()) {
for (String name : value.names) {

1
paper-api/src/main/java/org/bukkit/permissions/PermissionRemovedExecutor.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.permissions;
/**