Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java Fri Sep 1 03:08:27 2006
@@ -31,6 +31,8 @@
import java.util.Locale;
import java.util.TooManyListenersException;
+import org.apache.harmony.beans.internal.nls.Messages;
+
/**
* @author Sergei A. Krivenko
* @version $Revision: 1.12.4.3 $
@@ -226,7 +228,7 @@
public void addBeanContextServicesListener(BeanContextServicesListener bcsl) {
if (bcsl == null) {
- throw new NullPointerException("The listener is null");
+ throw new NullPointerException(Messages.getString("beans.15")); //$NON-NLS-1$
}
synchronized (this.bcsListeners) {
@@ -250,7 +252,7 @@
BeanContextServiceProvider bcsp, boolean fireEvent) {
if (bcsp == null) {
- throw new NullPointerException("The provider is null");
+ throw new NullPointerException(Messages.getString("beans.16")); //$NON-NLS-1$
}
synchronized (BeanContext.globalHierarchyLock) {
@@ -452,23 +454,23 @@
throws TooManyListenersException {
if (child == null) {
- throw new NullPointerException("The child is null");
+ throw new NullPointerException(Messages.getString("beans.17")); //$NON-NLS-1$
}
if (requestor == null) {
- throw new NullPointerException("The requestor is null");
+ throw new NullPointerException(Messages.getString("beans.18")); //$NON-NLS-1$
}
if (serviceClass == null) {
- throw new NullPointerException("The service class is null");
+ throw new NullPointerException(Messages.getString("beans.19")); //$NON-NLS-1$
}
if (serviceSelector == null) {
- throw new NullPointerException("The service selector is null");
+ throw new NullPointerException(Messages.getString("beans.1A")); //$NON-NLS-1$
}
if (bcsrl == null) {
- throw new NullPointerException("The listener is null");
+ throw new NullPointerException(Messages.getString("beans.15")); //$NON-NLS-1$
}
synchronized (BeanContext.globalHierarchyLock) {
@@ -499,7 +501,7 @@
*/
public synchronized boolean hasService(Class serviceClass) {
if (serviceClass == null) {
- throw new NullPointerException("The service class is null");
+ throw new NullPointerException(Messages.getString("beans.19")); //$NON-NLS-1$
}
synchronized (BeanContext.globalHierarchyLock) {
@@ -567,15 +569,15 @@
Object service) {
if (child == null) {
- throw new NullPointerException("The child is null");
+ throw new NullPointerException(Messages.getString("beans.17")); //$NON-NLS-1$
}
if (requestor == null) {
- throw new NullPointerException("The requestor is null");
+ throw new NullPointerException(Messages.getString("beans.18")); //$NON-NLS-1$
}
if (service == null) {
- throw new NullPointerException("The service is null");
+ throw new NullPointerException(Messages.getString("beans.1B")); //$NON-NLS-1$
}
synchronized (BeanContext.globalHierarchyLock) {
@@ -593,7 +595,7 @@
BeanContextServicesListener bcsl) {
if (bcsl == null) {
- throw new NullPointerException("The listener is null");
+ throw new NullPointerException(Messages.getString("beans.15")); //$NON-NLS-1$
}
synchronized (this.bcsListeners) {
@@ -608,11 +610,11 @@
BeanContextServiceProvider bcsp, boolean revokeCurrentServicesNow) {
if (serviceClass == null) {
- throw new NullPointerException("The service class is null");
+ throw new NullPointerException(Messages.getString("beans.19")); //$NON-NLS-1$
}
if (bcsp == null) {
- throw new NullPointerException("The provider is null");
+ throw new NullPointerException(Messages.getString("beans.16")); //$NON-NLS-1$
}
synchronized (BeanContext.globalHierarchyLock) {
@@ -647,7 +649,7 @@
*/
public void serviceAvailable(BeanContextServiceAvailableEvent bcssae) {
if (bcssae == null) {
- throw new NullPointerException("The event is null");
+ throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
}
for (Iterator<BeanContextServicesListener> it = this.bcsListeners
@@ -663,7 +665,7 @@
*/
public void serviceRevoked(BeanContextServiceRevokedEvent bcssre) {
if (bcssre == null) {
- throw new NullPointerException("The event is null");
+ throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
}
for (Iterator<BeanContextServicesListener> it = this.bcsListeners
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Fri Sep 1 03:08:27 2006
@@ -41,6 +41,8 @@
import java.util.Iterator;
import java.util.Locale;
+import org.apache.harmony.beans.internal.nls.Messages;
+
/**
* @author Sergei A. Krivenko
* @version $Revision: 1.17.2.3 $
@@ -263,9 +265,7 @@
// Throw IllegalStateException, if PropertyVetoException occurs
throw new IllegalStateException(
- "PropertyVetoException was thrown while adding a child: "
- + targetChild + "; Original error message:"
- + e.getMessage());
+ Messages.getString("beans.30", targetChild, e.getMessage())); //$NON-NLS-1$
}
// If child implements Visibility,
@@ -334,7 +334,7 @@
// BeanContextMembershipListener canj not be null
if (bcml == null) {
- throw new NullPointerException("Membership listener is null");
+ throw new NullPointerException(Messages.getString("beans.29")); //$NON-NLS-1$
}
synchronized (this.bcmListeners) {
@@ -353,7 +353,7 @@
// Child can not be null
if (targetChild == null) {
- throw new IllegalArgumentException("Target child can not be null");
+ throw new IllegalArgumentException(Messages.getString("beans.2A")); //$NON-NLS-1$
}
// Each child should appear only once in a given BeanContext
@@ -573,7 +573,7 @@
while (true) {
Object l = ois.readObject();
- if (l != null && l.equals("EOS")) {
+ if (l != null && l.equals("EOS")) { //$NON-NLS-1$
coll.add(l);
} else {
break;
@@ -771,12 +771,12 @@
// The resource name should not be null
if (name == null) {
- throw new NullPointerException("Resource name can not be null");
+ throw new NullPointerException(Messages.getString("beans.2B")); //$NON-NLS-1$
}
// The child should not be null
if (bcc == null) {
- throw new NullPointerException("The child can not be null");
+ throw new NullPointerException(Messages.getString("beans.2C")); //$NON-NLS-1$
}
// Load resource using the same ClassLoader as BeanContextChild specified
@@ -789,7 +789,7 @@
} catch (Exception ex) {
// We tried our best but still failed
- throw new IllegalArgumentException("Invalid resource");
+ throw new IllegalArgumentException(Messages.getString("beans.2D")); //$NON-NLS-1$
}
}
}
@@ -801,12 +801,12 @@
// The resource name should not be null
if (name == null) {
- throw new NullPointerException("Resource name can not be null");
+ throw new NullPointerException(Messages.getString("beans.2B")); //$NON-NLS-1$
}
// The child should not be null
if (bcc == null) {
- throw new NullPointerException("The child can not be null");
+ throw new NullPointerException(Messages.getString("beans.2C")); //$NON-NLS-1$
}
// Load resource using the same ClassLoader as BeanContextChild specified
@@ -819,7 +819,7 @@
} catch (Exception ex) {
// No success at all
- throw new IllegalArgumentException("Invalid resource");
+ throw new IllegalArgumentException(Messages.getString("beans.2D")); //$NON-NLS-1$
}
}
}
@@ -1105,7 +1105,7 @@
// BeanContextMembershipListener can not be null
if (bcml == null) {
- throw new NullPointerException("Membership listener is null");
+ throw new NullPointerException(Messages.getString("beans.29")); //$NON-NLS-1$
}
synchronized (this.bcmListeners) {
@@ -1136,9 +1136,7 @@
// Required by spec
throw new IllegalStateException(
- "PropertyVetoException was thrown while removing "
- + " a child: " + targetChild + "; "
- + "Original error message:" + e.getMessage());
+ Messages.getString("beans.2E", targetChild, e.getMessage())); //$NON-NLS-1$
}
}
@@ -1197,7 +1195,7 @@
}
// Mark the end of stream
- oos.writeObject("EOS");
+ oos.writeObject("EOS"); //$NON-NLS-1$
}
/**
@@ -1209,7 +1207,7 @@
this.designTime = dTime;
// Notify BeanContext about this change
- firePropertyChange("designTime", new Boolean(old), new Boolean(dTime));
+ firePropertyChange("designTime", new Boolean(old), new Boolean(dTime)); //$NON-NLS-1$
}
/**
@@ -1224,7 +1222,7 @@
// Notify BeanContext about this change
Locale old = (Locale) this.locale.clone();
this.locale = newLocale;
- firePropertyChange("locale", old, newLocale);
+ firePropertyChange("locale", old, newLocale); //$NON-NLS-1$
}
/**
@@ -1280,7 +1278,7 @@
protected boolean validatePendingRemove(Object targetChild) {
if (targetChild == null) {
- throw new IllegalArgumentException("Target child is null");
+ throw new IllegalArgumentException(Messages.getString("beans.2F")); //$NON-NLS-1$
}
return true;
@@ -1293,7 +1291,7 @@
throws PropertyVetoException {
if (pce == null) {
- throw new NullPointerException("The event is null");
+ throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -51,7 +51,7 @@
int length = Array.getLength(oldInstance);
Class componentType = oldInstance.getClass().getComponentType();
- return new Expression(oldInstance, Array.class, "newInstance",
+ return new Expression(oldInstance, Array.class, "newInstance", //$NON-NLS-1$
new Object[] { componentType, new Integer(length) });
}
@@ -76,7 +76,7 @@
oldValue == null && newValue != null)
{
if (nullValue == null || !nullValue.equals(oldValue)) {
- Statement s = new Statement(oldInstance, "set",
+ Statement s = new Statement(oldInstance, "set", //$NON-NLS-1$
new Object[]{ new Integer(i), oldValue });
out.writeStatement(s);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java Fri Sep 1 03:08:27 2006
@@ -36,6 +36,7 @@
import java.util.Iterator;
import java.util.Vector;
+import org.apache.harmony.beans.internal.nls.Messages;
import org.xml.sax.Attributes;
/**
@@ -299,7 +300,7 @@
statements = new Statement[operations.size()];
}
statements[i] = new Statement(getResultValue(),
- "set", new Object[] { new Integer(i),
+ "set", new Object[] { new Integer(i), //$NON-NLS-1$
cmd.getResultValue() });
if ((i + 1) == operations.size()) {
for (int j = 0; j < operations.size(); ++j) {
@@ -398,28 +399,28 @@
// Checks if the command is static method
private boolean isStaticMethod() {
- return isTag("object") && hasAttr("method") || isTag("class");
+ return isTag("object") && hasAttr("method") || isTag("class"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
// Checks if the command is public method
private boolean isMethod() {
- return isTag("void") && (hasAttr("method") || hasAttr("index"));
+ return isTag("void") && (hasAttr("method") || hasAttr("index")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
// Check if the command relates to property - getter ot setter depends on
// number of args
private boolean isProperty() {
- return isTag("void") && hasAttr("property");
+ return isTag("void") && hasAttr("property"); //$NON-NLS-1$ //$NON-NLS-2$
}
// Check if the command is field accessor
private boolean isField() {
- return isTag("object") && hasAttr("field");
+ return isTag("object") && hasAttr("field"); //$NON-NLS-1$ //$NON-NLS-2$
}
// Check if the command is array
private boolean isArray() {
- return isTag("array");
+ return isTag("array"); //$NON-NLS-1$
}
// Check if the command is array element
@@ -428,48 +429,48 @@
}
private boolean isReference() {
- return hasAttr("idref");
+ return hasAttr("idref"); //$NON-NLS-1$
}
// Check if the command is root object
private boolean isRoot() {
- return isTag("java");
+ return isTag("java"); //$NON-NLS-1$
}
// Check if the command is null
private boolean isNull() {
- return isTag("null");
+ return isTag("null"); //$NON-NLS-1$
}
// Checks if the command could generate object
public boolean isExecutable() {
- boolean result = isTag("object") || isTag("void") && hasAttr("class")
- && hasAttr("method") || isTag("array") || isPrimitive()
- || isTag("class") || isTag("null");
+ boolean result = isTag("object") || isTag("void") && hasAttr("class") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ && hasAttr("method") || isTag("array") || isPrimitive() //$NON-NLS-1$ //$NON-NLS-2$
+ || isTag("class") || isTag("null"); //$NON-NLS-1$ //$NON-NLS-2$
return result;
}
private Argument getReferencedArgument(HashMap references) {
- return ((Command) references.get(getAttr("idref"))).getResult();
+ return ((Command) references.get(getAttr("idref"))).getResult(); //$NON-NLS-1$
}
// get a target through tag and attrs analysis
private Object getTarget(HashMap references) throws Exception {
if (target == null) {
if (isReference()) {
- Command cmd = (Command) references.get(getAttr("idref"));
+ Command cmd = (Command) references.get(getAttr("idref")); //$NON-NLS-1$
target = (cmd != null) ? cmd.getResultValue() : null;
} else if (isExecutable()) {
String className = null;
if (isPrimitive()) {
className = getPrimitiveClassName(tagName);
- } else if (isTag("class")) {
+ } else if (isTag("class")) { //$NON-NLS-1$
className = getPrimitiveClassName(tagName);
} else if (isConstructor() || isStaticMethod() || isField()) {
- className = getAttr("class");
+ className = getAttr("class"); //$NON-NLS-1$
} else if (isArray()) {
- className = getAttr("class");
+ className = getAttr("class"); //$NON-NLS-1$
Class componentType = isPrimitiveClassName(className) ? getPrimitiveClass(className)
: Class.forName(className, true, Thread
.currentThread().getContextClassLoader());
@@ -482,16 +483,15 @@
.currentThread().getContextClassLoader());
if (isField()) {
- String fieldName = getAttr("field");
+ String fieldName = getAttr("field"); //$NON-NLS-1$
target = ((Class) target).getField(fieldName);
}
} else {
- throw new Exception("target is not generated: classname "
- + className + " is not found");
+ throw new Exception(Messages.getString("beans.42", className)); //$NON-NLS-1$
}
} else if (ctx.isArray()) {
//target = ctx.getTarget(references);
- target = Class.forName("java.lang.reflect.Array");
+ target = Class.forName("java.lang.reflect.Array"); //$NON-NLS-1$
}
}
return target;
@@ -507,14 +507,14 @@
throws NoSuchMethodException, IntrospectionException, Exception {
if (methodName == null) {
String methodValue = null;
- if (isTag("class")) {
+ if (isTag("class")) { //$NON-NLS-1$
addArgument(new Argument(String.class, data), 0);
- methodValue = "forName";
+ methodValue = "forName"; //$NON-NLS-1$
} else if (isPrimitive()) {
- if (isTag("char")) {
+ if (isTag("char")) { //$NON-NLS-1$
if (data.length() != 1) {
- throw new IntrospectionException("Cannot convert"
- + data + " to char");
+ throw new IntrospectionException(Messages.getString("beans.43", //$NON-NLS-1$
+ data));
} else {
addArgument(new Argument(char.class, new Character(data
.charAt(0))), 0);
@@ -522,20 +522,20 @@
} else {
addArgument(new Argument(String.class, data), 0);
}
- methodValue = "new";
- } else if (isConstructor() || hasAttr("method", "new")) {
- methodValue = "new";
+ methodValue = "new"; //$NON-NLS-1$
+ } else if (isConstructor() || hasAttr("method", "new")) { //$NON-NLS-1$ //$NON-NLS-2$
+ methodValue = "new"; //$NON-NLS-1$
} else if (isArray()) {
- methodValue = "new";
- int length = hasAttr("length") ? Integer
- .parseInt(getAttr("length")) : getArgumentsNumber();
+ methodValue = "new"; //$NON-NLS-1$
+ int length = hasAttr("length") ? Integer //$NON-NLS-1$
+ .parseInt(getAttr("length")) : getArgumentsNumber(); //$NON-NLS-1$
copyArgumentsToCommands();
addArgument(new Argument(int.class, new Integer(length)), 0);
- } else if (hasAttr("property")) {
- String propertyValue = getAttr("property");
- if (hasAttr("index")) {
+ } else if (hasAttr("property")) { //$NON-NLS-1$
+ String propertyValue = getAttr("property"); //$NON-NLS-1$
+ if (hasAttr("index")) { //$NON-NLS-1$
addArgument(new Argument(int.class, new Integer(
- getAttr("index"))), 0);
+ getAttr("index"))), 0); //$NON-NLS-1$
}
BeanInfo beanInfo = Introspector.getBeanInfo(getTarget(
@@ -548,7 +548,7 @@
PropertyDescriptor pd = pds[i];
if (propertyValue.equals(pd.getName())) {
int argsNum = getArgumentsNumber();
- if (hasAttr("index")) {
+ if (hasAttr("index")) { //$NON-NLS-1$
IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
if (argsNum == 1) {
method = ipd.getIndexedReadMethod();
@@ -563,7 +563,7 @@
methodFound = matchMethodParams(method, references);
if (methodFound == false) {
- if (hasAttr("index")) {
+ if (hasAttr("index")) { //$NON-NLS-1$
IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
if (argsNum == 2) {
method = ipd.getIndexedWriteMethod();
@@ -581,31 +581,30 @@
}
if (method == null) {
- throw new NoSuchMethodException("for property "
- + propertyValue + " no getter(setter) is found");
+ throw new NoSuchMethodException(Messages.getString("beans.44", //$NON-NLS-1$
+ propertyValue));
} else {
methodValue = method.getName();
}
- } else if (hasAttr("method")) {
- if (hasAttr("index"))
+ } else if (hasAttr("method")) { //$NON-NLS-1$
+ if (hasAttr("index")) //$NON-NLS-1$
addArgument(new Argument(int.class, Integer
- .valueOf(getAttr("index"))), 0);
- methodValue = getAttr("method");
- } else if (hasAttr("index")) {
+ .valueOf(getAttr("index"))), 0); //$NON-NLS-1$
+ methodValue = getAttr("method"); //$NON-NLS-1$
+ } else if (hasAttr("index")) { //$NON-NLS-1$
addArgument(new Argument(int.class, Integer
- .valueOf(getAttr("index"))), 0);
- methodValue = getArgumentsNumber() > 1 ? "set" : "get";
+ .valueOf(getAttr("index"))), 0); //$NON-NLS-1$
+ methodValue = getArgumentsNumber() > 1 ? "set" : "get"; //$NON-NLS-1$ //$NON-NLS-2$
if (ctx.isArray()) {
addArgument(ctx.getResult(), 0);
}
- } else if (hasAttr("field")) {
- addArgument(new Argument(Class.forName(getAttr("class"), true,
+ } else if (hasAttr("field")) { //$NON-NLS-1$
+ addArgument(new Argument(Class.forName(getAttr("class"), true, //$NON-NLS-1$
Thread.currentThread().getContextClassLoader())), 0);
- methodValue = "get";
+ methodValue = "get"; //$NON-NLS-1$
} else {
- throw new Exception("method name is not generated: error in "
- + "getMethodName()");
+ throw new Exception(Messages.getString("beans.45")); //$NON-NLS-1$
}
methodName = methodValue;
}
@@ -669,50 +668,50 @@
// Check if the name of class is primitive
public static boolean isPrimitiveClassName(String className) {
- return className.equalsIgnoreCase("boolean")
- || className.equalsIgnoreCase("byte")
- || className.equalsIgnoreCase("char")
- || className.equalsIgnoreCase("short")
- || className.equalsIgnoreCase("int")
- || className.equalsIgnoreCase("long")
- || className.equalsIgnoreCase("float")
- || className.equalsIgnoreCase("double")
- || className.equalsIgnoreCase("string");
+ return className.equalsIgnoreCase("boolean") //$NON-NLS-1$
+ || className.equalsIgnoreCase("byte") //$NON-NLS-1$
+ || className.equalsIgnoreCase("char") //$NON-NLS-1$
+ || className.equalsIgnoreCase("short") //$NON-NLS-1$
+ || className.equalsIgnoreCase("int") //$NON-NLS-1$
+ || className.equalsIgnoreCase("long") //$NON-NLS-1$
+ || className.equalsIgnoreCase("float") //$NON-NLS-1$
+ || className.equalsIgnoreCase("double") //$NON-NLS-1$
+ || className.equalsIgnoreCase("string"); //$NON-NLS-1$
}
// Transforms a primitive class name
private String getPrimitiveClassName(String data) {
String shortClassName = null;
- if (data.equals("int")) {
- shortClassName = "Integer";
- } else if (data.equals("char")) {
- shortClassName = "Character";
+ if (data.equals("int")) { //$NON-NLS-1$
+ shortClassName = "Integer"; //$NON-NLS-1$
+ } else if (data.equals("char")) { //$NON-NLS-1$
+ shortClassName = "Character"; //$NON-NLS-1$
} else {
shortClassName = data.substring(0, 1).toUpperCase()
+ data.substring(1, data.length());
}
- return "java.lang." + shortClassName;
+ return "java.lang." + shortClassName; //$NON-NLS-1$
}
public static Class getPrimitiveClass(String className) {
Class result = null;
- if (className.equals("boolean")) {
+ if (className.equals("boolean")) { //$NON-NLS-1$
result = boolean.class;
- } else if (className.equals("byte")) {
+ } else if (className.equals("byte")) { //$NON-NLS-1$
result = byte.class;
- } else if (className.equals("char")) {
+ } else if (className.equals("char")) { //$NON-NLS-1$
result = char.class;
- } else if (className.equals("short")) {
+ } else if (className.equals("short")) { //$NON-NLS-1$
result = short.class;
- } else if (className.equals("int")) {
+ } else if (className.equals("int")) { //$NON-NLS-1$
result = int.class;
- } else if (className.equals("long")) {
+ } else if (className.equals("long")) { //$NON-NLS-1$
result = long.class;
- } else if (className.equals("float")) {
+ } else if (className.equals("float")) { //$NON-NLS-1$
result = float.class;
- } else if (className.equals("double")) {
+ } else if (className.equals("double")) { //$NON-NLS-1$
result = double.class;
- } else if (className.equals("string")) {
+ } else if (className.equals("string")) { //$NON-NLS-1$
result = String.class;
}
return result;
@@ -747,28 +746,28 @@
public static HashMap parseAttrs(String tagName, Attributes attrs) {
HashMap<String, String> result = new HashMap<String, String>();
- if (tagName.equals("object")) {
+ if (tagName.equals("object")) { //$NON-NLS-1$
for (int i = 0; i < objectAttrNames.length; ++i) {
String name = objectAttrNames[i];
String value = attrs.getValue(name);
if (value != null)
result.put(name, value);
}
- } else if (tagName.equals("void")) {
+ } else if (tagName.equals("void")) { //$NON-NLS-1$
for (int i = 0; i < voidAttrNames.length; ++i) {
String name = voidAttrNames[i];
String value = attrs.getValue(name);
if (value != null)
result.put(name, value);
}
- } else if (tagName.equals("array")) {
+ } else if (tagName.equals("array")) { //$NON-NLS-1$
for (int i = 0; i < arrayAttrNames.length; ++i) {
String name = arrayAttrNames[i];
String value = attrs.getValue(name);
if (value != null)
result.put(name, value);
}
- } else if (tagName.equals("java")) {
+ } else if (tagName.equals("java")) { //$NON-NLS-1$
for (int i = 0; i < javaAttrNames.length; ++i) {
String name = javaAttrNames[i];
String value = attrs.getValue(name);
@@ -785,7 +784,7 @@
}
public static void pr(int tabCount, String msg) {
- String result = "";
+ String result = ""; //$NON-NLS-1$
for (int i = 0; i < tabCount; ++i)
result += '\t';
result += msg;
@@ -797,7 +796,7 @@
}
public static void prn(int tabCount, String msg) {
- String result = "";
+ String result = ""; //$NON-NLS-1$
for (int i = 0; i < tabCount; ++i)
result += '\t';
result += msg;
@@ -805,13 +804,13 @@
}
public static void printAttrs(int tabCount, String tagName, Attributes attrs) {
- pr(tabCount, tabCount + ">in <" + tagName);
+ pr(tabCount, tabCount + ">in <" + tagName); //$NON-NLS-1$
for (int i = 0; i < attrs.getLength(); ++i) {
String attrName = attrs.getQName(i);
String attrValue = attrs.getValue(i);
- pr(" " + attrName + "=" + attrValue);
+ pr(" " + attrName + "=" + attrValue); //$NON-NLS-1$ //$NON-NLS-2$
}
- prn(">");
+ prn(">"); //$NON-NLS-1$
}
private static int initializeStatus(String tagName) {
@@ -833,13 +832,13 @@
// return result;
// }
- private static final String[] objectAttrNames = { "id", "idref", "class",
- "field", "method", "property", "index" };
+ private static final String[] objectAttrNames = { "id", "idref", "class", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "field", "method", "property", "index" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- private static final String[] voidAttrNames = { "id", "class", "method",
- "property", "index" };
+ private static final String[] voidAttrNames = { "id", "class", "method", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "property", "index" }; //$NON-NLS-1$ //$NON-NLS-2$
- private static final String[] arrayAttrNames = { "id", "class", "length" };
+ private static final String[] arrayAttrNames = { "id", "class", "length" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- private static final String[] javaAttrNames = { "version", "class" };
+ private static final String[] javaAttrNames = { "version", "class" }; //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java Fri Sep 1 03:08:27 2006
@@ -79,12 +79,12 @@
private static String createDefaultNameForPersistenceDelegateClass(
Class type) {
String typeName = type.getName();
- StringTokenizer st = new StringTokenizer(typeName, ".");
- String className = "";
+ StringTokenizer st = new StringTokenizer(typeName, "."); //$NON-NLS-1$
+ String className = ""; //$NON-NLS-1$
while (st.hasMoreElements()) {
String s = (String) st.nextElement();
- className += "".equals(className) ? s : "_" + s;
+ className += "".equals(className) ? s : "_" + s; //$NON-NLS-1$ //$NON-NLS-2$
}
- return "org.apache.harmony.beans." + className + "PersistenceDelegate";
+ return "org.apache.harmony.beans." + className + "PersistenceDelegate"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java Fri Sep 1 03:08:27 2006
@@ -24,6 +24,7 @@
import java.util.Stack;
import java.util.Vector;
+import org.apache.harmony.beans.internal.nls.Messages;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -67,7 +68,7 @@
public void startElement(String namespaceURI, String localeName,
String tagName, Attributes attrs) throws SAXException {
Command.printAttrs(tabCount, tagName, attrs);
- Command cmd = tagName.equals("java") ? new Command(decoder, tagName,
+ Command cmd = tagName.equals("java") ? new Command(decoder, tagName, //$NON-NLS-1$
Command.parseAttrs(tagName, attrs)) : new Command(tagName,
Command.parseAttrs(tagName, attrs));
stack.push(cmd);
@@ -81,8 +82,8 @@
String data = String.valueOf(text, start, length)
.replace('\n', ' ').replace('\t', ' ').trim();
if (data.length() > 0) {
- Command.prn(tabCount, tabCount + ">setting data=" + data
- + "<EOL>");
+ Command.prn(tabCount, tabCount + ">setting data=" + data //$NON-NLS-1$
+ + "<EOL>"); //$NON-NLS-1$
Command cmd = stack.peek();
cmd.setData(data);
}
@@ -107,8 +108,8 @@
}
// store reference to command
- if (cmd.hasAttr("id")) {
- references.put(cmd.getAttr("id"), cmd);
+ if (cmd.hasAttr("id")) { //$NON-NLS-1$
+ references.put(cmd.getAttr("id"), cmd); //$NON-NLS-1$
}
try {
@@ -121,7 +122,7 @@
tabCount = 0;
}
- Command.prn(tabCount, tabCount + ">...<" + tagName + "> end");
+ Command.prn(tabCount, tabCount + ">...<" + tagName + "> end"); //$NON-NLS-1$ //$NON-NLS-2$
}
// iterate over deferred commands and execute them again
@@ -131,7 +132,7 @@
try {
cmd.backtrack(references);
} catch (Exception e) {
- throw new SAXException("Exception in command execution");
+ throw new SAXException(Messages.getString("beans.0B")); //$NON-NLS-1$
}
// if(!backtracked)
// throw new SAXException("Command " + cmd.getTagName() +
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java Fri Sep 1 03:08:27 2006
@@ -56,7 +56,7 @@
}
public String[] getTags() {
- return new String[] {"true", "false"};
+ return new String[] {"true", "false"}; //$NON-NLS-1$ //$NON-NLS-2$
}
public void setValue(Object value) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java Fri Sep 1 03:08:27 2006
@@ -62,7 +62,7 @@
int red = color.getRed();
int green = color.getGreen();
int blue = color.getBlue();
- result = "new Color(" + red + "," + green + "," + blue + ")";
+ result = "new Color(" + red + "," + green + "," + blue + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
return result;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java Fri Sep 1 03:08:27 2006
@@ -62,7 +62,7 @@
String name = font.getName();
int style = font.getStyle();
int size = font.getSize();
- result = "new Font(" + name + "," + style + "," + size + ")";
+ result = "new Font(" + name + "," + style + "," + size + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
return result;
}
@@ -85,7 +85,7 @@
Font font = (Font) getValue();
if(font != null) {
gfx.setFont(font);
- gfx.drawBytes("Hello".getBytes(), box.x, box.y, box.x + box.width,
+ gfx.drawBytes("Hello".getBytes(), box.x, box.y, box.x + box.width, //$NON-NLS-1$
box.y + box.height);
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties Fri Sep 1 03:08:27 2006
@@ -14,3 +14,73 @@
#
# messages for EN locale
+beans.00=no getter for {0} property
+beans.01=no property for name {0} is found
+beans.02=in DefaultPersistenceDelegate.mutatesTo() {0} : {1}
+beans.03=Target Bean class is null
+beans.04=bad property name
+beans.05=Modifier for setter method should be public.
+beans.06=Number of parameters in setter method is not equal to 1.
+beans.07=Parameter type in setter method does not corresponds to predefined.
+beans.08=Number of parameters in getter method is not equal to 0.
+beans.09=Parameter type in getter method does not corresponds to predefined.
+beans.0A=Modifier for getter method should be public.
+beans.0B=Exception in command execution
+beans.0C=source is null
+beans.0D=Error in expression: {0}
+beans.0E=Changes are null
+beans.0F=The new BeanContext can not be set
+beans.10=no node is found for statement with target = {0}
+beans.11=no getter for property {0} found
+beans.12=cannot access property {0} getter
+beans.13=no setter for property {0} found
+beans.14=Exception while finding property descriptor
+beans.15=The listener is null
+beans.16=The provider is null
+beans.17=The child is null
+beans.18=The requestor is null
+beans.19=The service class is null
+beans.1A=The service selector is null
+beans.1B=The service is null
+beans.1C=The event is null
+beans.1D=bean is null
+beans.1E=Illegal class name: {0}
+beans.1F=Method not found: get{0}
+beans.20=Method not found: set{0}
+beans.21=Modifier for indexed getter method should be public.
+beans.22=Number of parameters in getter method is not equal to 1.
+beans.23=Parameter in indexed getter method is not of integer type.
+beans.24=Parameter type in indexed getter method does not correspond to predefined.
+beans.25=Modifier for indexed setter method should be public.
+beans.26=Number of parameters in indexed setter method is not equal to 2.
+beans.27=First parameter type in indexed setter method should be int.
+beans.28=Second parameter type in indexed setter method does not corresponds to predefined.
+beans.29=Membership listener is null
+beans.2A=Target child can not be null
+beans.2B=Resource name can not be null
+beans.2C=The child can not be null
+beans.2D=Invalid resource
+beans.2E=PropertyVetoException was thrown while removing a child: {0}; Original error message:{1}
+beans.2F=Target child is null
+beans.30=PropertyVetoException was thrown while adding a child: {0}; Original error message:{1}
+beans.31=No method "{0}" for {1} found.
+beans.32=Cannot acquire event type from {0} listener.
+beans.33={0} does not return <void>
+beans.34={0} should have a single input parameter
+beans.35=Single parameter does not match to {0} class
+beans.36=No input params are allowed for getListenerMethod
+beans.37=Return type of getListenerMethod is not an array of listeners
+beans.38=Add and remove methods are not available
+beans.39=Cannot generate event set descriptor for name {0}.
+beans.3A=Event type with name {0} is not found.
+beans.3B=skipping expression {0}...
+beans.3C=Unknown method name for array
+beans.3D=First parameter in array getter(setter) is not of Integer type
+beans.3E=Illegal number of arguments in array getter
+beans.3F=Illegal number of arguments in array setter
+beans.40=No constructor for class {0} found
+beans.41=No method with name {0} is found
+beans.42=target is not generated: classname {0} is not found
+beans.43=Cannot convert {0} to char
+beans.44=for property {0} no getter(setter) is found
+beans.45=method name is not generated: error in getMethodName()
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
boolean value = ((Boolean) oldInstance).booleanValue();
- return new Expression(oldInstance, Boolean.class, "new",
+ return new Expression(oldInstance, Boolean.class, "new", //$NON-NLS-1$
new Object[] { new Boolean(value) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Byte value = (Byte) oldInstance;
- return new Expression(oldInstance, Byte.class, "new",
+ return new Expression(oldInstance, Byte.class, "new", //$NON-NLS-1$
new Object[] { new Byte(value.byteValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Character value = (Character) oldInstance;
- return new Expression(oldInstance, Character.class, "new",
+ return new Expression(oldInstance, Character.class, "new", //$NON-NLS-1$
new Object[] { new Character(value.charValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -37,7 +37,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Class value = (Class) oldInstance;
Field fld = null;
- final String TYPE = "TYPE";
+ final String TYPE = "TYPE"; //$NON-NLS-1$
Expression result;
try {
@@ -64,10 +64,10 @@
}
if (fld != null) {
// we have primitive type
- result = new Expression(oldInstance, fld, "get",
+ result = new Expression(oldInstance, fld, "get", //$NON-NLS-1$
new Object[] {null});
} else {
- result = new Expression(oldInstance, Class.class, "forName",
+ result = new Expression(oldInstance, Class.class, "forName", //$NON-NLS-1$
new Object[] { new String(value.getName()) });
}
return result;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Double value = (Double) oldInstance;
- return new Expression(oldInstance, Double.class, "new",
+ return new Expression(oldInstance, Double.class, "new", //$NON-NLS-1$
new Object[] { new Double(value.doubleValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Float value = (Float) oldInstance;
- return new Expression(oldInstance, Float.class, "new",
+ return new Expression(oldInstance, Float.class, "new", //$NON-NLS-1$
new Object[] { new Float(value.floatValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Integer value = (Integer) oldInstance;
- return new Expression(oldInstance, Integer.class, "new",
+ return new Expression(oldInstance, Integer.class, "new", //$NON-NLS-1$
new Object[] { new Integer(value.intValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Long value = (Long) oldInstance;
- return new Expression(oldInstance, Long.class, "new",
+ return new Expression(oldInstance, Long.class, "new", //$NON-NLS-1$
new Object[] { new Long(value.longValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
Short value = (Short) oldInstance;
- return new Expression(oldInstance, Short.class, "new",
+ return new Expression(oldInstance, Short.class, "new", //$NON-NLS-1$
new Object[] { new Short(value.shortValue()) });
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -34,7 +34,7 @@
protected Expression instantiate(Object oldInstance, Encoder out) {
String value = (String) oldInstance;
- return new Expression(oldInstance, String.class, "new",
+ return new Expression(oldInstance, String.class, "new", //$NON-NLS-1$
new Object[] {new String(value)});
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java?rev=439260&r1=439259&r2=439260&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java Fri Sep 1 03:08:27 2006
@@ -33,7 +33,7 @@
Field oldField = (Field) oldInstance;
Class declClass = oldField.getDeclaringClass();
- return new Expression(oldField, declClass, "getDeclaredField",
+ return new Expression(oldField, declClass, "getDeclaredField", //$NON-NLS-1$
new Object[] { oldField.getName() });
}
|