Whitespace + general cleanup

By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
Bukkit/Spigot
2011-05-14 23:22:54 +02:00
parent 8217ff1836
commit 855f4133b6
216 changed files with 1649 additions and 1637 deletions

View File

@@ -11,7 +11,7 @@ import java.util.NoSuchElementException;
/**
* A simple services manager.
*
*
* @author sk89q
*/
public class SimpleServicesManager implements ServicesManager {
@@ -19,12 +19,11 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Map of providers.
*/
private final Map<Class<?>, List<RegisteredServiceProvider<?>>> providers =
new HashMap<Class<?>, List<RegisteredServiceProvider<?>>>();
private final Map<Class<?>, List<RegisteredServiceProvider<?>>> providers = new HashMap<Class<?>, List<RegisteredServiceProvider<?>>>();
/**
* Register a provider of a service.
*
*
* @param <T> Provider
* @param service service class
* @param provider provider to register
@@ -33,19 +32,17 @@ public class SimpleServicesManager implements ServicesManager {
*/
public <T> void register(Class<T> service, T provider,
Plugin plugin, ServicePriority priority) {
synchronized (providers) {
List<RegisteredServiceProvider<?>> registered =
providers.get(service);
List<RegisteredServiceProvider<?>> registered = providers.get(service);
if (registered == null) {
registered = new ArrayList<RegisteredServiceProvider<?>>();
providers.put(service, registered);
}
registered.add(new RegisteredServiceProvider<T>(
service, provider, priority, plugin));
registered.add(new RegisteredServiceProvider<T>(service, provider, priority, plugin));
// Make sure that providers are in the right order in order
// for priorities to work correctly
Collections.sort(registered);
@@ -54,123 +51,117 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Unregister all the providers registered by a particular plugin.
*
*
* @param plugin
*/
public void unregisterAll(Plugin plugin) {
synchronized (providers) {
Iterator<Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>>> it =
providers.entrySet().iterator();
Iterator<Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>>> it = providers.entrySet().iterator();
try {
while (it.hasNext()) {
Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>> entry = it.next();
Iterator<RegisteredServiceProvider<?>> it2 = entry.getValue().iterator();
try {
// Removed entries that are from this plugin
while (it2.hasNext()) {
if (it2.next().getPlugin() == plugin) {
it2.remove();
}
}
} catch (NoSuchElementException e) {
// Why does Java suck
} catch (NoSuchElementException e) { // Why does Java suck
}
// Get rid of the empty list
if (entry.getValue().size() == 0) {
it.remove();
}
}
} catch (NoSuchElementException e) {
}
} catch (NoSuchElementException e) {}
}
}
/**
* Unregister a particular provider for a particular service.
*
* @param service
*
* @param service
* @param provider
*/
public void unregister(Class<?> service, Object provider) {
synchronized (providers) {
Iterator<Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>>> it =
providers.entrySet().iterator();
Iterator<Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>>> it = providers.entrySet().iterator();
try {
while (it.hasNext()) {
Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>> entry = it.next();
// We want a particular service
if (entry.getKey() != service) {
continue;
}
Iterator<RegisteredServiceProvider<?>> it2 = entry.getValue().iterator();
try {
// Removed entries that are from this plugin
while (it2.hasNext()) {
if (it2.next().getProvider() == provider) {
it2.remove();
}
}
} catch (NoSuchElementException e) {
// Why does Java suck
} catch (NoSuchElementException e) { // Why does Java suck
}
// Get rid of the empty list
if (entry.getValue().size() == 0) {
it.remove();
}
}
} catch (NoSuchElementException e) {
}
} catch (NoSuchElementException e) {}
}
}
/**
* Unregister a particular provider.
*
*
* @param provider
*/
public void unregister(Object provider) {
synchronized (providers) {
Iterator<Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>>> it =
providers.entrySet().iterator();
Iterator<Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>>> it = providers.entrySet().iterator();
try {
while (it.hasNext()) {
Map.Entry<Class<?>, List<RegisteredServiceProvider<?>>> entry = it.next();
Iterator<RegisteredServiceProvider<?>> it2 = entry.getValue().iterator();
try {
// Removed entries that are from this plugin
while (it2.hasNext()) {
if (it2.next().getProvider() == provider) {
it2.remove();
}
}
} catch (NoSuchElementException e) {
// Why does Java suck
} catch (NoSuchElementException e) { // Why does Java suck
}
// Get rid of the empty list
if (entry.getValue().size() == 0) {
it.remove();
}
}
} catch (NoSuchElementException e) {
}
} catch (NoSuchElementException e) {}
}
}
/**
* Queries for a provider. This may return if no provider has been
* registered for a service. The highest priority provider is returned.
*
*
* @param <T>
* @param service
* @return provider or null
@@ -179,11 +170,11 @@ public class SimpleServicesManager implements ServicesManager {
public <T> T load(Class<T> service) {
synchronized (providers) {
List<RegisteredServiceProvider<?>> registered = providers.get(service);
if (registered == null) {
return null;
}
// This should not be null!
return (T) registered.get(0).getProvider();
}
@@ -192,7 +183,7 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Queries for a provider registration. This may return if no provider
* has been registered for a service.
*
*
* @param <T>
* @param service
* @return provider registration or null
@@ -201,11 +192,11 @@ public class SimpleServicesManager implements ServicesManager {
public <T> RegisteredServiceProvider<T> getRegistration(Class<T> service) {
synchronized (providers) {
List<RegisteredServiceProvider<?>> registered = providers.get(service);
if (registered == null) {
return null;
}
// This should not be null!
return (RegisteredServiceProvider<T>) registered.get(0);
}
@@ -213,15 +204,14 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Get registrations of providers for a plugin.
*
*
* @param plugin
* @return provider registration or null
*/
public List<RegisteredServiceProvider<?>> getRegistrations(Plugin plugin) {
synchronized (providers) {
List<RegisteredServiceProvider<?>> ret =
new ArrayList<RegisteredServiceProvider<?>>();
List<RegisteredServiceProvider<?>> ret = new ArrayList<RegisteredServiceProvider<?>>();
for (List<RegisteredServiceProvider<?>> registered : providers.values()) {
for (RegisteredServiceProvider<?> provider : registered) {
if (provider.getPlugin() == plugin) {
@@ -229,7 +219,7 @@ public class SimpleServicesManager implements ServicesManager {
}
}
}
return ret;
}
}
@@ -237,7 +227,7 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Get registrations of providers for a service. The returned list is
* unmodifiable.
*
*
* @param <T>
* @param service
* @return list of registrations
@@ -246,19 +236,17 @@ public class SimpleServicesManager implements ServicesManager {
public <T> Collection<RegisteredServiceProvider<T>> getRegistrations(Class<T> service) {
synchronized (providers) {
List<RegisteredServiceProvider<?>> registered = providers.get(service);
if (registered == null) {
return Collections.unmodifiableList(
new ArrayList<RegisteredServiceProvider<T>>());
return Collections.unmodifiableList(new ArrayList<RegisteredServiceProvider<T>>());
}
List<RegisteredServiceProvider<T>> ret =
new ArrayList<RegisteredServiceProvider<T>>();
List<RegisteredServiceProvider<T>> ret = new ArrayList<RegisteredServiceProvider<T>>();
for (RegisteredServiceProvider<?> provider : registered) {
ret.add((RegisteredServiceProvider<T>) provider);
}
return Collections.unmodifiableList(ret);
}
}
@@ -266,7 +254,7 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Get a list of known services. A service is known if it has registered
* providers for it.
*
*
* @return list of known services
*/
public Collection<Class<?>> getKnownServices() {
@@ -276,8 +264,8 @@ public class SimpleServicesManager implements ServicesManager {
/**
* Returns whether a provider has been registered for a service. Do not
* check this first only to call <code>load(service)</code> later, as that
* would be a non-thread safe situation.
*
* would be a non-thread safe situation.
*
* @param <T> service
* @param service service to check
* @return whether there has been a registered provider