Author: skitching
Date: Thu Nov 9 02:18:34 2006
New Revision: 472840
URL: http://svn.apache.org/viewvc?view=rev&rev=472840
Log:
Remove unused variables (fix Eclipse warnings)
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertiesRuleTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertyRuleTestCase.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
Thu Nov 9 02:18:34 2006
@@ -319,6 +319,7 @@
SimpleTestBean bean = (SimpleTestBean)
digester.parse(xmlTestReader());
fail("Should have thrown NoSuchMethodException");
+ assertNotNull(bean); // just to avoid compiler warning on unused
variable
} catch (Exception e) {
if (e instanceof InvocationTargetException) {
Throwable t =
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java
Thu Nov 9 02:18:34 2006
@@ -120,11 +120,10 @@
digester.addCallMethod("employee", "toString", 0, new String[] {});
digester.addCallMethod("employee", "toString");
- // Parse our test input
- Object root1 = null;
- // an exception will be thrown if the method can't be found
- root1 = digester.parse(getInputStream("Test5.xml"));
-
+ // Parse our test input.
+ // An exception will be thrown if the method can't be found
+ Object root1 = digester.parse(getInputStream("Test5.xml"));
+ assertNotNull(root1);
}
@@ -322,7 +321,7 @@
try {
// an exception will be thrown if the method can't be found
root1 = digester.parse(getInputStream("Test8.xml"));
-
+ assertNotNull(root1);
} catch (Throwable t) {
// this means that the method can't be found and so the test fails
fail("Digester threw Exception: " + t);
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java
Thu Nov 9 02:18:34 2006
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.EmptyStackException;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import junit.framework.Test;
@@ -202,8 +201,6 @@
* Basic test for rule creation and matching.
*/
public void testRules() {
-
- List list = null;
assertEquals("Initial rules list is empty",
0, digester.getRules().match(null, "a").size());
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java
Thu Nov 9 02:18:34 2006
@@ -312,7 +312,6 @@
List list = null;
- Iterator it = null;
list = digester.getRules().match(null, "a");
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
Thu Nov 9 02:18:34 2006
@@ -129,6 +129,7 @@
try {
Rule rule = new NodeCreateRule(Node.ATTRIBUTE_NODE);
fail("IllegalArgumentException expected for type ATTRIBUTE_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
@@ -136,18 +137,21 @@
Rule rule = new NodeCreateRule(Node.CDATA_SECTION_NODE);
fail("IllegalArgumentException expected for type " +
"CDATA_SECTION_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
try {
Rule rule = new NodeCreateRule(Node.COMMENT_NODE);
fail("IllegalArgumentException expected for type COMMENT_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
try {
Rule rule = new NodeCreateRule(Node.DOCUMENT_NODE);
fail("IllegalArgumentException expected for type DOCUMENT_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
@@ -155,12 +159,14 @@
Rule rule = new NodeCreateRule(Node.DOCUMENT_TYPE_NODE);
fail("IllegalArgumentException expected for type " +
"DOCUMENT_TYPE_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
try {
Rule rule = new NodeCreateRule(Node.ENTITY_NODE);
fail("IllegalArgumentException expected for type ENTITY_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
@@ -168,12 +174,14 @@
Rule rule = new NodeCreateRule(Node.ENTITY_REFERENCE_NODE);
fail("IllegalArgumentException expected for type " +
"ENTITY_REFERENCE_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
try {
Rule rule = new NodeCreateRule(Node.NOTATION_NODE);
fail("IllegalArgumentException expected for type NOTATION_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
@@ -181,12 +189,14 @@
Rule rule = new NodeCreateRule(Node.PROCESSING_INSTRUCTION_NODE);
fail("IllegalArgumentException expected for type " +
"PROCESSING_INSTRUCTION_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
try {
Rule rule = new NodeCreateRule(Node.TEXT_NODE);
fail("IllegalArgumentException expected for type TEXT_NODE");
+ assertNotNull(rule); // just to prevent compiler warning on unused
var
} catch (IllegalArgumentException iae) {
// expected
}
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java
Thu Nov 9 02:18:34 2006
@@ -119,7 +119,6 @@
digester.getRules().clear();
// perform tests
- List list = null;
assertEquals("Initial rules list is empty",
0, digester.getRules().match("a").size());
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java
Thu Nov 9 02:18:34 2006
@@ -175,6 +175,7 @@
// we should never get here...
fail("No exception thrown by parse when unknown child element
found.");
+ assertNotNull(bean); // just to prevent compiler warning on unused
var
} catch(org.xml.sax.SAXParseException e) {
String msg = e.getMessage();
if (msg.indexOf("badprop") >= 0) {
@@ -448,6 +449,7 @@
try {
SimpleTestBean bean = (SimpleTestBean) digester.parse(reader);
fail("Expected to generate an exception.");
+ assertNotNull(bean); // just to prevent compiler warning on unused
var
} catch(SAXException e) {
Exception nested = e.getException();
if ((nested==null) || !(nested instanceof NoSuchMethodException)) {
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertiesRuleTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertiesRuleTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertiesRuleTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertiesRuleTestCase.java
Thu Nov 9 02:18:34 2006
@@ -189,6 +189,7 @@
SimpleTestBean bean =
(SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_2));
fail("Should have thrown NoSuchMethodException");
+ assertNotNull(bean); // just to prevent compiler warning on unused
var
} catch (Exception e) {
if (e instanceof NoSuchMethodException) {
// Expected;
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertyRuleTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertyRuleTestCase.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertyRuleTestCase.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/SetPropertyRuleTestCase.java
Thu Nov 9 02:18:34 2006
@@ -162,6 +162,7 @@
SimpleTestBean bean =
(SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_2));
fail("Should have thrown NoSuchMethodException");
+ assertNotNull(bean); // just to prevent compiler warning on unused
var
} catch (Exception e) {
if (e instanceof NoSuchMethodException) {
; // Expected result
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/plugins/TestConfigurablePluginAttributes.java
Thu Nov 9 02:18:34 2006
@@ -85,8 +85,6 @@
throw e;
}
- Object child;
-
List widgets = root.getWidgets();
assertTrue(widgets != null);
assertEquals(4, widgets.size());
@@ -144,8 +142,6 @@
throw e;
}
- Object child;
-
List widgets = root.getWidgets();
assertTrue(widgets != null);
assertEquals(4, widgets.size());
@@ -204,8 +200,6 @@
throw e;
}
- Object child;
-
List widgets = root.getWidgets();
assertTrue(widgets != null);
assertEquals(4, widgets.size());
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
Thu Nov 9 02:18:34 2006
@@ -130,6 +130,7 @@
URL rules =
ClassLoader.getSystemResource("org/apache/commons/digester/xmlrules/testCircularRules.xml");
try {
Digester digester = DigesterLoader.createDigester(rules);
+ assertNotNull(digester); // just to prevent compiler warning on
unused var
} catch (Exception ex) {
return;
}
Modified:
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java?view=diff&rev=472840&r1=472839&r2=472840
==============================================================================
---
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java
(original)
+++
jakarta/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java
Thu Nov 9 02:18:34 2006
@@ -46,8 +46,6 @@
public TestObject() {
}
- private static int idx = 0;
-
public String toString() {
String str = value;
for (Iterator i = children.iterator(); i.hasNext();) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
