litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changing uses of String.isEmpty() so we can compile with Java 5

Browse source
This commit is contained in:
bjl23 2010-03-09 19:47:17 +00:00
parent edd1ea0a3a
commit 89919ccb2f
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/BasicValidation.java
View file

@ -207,7 +207,7 @@ public class BasicValidation {
} }
private static boolean isEmpty(String value) { private static boolean isEmpty(String value) {
return (value == null || value.trim().isEmpty()); return (value == null || value.trim().length() == 0);
} }

8
webapp/test/stubs/javax/naming/ContextStub.java
View file

@ -63,7 +63,7 @@ public class ContextStub implements Context {
if (name == null) { if (name == null) {
throw new NullPointerException("ContextStub: name may not be null."); throw new NullPointerException("ContextStub: name may not be null.");
} }
if (name.isEmpty()) { if (isEmpty(name)) {
throw new NamingException("ContextStub: name may not be empty."); throw new NamingException("ContextStub: name may not be empty.");
} }
parent.rebind(contextPath + "/" + name, obj); parent.rebind(contextPath + "/" + name, obj);
@ -76,7 +76,7 @@ public class ContextStub implements Context {
if (name == null) { if (name == null) {
throw new NamingException("ContextStub: name may not be null."); throw new NamingException("ContextStub: name may not be null.");
} }
if (name.isEmpty()) { if (isEmpty(name)) {
return this; return this;
} }
return parent.lookup(contextPath + "/" + name); return parent.lookup(contextPath + "/" + name);
@ -212,4 +212,8 @@ public class ContextStub implements Context {
throw new RuntimeException("ContextStub.unbind() not implemented."); throw new RuntimeException("ContextStub.unbind() not implemented.");
} }
private boolean isEmpty(String string) {
return (string == null || string.trim().length() == 0);
}
} }

10
webapp/test/stubs/javax/naming/InitialContextStub.java
View file

@ -80,13 +80,17 @@ public class InitialContextStub extends InitialContext {
return ContextStub.getInstance("", this); return ContextStub.getInstance("", this);
} }
private boolean isEmpty(String string) {
return (string == null || string.trim().length() == 0);
}
@Override @Override
public void bind(String name, Object obj) throws NamingException { public void bind(String name, Object obj) throws NamingException {
if (name == null) { if (name == null) {
throw new NullPointerException( throw new NullPointerException(
"InitialContextStub: name may not be null."); "InitialContextStub: name may not be null.");
} }
if (name.isEmpty()) { if (isEmpty(name)) {
throw new NamingException( throw new NamingException(
"InitialContextStub: name may not be empty."); "InitialContextStub: name may not be empty.");
} }
@ -104,7 +108,7 @@ public class InitialContextStub extends InitialContext {
throw new NullPointerException( throw new NullPointerException(
"InitialContextStub: name may not be null."); "InitialContextStub: name may not be null.");
} }
if (name.isEmpty()) { if (isEmpty(name)) {
throw new NamingException( throw new NamingException(
"InitialContextStub: name may not be empty."); "InitialContextStub: name may not be empty.");
} }
@ -118,7 +122,7 @@ public class InitialContextStub extends InitialContext {
throw new NullPointerException( throw new NullPointerException(
"InitialContextStub: name may not be null"); "InitialContextStub: name may not be null");
} }
if (name.isEmpty()) { if (isEmpty(name)) {
return this; return this;
} }
if (bindings.containsKey(name)) { if (bindings.containsKey(name)) {