From cdd5c3f2d3f1f06d33227dd6876e5acfc77d8fbc Mon Sep 17 00:00:00 2001 From: North Date: Sat, 2 Mar 2013 15:46:55 +0200 Subject: [PATCH] [minor] removed redundant modifiers --- .../java/mage/client/constants/Constants.java | 4 +- .../plugins/card/constants/Constants.java | 4 +- .../org/mage/plugins/card/dl/DownloadJob.java | 42 ++++++++++------ .../collections/ListenableCollections.java | 50 +++++++++++++++---- Mage/src/mage/watchers/Watcher.java | 2 +- 5 files changed, 71 insertions(+), 31 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/constants/Constants.java b/Mage.Client/src/main/java/mage/client/constants/Constants.java index d841f7202b6..ad248052a20 100644 --- a/Mage.Client/src/main/java/mage/client/constants/Constants.java +++ b/Mage.Client/src/main/java/mage/client/constants/Constants.java @@ -82,8 +82,8 @@ public final class Constants { public static final String BASE_SOUND_PATH = "plugins" + File.separator + "sounds" + File.separator; public interface IO { - public static final String imageBaseDir = "plugins" + File.separator + "images" + File.separator; - public static final String IMAGE_PROPERTIES_FILE = "image.url.properties"; + String imageBaseDir = "plugins" + File.separator + "images" + File.separator; + String IMAGE_PROPERTIES_FILE = "image.url.properties"; } public enum DeckEditorMode { diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java b/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java index 5a4c05e2402..fb00e09f024 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java @@ -20,8 +20,8 @@ public class Constants { public static final int TOOLTIP_BORDER_WIDTH = 80; public interface IO { - public static final String imageBaseDir = "plugins" + File.separator + "images"; - public static final String IMAGE_PROPERTIES_FILE = "image.url.properties"; + String imageBaseDir = "plugins" + File.separator + "images"; + String IMAGE_PROPERTIES_FILE = "image.url.properties"; } public static final String CARD_IMAGE_PATH_TEMPLATE = "." + File.separator + "plugins" + File.separator + "images/{set}/{name}.{collector}.full.jpg"; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadJob.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadJob.java index f5ebdfe474c..0879721c7f1 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadJob.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadJob.java @@ -52,8 +52,11 @@ public class DownloadJob extends AbstractLaternaBean { * Sets the job's state. If the state is {@link State#ABORTED}, it instead sets the error to "ABORTED" */ public void setState(State state) { - if(state == State.ABORTED) setError("ABORTED"); - else this.state.setValue(state); + if (state == State.ABORTED) { + setError("ABORTED"); + } else { + this.state.setValue(state); + } } /** @@ -77,7 +80,9 @@ public class DownloadJob extends AbstractLaternaBean { * given message and exception. */ public void setError(String message, Exception error) { - if(message == null) message = error.toString(); + if (message == null) { + message = error.toString(); + } log.warn(message, error); this.state.setValue(State.ABORTED); this.error.setValue(error); @@ -133,7 +138,9 @@ public class DownloadJob extends AbstractLaternaBean { private URLConnection c; public URLConnection getConnection() throws IOException { - if(c == null) c = proxy == null? new URL(url).openConnection():new URL(url).openConnection(proxy); + if (c == null) { + c = proxy == null ? new URL(url).openConnection() : new URL(url).openConnection(proxy); + } return c; } @@ -154,7 +161,9 @@ public class DownloadJob extends AbstractLaternaBean { private URLConnection c; public URLConnection getConnection() throws IOException { - if(c == null) c = proxy == null? url.openConnection():url.openConnection(proxy); + if (c == null) { + c = proxy == null ? url.openConnection() : url.openConnection(proxy); + } return c; } @@ -180,8 +189,9 @@ public class DownloadJob extends AbstractLaternaBean { public OutputStream open() throws IOException { File parent = file.getAbsoluteFile().getParentFile(); //Trying to create the directory before checking it exists makes it threadsafe - if(!parent.mkdirs() && !parent.exists()) throw new IOException(parent - + ": directory could not be created"); + if (!parent.mkdirs() && !parent.exists()) { + throw new IOException(parent + ": directory could not be created"); + } return new FileOutputStream(file); } @@ -192,22 +202,24 @@ public class DownloadJob extends AbstractLaternaBean { @Override public void delete() throws IOException { - if(file.exists() && !file.delete()) throw new IOException(file + " couldn't be deleted"); + if (file.exists() && !file.delete()) { + throw new IOException(file + " couldn't be deleted"); + } } }; } - public static interface Source { - public InputStream open() throws IOException; + public interface Source { + InputStream open() throws IOException; - public int length() throws IOException; + int length() throws IOException; } - public static interface Destination { - public OutputStream open() throws IOException; + public interface Destination { + OutputStream open() throws IOException; - public boolean exists() throws IOException; + boolean exists() throws IOException; - public void delete() throws IOException; + void delete() throws IOException; } } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java index 270b5e99dae..b5f04d9cabd 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java @@ -33,8 +33,11 @@ public final class ListenableCollections { private ListenableCollections() {} public static List listenableList(List list, ListListener listener) { - if(list instanceof RandomAccess) return new ListenableList(list, listener); - else return new ListenableSequentialList(list, listener); + if (list instanceof RandomAccess) { + return new ListenableList(list, listener); + } else { + return new ListenableSequentialList(list, listener); + } } public static Set listenableSet(Set set, SetListener listener) { @@ -45,21 +48,21 @@ public final class ListenableCollections { return new ListenableMap(map, listener); } - public static interface ListListener extends Serializable { + public interface ListListener extends Serializable { /** * Notified after a value was added to the list. */ - public void add(int index, E newValue); + void add(int index, E newValue); /** * Notified after a value in the list was changed. */ - public void set(int index, E oldValue, E newValue); + void set(int index, E oldValue, E newValue); /** * Notified after a value was removed from the list. */ - public void remove(int index, E oldValue); + void remove(int index, E oldValue); } private static class ListenableList extends AbstractList implements RandomAccess, Serializable { @@ -122,44 +125,53 @@ public final class ListenableCollections { private int lastIndex; private E lastValue; + @Override public boolean hasNext() { return it.hasNext(); } + @Override public boolean hasPrevious() { return it.hasPrevious(); } + @Override public E next() { lastIndex = it.nextIndex(); lastValue = it.next(); return lastValue; } + @Override public int nextIndex() { return it.nextIndex(); } + @Override public E previous() { lastIndex = it.previousIndex(); lastValue = it.previous(); return lastValue; } + @Override public int previousIndex() { return it.previousIndex(); } + @Override public void add(E o) { it.add(o); listener.add(previousIndex(), o); } + @Override public void set(E o) { it.set(o); listener.set(lastIndex, lastValue, o); } + @Override public void remove() { it.remove(); listener.remove(lastIndex, lastValue); @@ -204,7 +216,9 @@ public final class ListenableCollections { @Override public boolean add(E o) { boolean b = delegate.add(o); - if(b) listener.add(o); + if (b) { + listener.add(o); + } return b; }; @@ -212,7 +226,9 @@ public final class ListenableCollections { @Override public boolean remove(Object o) { boolean b = delegate.remove(o); - if(b) listener.remove((E) o); + if (b) { + listener.remove((E) o); + } return b; } @@ -223,18 +239,23 @@ public final class ListenableCollections { private boolean hasLast; private E last; + @Override public boolean hasNext() { return it.hasNext(); } + @Override public E next() { last = it.next(); hasLast = true; return last; } + @Override public void remove() { - if(!hasLast) throw new IllegalStateException(); + if(!hasLast) { + throw new IllegalStateException(); + } it.remove(); listener.remove(last); } @@ -298,7 +319,9 @@ public final class ListenableCollections { V old = delegate.remove(key); listener.remove((K) key, old); return old; - } else return null; + } else { + return null; + } } @Override @@ -337,18 +360,23 @@ public final class ListenableCollections { private boolean hasLast; private Entry last; + @Override public boolean hasNext() { return it.hasNext(); } + @Override public Entry next() { last = it.next(); hasLast = true; return last; } + @Override public void remove() { - if(!hasLast) throw new IllegalStateException(); + if(!hasLast) { + throw new IllegalStateException(); + } hasLast = false; it.remove(); listener.remove(last.getKey(), last.getValue()); diff --git a/Mage/src/mage/watchers/Watcher.java b/Mage/src/mage/watchers/Watcher.java index 6fefc2d60b1..364f9ff2a7a 100644 --- a/Mage/src/mage/watchers/Watcher.java +++ b/Mage/src/mage/watchers/Watcher.java @@ -48,5 +48,5 @@ public interface Watcher> extends Serializable { boolean conditionMet(); void reset(); - abstract T copy(); + T copy(); }