AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use jdk1.5 notation to do away with the array type prototypes.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4335 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2006-08-21 21:50:24 +00:00
parent e597ecb14f
commit d57d213904
4 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/admin/client/AsStringFieldEditor.java
+4 -9
View File
@@ -73,16 +73,16 @@ public class AsStringFieldEditor extends FieldEditor
} else if (_field.getType().equals(String.class)) {
return text;
} else if (_field.getType().equals(STRING_ARRAY_PROTO.getClass())) {
} else if (_field.getType().equals(String[].class)) {
return StringUtil.parseStringArray(_value.getText());
} else if (_field.getType().equals(INT_ARRAY_PROTO.getClass())) {
} else if (_field.getType().equals(int[].class)) {
return StringUtil.parseIntArray(_value.getText());
} else if (_field.getType().equals(FLOAT_ARRAY_PROTO.getClass())) {
} else if (_field.getType().equals(float[].class)) {
return StringUtil.parseFloatArray(_value.getText());
} else if (_field.getType().equals(LONG_ARRAY_PROTO.getClass())) {
} else if (_field.getType().equals(long[].class)) {
return StringUtil.parseLongArray(_value.getText());
} else if (_field.getType().equals(Boolean.TYPE)) {
@@ -102,9 +102,4 @@ public class AsStringFieldEditor extends FieldEditor
}
protected JTextField _value;
protected static final String[] STRING_ARRAY_PROTO = new String[0];
protected static final int[] INT_ARRAY_PROTO = new int[0];
protected static final float[] FLOAT_ARRAY_PROTO = new float[0];
protected static final long[] LONG_ARRAY_PROTO = new long[0];
}
src/java/com/threerings/admin/server/ConfigRegistry.java
+4 -9
View File
@@ -240,19 +240,19 @@ public abstract class ConfigRegistry
String defval = (String)field.get(object);
field.set(object, getValue(key, defval));
} else if (type.equals(INT_ARRAY_PROTO.getClass())) {
} else if (type.equals(int[].class)) {
int[] defval = (int[])field.get(object);
field.set(object, getValue(key, defval));
} else if (type.equals(FLOAT_ARRAY_PROTO.getClass())) {
} else if (type.equals(float[].class)) {
float[] defval = (float[])field.get(object);
field.set(object, getValue(key, defval));
} else if (type.equals(STRING_ARRAY_PROTO.getClass())) {
} else if (type.equals(String[].class)) {
String[] defval = (String[])field.get(object);
field.set(object, getValue(key, defval));
} else if (type.equals(LONG_ARRAY_PROTO.getClass())) {
} else if (type.equals(long[].class)) {
long[] defval = (long[])field.get(object);
field.set(object, getValue(key, defval));
@@ -367,9 +367,4 @@ public abstract class ConfigRegistry
/** A mapping from identifying key to config object. */
protected HashMap<String,ObjectRecord> _configs =
new HashMap<String,ObjectRecord>();
protected static final int[] INT_ARRAY_PROTO = new int[0];
protected static final float[] FLOAT_ARRAY_PROTO = new float[0];
protected static final String[] STRING_ARRAY_PROTO = new String[0];
protected static final long[] LONG_ARRAY_PROTO = new long[0];
}