Browse Source

More isEmpty()

master
Gintas Grigelionis 7 years ago
parent
commit
c3b91f90f0
14 changed files with 19 additions and 19 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/AntClassLoader.java
  2. +1
    -1
      src/main/org/apache/tools/ant/ComponentHelper.java
  3. +1
    -1
      src/main/org/apache/tools/ant/IntrospectionHelper.java
  4. +1
    -1
      src/main/org/apache/tools/ant/Main.java
  5. +2
    -2
      src/main/org/apache/tools/ant/Target.java
  6. +1
    -1
      src/main/org/apache/tools/ant/helper/ProjectHelper2.java
  7. +1
    -1
      src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java
  8. +2
    -2
      src/main/org/apache/tools/ant/types/ArchiveFileSet.java
  9. +1
    -1
      src/main/org/apache/tools/ant/types/ArchiveScanner.java
  10. +1
    -1
      src/main/org/apache/tools/ant/types/Permissions.java
  11. +1
    -1
      src/main/org/apache/tools/ant/types/resources/URLResource.java
  12. +2
    -2
      src/main/org/apache/tools/ant/util/DOMElementWriter.java
  13. +3
    -3
      src/main/org/apache/tools/ant/util/XMLFragment.java
  14. +1
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java

+ 1
- 1
src/main/org/apache/tools/ant/AntClassLoader.java View File

@@ -510,7 +510,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
pathMap.put(absPathPlusTimeAndLength, classpath);
}

if (!"".equals(classpath)) {
if (!classpath.isEmpty()) {
final URL baseURL = FILE_UTILS.getFileURL(pathComponent);
final StringTokenizer st = new StringTokenizer(classpath);
while (st.hasMoreTokens()) {


+ 1
- 1
src/main/org/apache/tools/ant/ComponentHelper.java View File

@@ -836,7 +836,7 @@ public class ComponentHelper {
*/
private synchronized void checkNamespace(String componentName) {
String uri = ProjectHelper.extractUriFromComponentName(componentName);
if ("".equals(uri)) {
if (uri.isEmpty()) {
uri = ProjectHelper.ANT_CORE_URI;
}
if (!uri.startsWith(ProjectHelper.ANTLIB_URI)) {


+ 1
- 1
src/main/org/apache/tools/ant/IntrospectionHelper.java View File

@@ -380,7 +380,7 @@ public final class IntrospectionHelper {
final String uriPlusPrefix = ProjectHelper.extractUriFromComponentName(attributeName);
final String uri = ProjectHelper.extractUriFromComponentName(uriPlusPrefix);
final String localName = ProjectHelper.extractNameFromComponentName(attributeName);
final String qName = "".equals(uri) ? localName : uri + ":" + localName;
final String qName = uri.isEmpty() ? localName : uri + ":" + localName;
dc.setDynamicAttribute(uri, localName, qName, value.toString());
return;
}


+ 1
- 1
src/main/org/apache/tools/ant/Main.java View File

@@ -1181,7 +1181,7 @@ public class Main implements AntMain {

for (final Target currentTarget : ptargets.values()) {
final String targetName = currentTarget.getName();
if ("".equals(targetName)) {
if (targetName.isEmpty()) {
continue;
}
final String targetDescription = currentTarget.getDescription();


+ 2
- 2
src/main/org/apache/tools/ant/Target.java View File

@@ -301,7 +301,7 @@ public class Target implements TaskContainer {
* @since 1.6.2
*/
public String getIf() {
return "".equals(ifString) ? null : ifString;
return ifString.isEmpty() ? null : ifString;
}

/**
@@ -354,7 +354,7 @@ public class Target implements TaskContainer {
* @since 1.6.2
*/
public String getUnless() {
return "".equals(unlessString) ? null : unlessString;
return unlessString.isEmpty() ? null : unlessString;
}

/**


+ 1
- 1
src/main/org/apache/tools/ant/helper/ProjectHelper2.java View File

@@ -1060,7 +1060,7 @@ public class ProjectHelper2 extends ProjectHelper {
}

String projectName = context.getCurrentProjectName();
if ("".equals(projectName)) {
if (projectName != null && projectName.isEmpty()) {
projectName = null;
}



+ 1
- 1
src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java View File

@@ -67,6 +67,6 @@ public class MultipleChoiceInputRequest extends InputRequest {
@Override
public boolean isInputValid() {
return choices.contains(getInput())
|| ("".equals(getInput()) && getDefaultValue() != null);
|| (getInput().isEmpty() && getDefaultValue() != null);
}
}

+ 2
- 2
src/main/org/apache/tools/ant/types/ArchiveFileSet.java View File

@@ -223,7 +223,7 @@ public abstract class ArchiveFileSet extends FileSet {
*/
public void setPrefix(String prefix) {
checkArchiveAttributesAllowed();
if (!"".equals(prefix) && !"".equals(fullpath)) {
if (!prefix.isEmpty() && !fullpath.isEmpty()) {
throw new BuildException(ERROR_PATH_AND_PREFIX);
}
this.prefix = prefix;
@@ -250,7 +250,7 @@ public abstract class ArchiveFileSet extends FileSet {
*/
public void setFullpath(String fullpath) {
checkArchiveAttributesAllowed();
if (!"".equals(prefix) && !"".equals(fullpath)) {
if (!prefix.isEmpty() && !fullpath.isEmpty()) {
throw new BuildException(ERROR_PATH_AND_PREFIX);
}
this.fullpath = fullpath;


+ 1
- 1
src/main/org/apache/tools/ant/types/ArchiveScanner.java View File

@@ -277,7 +277,7 @@ public abstract class ArchiveScanner extends DirectoryScanner {
if (src == null) {
return super.getResource(name);
}
if ("".equals(name)) {
if (name.isEmpty()) {
// special case in ZIPs, we do not want this thing included
return new Resource("", true, Long.MAX_VALUE, true);
}


+ 1
- 1
src/main/org/apache/tools/ant/types/Permissions.java View File

@@ -333,7 +333,7 @@ public class Permissions {
final StringTokenizer tk = new StringTokenizer(actions, ",");
while (tk.hasMoreTokens()) {
final String item = tk.nextToken().trim();
if (!"".equals(item)) {
if (!item.isEmpty()) {
result.add(item);
}
}


+ 1
- 1
src/main/org/apache/tools/ant/types/resources/URLResource.java View File

@@ -183,7 +183,7 @@ public class URLResource extends Resource implements URLProvider {
return getCheckedRef().getName();
}
String name = getURL().getFile();
return "".equals(name) ? name : name.substring(1);
return name.isEmpty() ? name : name.substring(1);
}

/**


+ 2
- 2
src/main/org/apache/tools/ant/util/DOMElementWriter.java View File

@@ -315,7 +315,7 @@ public class DOMElementWriter {
nsPrefixMap.put(uri, prefix);
addNSDefinition(element, uri);
}
if (!"".equals(prefix)) {
if (!prefix.isEmpty()) {
out.write(prefix);
out.write(":");
}
@@ -350,7 +350,7 @@ public class DOMElementWriter {
for (String uri : uris) {
String prefix = nsPrefixMap.get(uri);
out.write(" xmlns");
if (!"".equals(prefix)) {
if (!prefix.isEmpty()) {
out.write(":");
out.write(prefix);
}


+ 3
- 3
src/main/org/apache/tools/ant/util/XMLFragment.java View File

@@ -77,7 +77,7 @@ public class XMLFragment extends ProjectComponent implements DynamicElementNS {
@Override
public Object createDynamicElement(String uri, String name, String qName) {
Element e;
if ("".equals(uri)) {
if (uri.isEmpty()) {
e = doc.createElement(name);
} else {
e = doc.createElementNS(uri, qName);
@@ -128,7 +128,7 @@ public class XMLFragment extends ProjectComponent implements DynamicElementNS {
@Override
public void setDynamicAttribute(
String uri, String name, String qName, String value) {
if ("".equals(uri)) {
if (uri.isEmpty()) {
e.setAttribute(name, value);
} else {
e.setAttributeNS(uri, qName, value);
@@ -145,7 +145,7 @@ public class XMLFragment extends ProjectComponent implements DynamicElementNS {
@Override
public Object createDynamicElement(String uri, String name, String qName) {
Element e2 = null;
if ("".equals(uri)) {
if (uri.isEmpty()) {
e2 = doc.createElement(name);
} else {
e2 = doc.createElementNS(uri, qName);


+ 1
- 1
src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java View File

@@ -488,7 +488,7 @@ public class DefaultCompilerAdapterTest {
sth.setJavac(javac);
Commandline cmd = new Commandline();
sth.setupModernJavacCommandlineSwitches(cmd);
if ("".equals(expectedLog)) {
if (expectedLog.isEmpty()) {
assertEquals("", javac.getLog());
} else {
String l = javac.getLog();


Loading…
Cancel
Save