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)
*/
@Override
public final void add(final T deck) {
String name = serializer.getItemKey(deck);
this.map.put(name, deck);
this.serializer.save(deck);
public final void add(final T item) {
String name = serializer.getItemKey(item);
this.map.put(name, item);
this.serializer.save(item);
}
/*
@@ -78,8 +78,8 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
* @see forge.util.storage.StorageBase#delete(java.lang.String)
*/
@Override
public final void delete(final String deckName) {
this.serializer.erase(this.map.remove(deckName));
public final void delete(final String itemName) {
this.serializer.erase(this.map.remove(itemName));
}
/* (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) {
super("<Subfolders>", new HashMap<String, IStorage<T>>());
this.thisFolder = thisFolder;
for (File sf : subfolders ) {
for (File sf : subfolders) {
IStorage<T> newUnit = factory.apply(sf);
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
@Override
public void add(IStorage<T> deck) {
File subdir = new File(thisFolder, deck.getName());
public void add(IStorage<T> item) {
File subdir = new File(thisFolder, item.getName());
subdir.mkdir();
// TODO: save recursivelly the passed IStorage
@@ -29,9 +29,9 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
}
@Override
public void delete(String deckName) {
File subdir = new File(thisFolder, deckName);
IStorage<T> f = map.remove(deckName);
public void delete(String itemName) {
File subdir = new File(thisFolder, itemName);
IStorage<T> f = map.remove(itemName);
// TODO: Clear all that files from disk
if (f != null) {

3
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;
public abstract class StorageReaderBase<T> implements IItemReader<T> {
protected final Function<? super T, String> keySelector;
public StorageReaderBase(final Function<? super T, String> keySelector0) {
keySelector = keySelector0;
@@ -19,7 +18,7 @@ public abstract class StorageReaderBase<T> implements IItemReader<T> {
// TODO Auto-generated method stub
return ImmutableList.of();
}
@Override
public IItemReader<T> getReaderForFolder(File subfolder) {
throw new UnsupportedOperationException("This reader is not supposed to have nested folders");