Skip to content

Commit 4fee211

Browse files
committed
PrefService: use sub-node for the specified class
It was silly to use org.foo/Bar.myKey for c=org.foo.Bar, name=myKey. Much easier and safer to use org.foo/Bar/myKey.
1 parent 75ad716 commit 4fee211

File tree

1 file changed

+21
-24
lines changed

1 file changed

+21
-24
lines changed

src/main/java/org/scijava/prefs/DefaultPrefService.java

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,96 +62,96 @@ public class DefaultPrefService extends AbstractPrefService {
6262
public String get(final Class<?> c, final String name,
6363
final String defaultValue)
6464
{
65-
return prefs(c).get(key(c, name), defaultValue);
65+
return prefs(c).get(name, defaultValue);
6666
}
6767

6868
@Override
6969
public boolean getBoolean(final Class<?> c, final String name,
7070
final boolean defaultValue)
7171
{
72-
return prefs(c).getBoolean(key(c, name), defaultValue);
72+
return prefs(c).getBoolean(name, defaultValue);
7373
}
7474

7575
@Override
7676
public double getDouble(final Class<?> c, final String name,
7777
final double defaultValue)
7878
{
79-
return prefs(c).getDouble(key(c, name), defaultValue);
79+
return prefs(c).getDouble(name, defaultValue);
8080
}
8181

8282
@Override
8383
public float getFloat(final Class<?> c, final String name,
8484
final float defaultValue)
8585
{
86-
return prefs(c).getFloat(key(c, name), defaultValue);
86+
return prefs(c).getFloat(name, defaultValue);
8787
}
8888

8989
@Override
9090
public int
9191
getInt(final Class<?> c, final String name, final int defaultValue)
9292
{
93-
return prefs(c).getInt(key(c, name), defaultValue);
93+
return prefs(c).getInt(name, defaultValue);
9494
}
9595

9696
@Override
9797
public long getLong(final Class<?> c, final String name,
9898
final long defaultValue)
9999
{
100-
return prefs(c).getLong(key(c, name), defaultValue);
100+
return prefs(c).getLong(name, defaultValue);
101101
}
102102

103103
@Override
104104
public Map<String, String> getMap(final Class<?> c, final String name) {
105-
return prefs(c).node(key(c, name)).getMap();
105+
return prefs(c).node(name).getMap();
106106
}
107107

108108
@Override
109109
public List<String> getList(final Class<?> c, final String name) {
110-
return prefs(c).node(key(c, name)).getList();
110+
return prefs(c).node(name).getList();
111111
}
112112

113113
@Override
114114
public void put(final Class<?> c, final String name, final String value) {
115-
prefs(c).put(key(c, name), value);
115+
prefs(c).put(name, value);
116116
}
117117

118118
@Override
119119
public void put(final Class<?> c, final String name, final boolean value) {
120-
prefs(c).putBoolean(key(c, name), value);
120+
prefs(c).putBoolean(name, value);
121121
}
122122

123123
@Override
124124
public void put(final Class<?> c, final String name, final double value) {
125-
prefs(c).putDouble(key(c, name), value);
125+
prefs(c).putDouble(name, value);
126126
}
127127

128128
@Override
129129
public void put(final Class<?> c, final String name, final float value) {
130-
prefs(c).putFloat(key(c, name), value);
130+
prefs(c).putFloat(name, value);
131131
}
132132

133133
@Override
134134
public void put(final Class<?> c, final String name, final int value) {
135-
prefs(c).putInt(key(c, name), value);
135+
prefs(c).putInt(name, value);
136136
}
137137

138138
@Override
139139
public void put(final Class<?> c, final String name, final long value) {
140-
prefs(c).putLong(key(c, name), value);
140+
prefs(c).putLong(name, value);
141141
}
142142

143143
@Override
144144
public void put(final Class<?> c, final String name,
145145
final Map<String, String> value)
146146
{
147-
prefs(c).node(key(c, name)).putMap(value);
147+
prefs(c).node(name).putMap(value);
148148
}
149149

150150
@Override
151151
public void put(final Class<?> c, final String name,
152152
final Iterable<String> value)
153153
{
154-
prefs(c).node(key(c, name)).putList(value);
154+
prefs(c).node(name).putList(value);
155155
}
156156

157157
@Override
@@ -167,12 +167,12 @@ public void clearAll() {
167167

168168
@Override
169169
public void clear(final Class<?> c, final String name) {
170-
prefs(c).clear(key(c, name));
170+
prefs(c).clear(name);
171171
}
172172

173173
@Override
174174
public void remove(final Class<?> c, final String name) {
175-
prefs(c).remove(key(c, name));
175+
prefs(c).remove(name);
176176
}
177177

178178
// -- Deprecated methods --
@@ -204,7 +204,7 @@ public List<String> getList(final Class<?> c) {
204204
@Deprecated
205205
@Override
206206
public Iterable<String> getIterable(final Class<?> c, final String name) {
207-
return prefs(c).node(key(c, name)).getIterable();
207+
return prefs(c).node(name).getIterable();
208208
}
209209

210210
@Deprecated
@@ -299,13 +299,10 @@ public void putIterable(final Iterable<String> iterable, final String key) {
299299

300300
// -- Helper methods --
301301

302-
private static String key(final Class<?> c, final String name) {
303-
return c == null ? name : c.getSimpleName() + "." + name;
304-
}
305-
306302
private SmartPrefs prefs(final Class<?> c) {
303+
final Class<?> nodeClass = c == null ? PrefService.class : c;
307304
return new SmartPrefs(java.util.prefs.Preferences.userNodeForPackage(
308-
c == null ? PrefService.class : c), log);
305+
nodeClass).node(nodeClass.getSimpleName()), log);
309306
}
310307

311308
private SmartPrefs prefs(final String absolutePath) {

0 commit comments

Comments
 (0)