This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new 8a4731f9 Format: "catch(" -> "catch ("
8a4731f9 is described below
commit 8a4731f95b9b17dcf227871a9216041fb889de02
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Apr 18 10:45:00 2023 -0400
Format: "catch(" -> "catch ("
---
core/src/main/java/org/apache/commons/jelly/Jelly.java | 7 +++++--
.../main/java/org/apache/commons/jelly/tags/core/ArgTag.java | 2 +-
.../org/apache/commons/jelly/tags/core/GetStaticTag.java | 2 +-
core/src/test/java/org/apache/commons/jelly/TJEcho.java | 2 +-
.../java/org/apache/commons/jelly/core/TestGetStaticTag.java | 2 +-
.../java/org/apache/commons/jelly/core/TestSwitchTag.java | 12 ++++++------
.../apache/commons/jelly/core/TestUnexpectedTagCaching.java | 2 +-
.../java/org/apache/commons/jelly/core/TestUnknownTags.java | 2 +-
.../org/apache/commons/jelly/expression/TestExpressions.java | 4 ++--
.../main/java/org/apache/commons/jelly/tags/ant/AntTag.java | 2 +-
.../java/org/apache/commons/jelly/task/AntJellyContext.java | 12 ++++++++----
.../org/apache/commons/jelly/avalon/JellyServiceImpl.java | 6 +++---
.../java/org/apache/commons/jelly/demos/HomepageBuilder.java | 2 +-
.../org/apache/commons/jelly/tags/threads/JellyThread.java | 4 ++--
14 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/Jelly.java
b/core/src/main/java/org/apache/commons/jelly/Jelly.java
index ef33a2ee..4ad4859b 100644
--- a/core/src/main/java/org/apache/commons/jelly/Jelly.java
+++ b/core/src/main/java/org/apache/commons/jelly/Jelly.java
@@ -121,9 +121,12 @@ public class Jelly {
w.write((char) r);
}
return w.toString();
- } catch(Exception ex) {
+ } catch (Exception ex) {
ex.printStackTrace();
- try { in.close(); } catch(Exception e) {}
+ try {
+ in.close();
+ } catch (Exception e) {
+ }
throw new IllegalStateException("Resource \"" + name + "\" not
found.");
}
}
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
index 75843a70..1326a0bd 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
@@ -170,7 +170,7 @@ public class ArgTag extends BaseClassLoaderTag {
} else {
try {
return converter.convert(klass,value);
- } catch(ConversionException e) {
+ } catch (ConversionException e) {
throw new JellyTagException("Can't convert " + value + "
to " + klass + " (" + e.toString() + ")",e);
}
}
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
index 8ab48a5f..3cee0e75 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
@@ -110,7 +110,7 @@ public class GetStaticTag extends TagSupport {
context.setVariable(var, result);
- } catch(Throwable t) {
+ } catch (Throwable t) {
throw
new JellyTagException("Could not access " + className + "." +
var + ". Original exception message: " +
diff --git a/core/src/test/java/org/apache/commons/jelly/TJEcho.java
b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
index 29fb4882..85122e0d 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJEcho.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
@@ -36,7 +36,7 @@ public class TJEcho extends TagSupport {
String str = "id=" + id + "; attr=" + attr + "; text=" + text +
"\n";
try {
output.characters(str.toCharArray(), 0, str.length());
- }catch(SAXException e) {
+ }catch (SAXException e) {
throw new JellyTagException();
}
}
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
index dec79e3d..641027b6 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
@@ -73,7 +73,7 @@ public class TestGetStaticTag extends BaseJellyTest {
try {
script.run( getJellyContext(), getXMLOutput() );
- } catch(JellyTagException jte) {
+ } catch (JellyTagException jte) {
return;
}
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
index 9dcae96e..9c42d7dc 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
@@ -119,7 +119,7 @@ public class TestSwitchTag extends BaseJellyTest {
try {
script.run(getJellyContext(),getXMLOutput());
fail("Expected MissingAttributeException");
- } catch(MissingAttributeException e) {
+ } catch (MissingAttributeException e) {
// expected
}
}
@@ -131,7 +131,7 @@ public class TestSwitchTag extends BaseJellyTest {
try {
script.run(getJellyContext(),getXMLOutput());
fail("Expected JellyException");
- } catch(JellyException e) {
+ } catch (JellyException e) {
// expected
}
}
@@ -143,7 +143,7 @@ public class TestSwitchTag extends BaseJellyTest {
try {
script.run(getJellyContext(),getXMLOutput());
fail("Expected JellyException");
- } catch(JellyException e) {
+ } catch (JellyException e) {
// expected
}
}
@@ -155,7 +155,7 @@ public class TestSwitchTag extends BaseJellyTest {
try {
script.run(getJellyContext(),getXMLOutput());
fail("Expected MissingAttributeException");
- } catch(MissingAttributeException e) {
+ } catch (MissingAttributeException e) {
// expected
}
}
@@ -167,7 +167,7 @@ public class TestSwitchTag extends BaseJellyTest {
try {
script.run(getJellyContext(),getXMLOutput());
fail("Expected JellyException");
- } catch(JellyException e) {
+ } catch (JellyException e) {
// expected
}
}
@@ -179,7 +179,7 @@ public class TestSwitchTag extends BaseJellyTest {
try {
script.run(getJellyContext(),getXMLOutput());
fail("Expected JellyException");
- } catch(JellyException e) {
+ } catch (JellyException e) {
// expected
}
}
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
b/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
index 2434c0bb..532fc38a 100644
---
a/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
+++
b/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
@@ -102,7 +102,7 @@ public class TestUnexpectedTagCaching extends TestCase
{
output.write( getStrings().toString() );
}
- catch( SAXException e )
+ catch ( SAXException e )
{
throw new JellyTagException( "Unable to write message", e );
}
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
b/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
index 1e511584..299f8d53 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
@@ -51,7 +51,7 @@ public class TestUnknownTags extends BaseJellyTest {
Script script = getJelly().compileScript();
script.run(getJellyContext(), getXMLOutput());
System.out.println(getStringOutput());
- }catch(JellyException e) {
+ }catch (JellyException e) {
if (e.getCause() instanceof SAXParseException) {
Throwable cause = e.getCause();
if (cause.getMessage().indexOf("Unrecognized
tag called tag-that-does-not-exist in TagLibrary jelly:test") > -1)
diff --git
a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
index e9c59b39..c97c2dd7 100644
---
a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
+++
b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
@@ -72,14 +72,14 @@ public class TestExpressions extends TestCase {
try {
assertExpression("${ some junk !< 4}", Boolean.TRUE);
assertTrue("An illegal expression was allowed", false);
- }catch(JellyException e) {
+ }catch (JellyException e) {
// Nothing, the test passed
}
context.setVariable("test", new TestHelper());
try {
assertExpression("${test.throwAnException()}", Boolean.TRUE);
assertTrue("An exception was suppressed while processing the JEXL
script", false);
- }catch(IllegalStateException e) {
+ }catch (IllegalStateException e) {
if (!(e.getCause() instanceof TestException))
throw e;
// Nothing, the test passed
diff --git
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
index f776d553..637f1470 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
@@ -565,7 +565,7 @@ public class AntTag extends MapTagSupport implements
TaskSource {
String r = null;
try {
r = o.toString();
- } catch(Exception ex) {}
+ } catch (Exception ex) {}
if(r == null)
r = "(object of class " + o.getClass() + ")";
return r;
diff --git
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
index 87ab10ef..25d12d3f 100644
---
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
+++
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
@@ -52,11 +52,15 @@ public class AntJellyContext extends JellyContext {
answer = project.getProperty(name);
}
- if ( log.isDebugEnabled() ) {
+ if (log.isDebugEnabled()) {
String answerString = null;
- try { answerString = answer.toString(); } catch(Exception ex) {}
- if(answerString==null && answer!=null) answerString = " of class "
+ answer.getClass();
- log.debug( "Looking up variable: " + name + " answer: " +
answerString );
+ try {
+ answerString = answer.toString();
+ } catch (Exception ex) {
+ }
+ if (answerString == null && answer != null)
+ answerString = " of class " + answer.getClass();
+ log.debug("Looking up variable: " + name + " answer: " +
answerString);
}
return answer;
diff --git
a/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
b/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
index 8d05ece2..ccf959eb 100644
---
a/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
+++
b/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
@@ -98,7 +98,7 @@ public class JellyServiceImpl implements JellyService,
Configurable {
try {
actualUrl = new URL( url );
}
- catch( MalformedURLException x ) {
+ catch ( MalformedURLException x ) {
throw new JellyException( "Could not find script at URL [" + url +
"]: " +
x.getMessage(), x );
}
@@ -181,7 +181,7 @@ public class JellyServiceImpl implements JellyService,
Configurable {
try {
url = new URL( scriptName );
}
- catch( MalformedURLException mfue ) {
+ catch ( MalformedURLException mfue ) {
// Last try, via classloader
url = getClass().getResource( scriptName );
}
@@ -200,7 +200,7 @@ public class JellyServiceImpl implements JellyService,
Configurable {
m_scripts.put( name, script );
}
- catch( Throwable t ) {
+ catch ( Throwable t ) {
throw new ConfigurationException( "Could not load script [" +
name + "]: " + t.getMessage() );
}
}
diff --git
a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
index fdca57a3..fd62d11d 100644
---
a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
+++
b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
@@ -190,7 +190,7 @@ public class HomepageBuilder extends JPanel {
htmlPane.setEditable(false);
frame.setContentPane(new JScrollPane(htmlPane));
- } catch(Exception ioe) {
+ } catch (Exception ioe) {
System.err.println("Error displaying page");
}
diff --git
a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
index 35fa4be8..2d88caa2 100644
---
a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
+++
b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
@@ -70,12 +70,12 @@ public class JellyThread extends Thread {
// as long as there were no runtime exceptions set SUCCESS
status.set(RunnableStatus.SUCCESS);
- } catch(RequirementException e) {
+ } catch (RequirementException e) {
status.set(RunnableStatus.AVOIDED);
log.warn("Thread \"" + getName() + "\" avoided, " +
e.getMessage());
- } catch(TimeoutException e) {
+ } catch (TimeoutException e) {
status.set(RunnableStatus.AVOIDED);
log.warn("Thread \"" + getName() + "\" avoided, " +
e.getMessage());
