moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-12 12:25:03 -05:00
Code Issues Releases Wiki Activity

* make sure that "Getting Started" is only shown once (even if WebKit crashes the JVM)

Browse Source
This commit is contained in:
Reinhard Pointner 2015-09-12 15:49:47 +00:00
parent 9c8653baf3
commit 9847734506
2 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/net/filebot/Main.java
View File

@ -372,10 +372,12 @@ public class Main {
private static void checkGettingStarted() throws Exception {
PreferencesEntry<String> started = Settings.forPackage(Main.class).entry("getting.started").defaultValue("0");
if ("0".equals(started.getValue())) {
started.setValue("1");
started.flush();
SwingUtilities.invokeLater(() -> {
GettingStartedStage.start();
});
started.setValue("1");
}
}

54
source/net/filebot/util/PreferencesMap.java
View File

@ -1,7 +1,5 @@
package net.filebot.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -17,28 +15,26 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
public class PreferencesMap<T> implements Map<String, T> {
private final Preferences prefs;
private final Adapter<T> adapter;
public PreferencesMap(Preferences prefs, Adapter<T> adapter) {
this.prefs = prefs;
this.adapter = adapter;
}
@Override
public T get(Object key) {
return adapter.get(prefs, key.toString());
}
@Override
public T put(String key, T value) {
adapter.put(prefs, key, value);
@ -47,7 +43,6 @@ public class PreferencesMap<T> implements Map<String, T> {
return null;
}
@Override
public T remove(Object key) {
adapter.remove(prefs, key.toString());
@ -56,7 +51,6 @@ public class PreferencesMap<T> implements Map<String, T> {
return null;
}
public String[] keys() {
try {
return adapter.keys(prefs);
@ -65,7 +59,6 @@ public class PreferencesMap<T> implements Map<String, T> {
}
}
@Override
public void clear() {
for (String key : keys()) {
@ -73,7 +66,6 @@ public class PreferencesMap<T> implements Map<String, T> {
}
}
@Override
public boolean containsKey(Object key) {
if (key instanceof String) {
@ -83,7 +75,6 @@ public class PreferencesMap<T> implements Map<String, T> {
return false;
}
@Override
public boolean containsValue(Object value) {
for (String key : keys()) {
@ -94,7 +85,6 @@ public class PreferencesMap<T> implements Map<String, T> {
return false;
}
@Override
public Set<Entry<String, T>> entrySet() {
Set<Map.Entry<String, T>> entries = new LinkedHashSet<Map.Entry<String, T>>();
@ -106,19 +96,16 @@ public class PreferencesMap<T> implements Map<String, T> {
return entries;
}
@Override
public boolean isEmpty() {
return size() == 0;
}
@Override
public Set<String> keySet() {
return new LinkedHashSet<String>(Arrays.asList(keys()));
}
@Override
public void putAll(Map<? extends String, ? extends T> map) {
for (Map.Entry<? extends String, ? extends T> entry : map.entrySet()) {
@ -126,13 +113,11 @@ public class PreferencesMap<T> implements Map<String, T> {
}
}
@Override
public int size() {
return keys().length;
}
@Override
public Collection<T> values() {
List<T> values = new ArrayList<T>();
@ -144,48 +129,38 @@ public class PreferencesMap<T> implements Map<String, T> {
return values;
}
public static PreferencesMap<String> map(Preferences prefs) {
return map(prefs, new StringAdapter());
}
public static <T> PreferencesMap<T> map(Preferences prefs, Adapter<T> adapter) {
return new PreferencesMap<T>(prefs, adapter);
}
public static interface Adapter<T> {
public String[] keys(Preferences prefs) throws BackingStoreException;
public T get(Preferences prefs, String key);
public void put(Preferences prefs, String key, T value);
public void remove(Preferences prefs, String key);
}
public static abstract class AbstractAdapter<T> implements Adapter<T> {
@Override
public abstract T get(Preferences prefs, String key);
@Override
public abstract void put(Preferences prefs, String key, T value);
@Override
public String[] keys(Preferences prefs) throws BackingStoreException {
return prefs.keys();
}
@Override
public void remove(Preferences prefs, String key) {
prefs.remove(key);
@ -193,7 +168,6 @@ public class PreferencesMap<T> implements Map<String, T> {
}
public static class StringAdapter extends AbstractAdapter<String> {
@Override
@ -201,7 +175,6 @@ public class PreferencesMap<T> implements Map<String, T> {
return prefs.get(key, null);
}
@Override
public void put(Preferences prefs, String key, String value) {
prefs.put(key, value);
@ -209,12 +182,10 @@ public class PreferencesMap<T> implements Map<String, T> {
}
public static class SimpleAdapter<T> extends AbstractAdapter<T> {
private final Constructor<T> constructor;
public SimpleAdapter(Class<T> type) {
try {
constructor = type.getConstructor(String.class);
@ -223,7 +194,6 @@ public class PreferencesMap<T> implements Map<String, T> {
}
}
@Override
public T get(Preferences prefs, String key) {
String value = prefs.get(key, null);
@ -242,20 +212,17 @@ public class PreferencesMap<T> implements Map<String, T> {
return null;
}
@Override
public void put(Preferences prefs, String key, T value) {
prefs.put(key, value.toString());
}
public static <T> SimpleAdapter<T> forClass(Class<T> type) {
return new SimpleAdapter<T>(type);
}
}
public static class SerializableAdapter<T extends Serializable> extends AbstractAdapter<T> {
@SuppressWarnings("unchecked")
@ -277,7 +244,6 @@ public class PreferencesMap<T> implements Map<String, T> {
}
}
@Override
public void put(Preferences prefs, String key, T value) {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@ -294,7 +260,6 @@ public class PreferencesMap<T> implements Map<String, T> {
}
}
public static class PreferencesEntry<T> implements Entry<String, T> {
private final String key;
@ -305,43 +270,46 @@ public class PreferencesMap<T> implements Map<String, T> {
private T defaultValue = null;
public PreferencesEntry(Preferences prefs, String key, Adapter<T> adapter) {
this.key = key;
this.prefs = prefs;
this.adapter = adapter;
}
@Override
public String getKey() {
return key;
}
@Override
public T getValue() {
T value = adapter.get(prefs, key);
return value != null ? value : defaultValue;
}
@Override
public T setValue(T value) {
adapter.put(prefs, key, value);
return null;
}
public PreferencesEntry<T> defaultValue(T defaultValue) {
this.defaultValue = defaultValue;
return this;
}
public void remove() {
adapter.remove(prefs, key);
}
public void flush() {
try {
prefs.flush();
} catch (Exception e) {
Logger.getLogger(PreferencesMap.class.getName()).log(Level.WARNING, e.toString());
}
}
}
}