From 433be2435fde1cbb5ebd56e60260920102b69188 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Wed, 22 Feb 2012 03:48:40 +0000 Subject: [PATCH] renamed StorageReaders --- .gitattributes | 4 ++-- src/main/java/forge/deck/io/DeckGroupSerializer.java | 4 ++-- src/main/java/forge/deck/io/DeckSerializer.java | 4 ++-- src/main/java/forge/quest/data/PreconReader.java | 4 ++-- .../{FileStorageReader.java => StorageReaderFile.java} | 4 ++-- ...{FolderStorageReader.java => StorageReaderFolder.java} | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) rename src/main/java/forge/util/{FileStorageReader.java => StorageReaderFile.java} (92%) rename src/main/java/forge/util/{FolderStorageReader.java => StorageReaderFolder.java} (87%) diff --git a/.gitattributes b/.gitattributes index 13737aeaaa4..03a6e5a5d80 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11384,11 +11384,9 @@ src/main/java/forge/util/Base64Coder.java svneol=native#text/plain src/main/java/forge/util/CopyFiles.java svneol=native#text/plain src/main/java/forge/util/FileFinder.java svneol=native#text/plain src/main/java/forge/util/FileSection.java -text -src/main/java/forge/util/FileStorageReader.java -text src/main/java/forge/util/FileUtil.java svneol=native#text/plain src/main/java/forge/util/FolderMap.java svneol=native#text/plain src/main/java/forge/util/FolderMapView.java -text -src/main/java/forge/util/FolderStorageReader.java -text src/main/java/forge/util/HttpUtil.java svneol=native#text/plain src/main/java/forge/util/IFolderMap.java -text src/main/java/forge/util/IFolderMapView.java -text @@ -11397,6 +11395,8 @@ src/main/java/forge/util/IItemReader.java -text src/main/java/forge/util/IItemSerializer.java -text src/main/java/forge/util/MyRandom.java svneol=native#text/plain src/main/java/forge/util/SectionUtil.java -text +src/main/java/forge/util/StorageReaderFile.java -text +src/main/java/forge/util/StorageReaderFolder.java -text src/main/java/forge/util/package-info.java -text src/main/java/forge/view/FView.java svneol=native#text/plain src/main/java/forge/view/Main.java -text diff --git a/src/main/java/forge/deck/io/DeckGroupSerializer.java b/src/main/java/forge/deck/io/DeckGroupSerializer.java index 0625532cdb4..9c281c64147 100644 --- a/src/main/java/forge/deck/io/DeckGroupSerializer.java +++ b/src/main/java/forge/deck/io/DeckGroupSerializer.java @@ -26,14 +26,14 @@ import org.apache.commons.lang3.StringUtils; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.util.FileUtil; -import forge.util.FolderStorageReader; +import forge.util.StorageReaderFolder; import forge.util.IItemSerializer; /** * TODO: Write javadoc for this type. * */ -public class DeckGroupSerializer extends FolderStorageReader implements IItemSerializer { +public class DeckGroupSerializer extends StorageReaderFolder implements IItemSerializer { /** * TODO: Write javadoc for Constructor. * @param deckDir0 diff --git a/src/main/java/forge/deck/io/DeckSerializer.java b/src/main/java/forge/deck/io/DeckSerializer.java index 4b5f807d4be..23ff8250fa2 100644 --- a/src/main/java/forge/deck/io/DeckSerializer.java +++ b/src/main/java/forge/deck/io/DeckSerializer.java @@ -36,7 +36,7 @@ import forge.deck.Deck; import forge.item.CardPrinted; import forge.util.FileSection; import forge.util.FileUtil; -import forge.util.FolderStorageReader; +import forge.util.StorageReaderFolder; import forge.util.IItemSerializer; import freemarker.template.Configuration; import freemarker.template.DefaultObjectWrapper; @@ -47,7 +47,7 @@ import freemarker.template.TemplateException; * TODO: Write javadoc for this type. * */ -public class DeckSerializer extends FolderStorageReader implements IItemSerializer { +public class DeckSerializer extends StorageReaderFolder implements IItemSerializer { public DeckSerializer(File deckDir0) { super(deckDir0); diff --git a/src/main/java/forge/quest/data/PreconReader.java b/src/main/java/forge/quest/data/PreconReader.java index d07d86e9ded..8b2834d0385 100644 --- a/src/main/java/forge/quest/data/PreconReader.java +++ b/src/main/java/forge/quest/data/PreconReader.java @@ -4,13 +4,13 @@ import java.io.File; import java.io.FilenameFilter; import forge.deck.io.DeckSerializer; import forge.item.PreconDeck; -import forge.util.FolderStorageReader; +import forge.util.StorageReaderFolder; /** * TODO: Write javadoc for this type. * */ -public class PreconReader extends FolderStorageReader { +public class PreconReader extends StorageReaderFolder { /** * TODO: Write javadoc for Constructor. diff --git a/src/main/java/forge/util/FileStorageReader.java b/src/main/java/forge/util/StorageReaderFile.java similarity index 92% rename from src/main/java/forge/util/FileStorageReader.java rename to src/main/java/forge/util/StorageReaderFile.java index d2dac0ac432..e44fadc94c8 100644 --- a/src/main/java/forge/util/FileStorageReader.java +++ b/src/main/java/forge/util/StorageReaderFile.java @@ -32,11 +32,11 @@ import org.apache.commons.lang3.StringUtils; * TODO: Write javadoc for this type. * */ -public abstract class FileStorageReader implements IItemReader { +public abstract class StorageReaderFile implements IItemReader { private final File file; - public FileStorageReader(File file0) { + public StorageReaderFile(File file0) { file = file0; } diff --git a/src/main/java/forge/util/FolderStorageReader.java b/src/main/java/forge/util/StorageReaderFolder.java similarity index 87% rename from src/main/java/forge/util/FolderStorageReader.java rename to src/main/java/forge/util/StorageReaderFolder.java index 0f3d990997a..c0ec02c2002 100644 --- a/src/main/java/forge/util/FolderStorageReader.java +++ b/src/main/java/forge/util/StorageReaderFolder.java @@ -36,7 +36,7 @@ import forge.error.ErrorViewer; * TODO: Write javadoc for this type. * */ -public abstract class FolderStorageReader implements IItemReader { +public abstract class StorageReaderFolder implements IItemReader { private final File directory; @@ -45,7 +45,7 @@ public abstract class FolderStorageReader implements IItemRe } - public FolderStorageReader(File deckDir0) { + public StorageReaderFolder(File deckDir0) { directory = deckDir0; @@ -90,7 +90,7 @@ public abstract class FolderStorageReader implements IItemRe if (null == newDeck) { String msg = "An object stored in " + file.getPath() + " failed to load.\nPlease submit this as a bug with the mentioned file/directory attached."; - JOptionPane.showMessageDialog(null, msg); //-- This becomes bugged if uncommented, but i need these messages to debug other peoples decks // Max Mtg + JOptionPane.showMessageDialog(null, msg); continue; } result.put(newDeck.getName(), newDeck); @@ -104,7 +104,7 @@ public abstract class FolderStorageReader implements IItemRe if (!decksThatFailedToLoad.isEmpty()) { JOptionPane.showMessageDialog(null, StringUtils.join(decksThatFailedToLoad, System.getProperty("line.separator")), - "Some of your decks were not loaded.", JOptionPane.WARNING_MESSAGE); + "Some of your objects were not loaded.", JOptionPane.WARNING_MESSAGE); } return result;