Browse Source

make XMLCatalog less verbose

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273600 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
d4b5f4f17a
2 changed files with 12 additions and 12 deletions
  1. +10
    -10
      src/main/org/apache/tools/ant/types/XMLCatalog.java
  2. +2
    -2
      src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java

+ 10
- 10
src/main/org/apache/tools/ant/types/XMLCatalog.java View File

@@ -308,14 +308,14 @@ public class XMLCatalog extends DataType
* if this is a reference and no nested elements are allowed.
*/
public Path createCatalogPath() {
if (isReference()) {
throw noChildrenAllowed();
}
if (this.catalogPath == null) {
this.catalogPath = new Path(getProject());
}
setChecked( false );
return this.catalogPath.createPath();
if (isReference()) {
throw noChildrenAllowed();
}
if (this.catalogPath == null) {
this.catalogPath = new Path(getProject());
}
setChecked( false );
return this.catalogPath.createPath();
}

/**
@@ -837,7 +837,7 @@ public class XMLCatalog extends DataType

public InternalResolver() {
log("Apache resolver library not found, internal resolver will be used",
Project.MSG_INFO);
Project.MSG_VERBOSE);
}

public InputSource resolveEntity(String publicId,
@@ -979,7 +979,7 @@ public class XMLCatalog extends DataType
}

log("Apache resolver library found, xml-commons resolver will be used",
Project.MSG_INFO);
Project.MSG_VERBOSE);
}

public InputSource resolveEntity(String publicId,


+ 2
- 2
src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java View File

@@ -129,7 +129,7 @@ public class XmlValidateTest extends BuildFileTest {
* entity
*/
public void testXmlCatalogFiles() {
executeTarget("xmlcatalogfiles");
executeTarget("xmlcatalogfiles");
}

/**
@@ -140,7 +140,7 @@ public class XmlValidateTest extends BuildFileTest {
* dtd with the same entity
*/
public void testXmlCatalogPath() {
executeTarget("xmlcatalogpath");
executeTarget("xmlcatalogpath");
}

/**


Loading…
Cancel
Save