Cleaned up some indentation and a compiler warning

neildunn · neildunn · commit c97fdf236366 · 2007-11-17T12:48:34.000Z
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/xml/HasXPathTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/xml/HasXPathTest.java
@@ -61,7 +61,7 @@ public String getPrefix(String namespaceURI) {
 			    return ("http://cheese.com".equals(namespaceURI) ? "cheese" : null);
 			}
 
-			public Iterator getPrefixes(String namespaceURI) {
+			public Iterator<String> getPrefixes(String namespaceURI) {
 			    HashSet<String> prefixes = new HashSet<String>();
 				String prefix = getPrefix(namespaceURI);
 				if (prefix != null)	{
@@ -71,8 +71,8 @@ public Iterator getPrefixes(String namespaceURI) {
 			}
 		};
 
-        assertThat(xml, hasXPath("//cheese:foreignSomething", ns));
-		assertThat(xml, hasXPath("//cheese:foreignSomething/@milk", ns, equalTo("camel")));
+		assertThat(xml, hasXPath("//cheese:foreignSomething", ns));
+        assertThat(xml, hasXPath("//cheese:foreignSomething/@milk", ns, equalTo("camel")));
         assertThat(xml, hasXPath("//cheese:foreignSomething/text()", ns, equalTo("Caravane")));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public String getPrefix(String namespaceURI) {`
`61`	`61`	`return ("http://cheese.com".equals(namespaceURI) ? "cheese" : null);`
`62`	`62`	`}`
`63`	`63`
`64`		`- public Iterator getPrefixes(String namespaceURI) {`
	`64`	`+ public Iterator<String> getPrefixes(String namespaceURI) {`
`65`	`65`	`HashSet<String> prefixes = new HashSet<String>();`
`66`	`66`	`String prefix = getPrefix(namespaceURI);`
`67`	`67`	`if (prefix != null) {`
`@@ -71,8 +71,8 @@ public Iterator getPrefixes(String namespaceURI) {`
`71`	`71`	`}`
`72`	`72`	`};`
`73`	`73`
`74`		`- assertThat(xml, hasXPath("//cheese:foreignSomething", ns));`
`75`		`- assertThat(xml, hasXPath("//cheese:foreignSomething/@milk", ns, equalTo("camel")));`
	`74`	`+ assertThat(xml, hasXPath("//cheese:foreignSomething", ns));`
	`75`	`+ assertThat(xml, hasXPath("//cheese:foreignSomething/@milk", ns, equalTo("camel")));`
`76`	`76`	`assertThat(xml, hasXPath("//cheese:foreignSomething/text()", ns, equalTo("Caravane")));`
`77`	`77`	`}`
`78`	`78`