external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

More code cleanup

Browse Source
This commit is contained in:
drdev
2014-01-15 05:20:00 +00:00
parent f0f7cfc839
commit d7f8231717
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
View File

@@ -66,10 +66,10 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
* @see forge.util.storage.StorageBase#add(T) * @see forge.util.storage.StorageBase#add(T)
*/ */
@Override @Override
public final void add(final T deck) { public final void add(final T item) {
String name = serializer.getItemKey(deck); String name = serializer.getItemKey(item);
this.map.put(name, deck); this.map.put(name, item);
this.serializer.save(deck); this.serializer.save(item);
} }
/* /*
@@ -78,8 +78,8 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
* @see forge.util.storage.StorageBase#delete(java.lang.String) * @see forge.util.storage.StorageBase#delete(java.lang.String)
*/ */
@Override @Override
public final void delete(final String deckName) { public final void delete(final String itemName) {
this.serializer.erase(this.map.remove(deckName)); this.serializer.erase(this.map.remove(itemName));
} }
/* (non-Javadoc) /* (non-Javadoc)

12
forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
View File

@@ -11,7 +11,7 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
public StorageNestedFolders(File thisFolder, Iterable<File> subfolders, Function<File, IStorage<T>> factory) { public StorageNestedFolders(File thisFolder, Iterable<File> subfolders, Function<File, IStorage<T>> factory) {
super("<Subfolders>", new HashMap<String, IStorage<T>>()); super("<Subfolders>", new HashMap<String, IStorage<T>>());
this.thisFolder = thisFolder; this.thisFolder = thisFolder;
for (File sf : subfolders ) { for (File sf : subfolders) {
IStorage<T> newUnit = factory.apply(sf); IStorage<T> newUnit = factory.apply(sf);
map.put(sf.getName(), newUnit); map.put(sf.getName(), newUnit);
} }
@@ -20,8 +20,8 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
// need code implementations for folder create/delete operations // need code implementations for folder create/delete operations
@Override @Override
public void add(IStorage<T> deck) { public void add(IStorage<T> item) {
File subdir = new File(thisFolder, deck.getName()); File subdir = new File(thisFolder, item.getName());
subdir.mkdir(); subdir.mkdir();
// TODO: save recursivelly the passed IStorage // TODO: save recursivelly the passed IStorage
@@ -29,9 +29,9 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
} }
@Override @Override
public void delete(String deckName) { public void delete(String itemName) {
File subdir = new File(thisFolder, deckName); File subdir = new File(thisFolder, itemName);
IStorage<T> f = map.remove(deckName); IStorage<T> f = map.remove(itemName);
// TODO: Clear all that files from disk // TODO: Clear all that files from disk
if (f != null) { if (f != null) {

1
forge-core/src/main/java/forge/util/storage/StorageReaderBase.java
View File

@@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableList;
import forge.util.IItemReader; import forge.util.IItemReader;
public abstract class StorageReaderBase<T> implements IItemReader<T> { public abstract class StorageReaderBase<T> implements IItemReader<T> {
protected final Function<? super T, String> keySelector; protected final Function<? super T, String> keySelector;
public StorageReaderBase(final Function<? super T, String> keySelector0) { public StorageReaderBase(final Function<? super T, String> keySelector0) {
keySelector = keySelector0; keySelector = keySelector0;