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
commit 43ad5c5af8bd55109927a63d00d6563fc21bb94d
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jun 13 11:34:44 2025 -0400
Use final
- Sort imports
- Combine nested if statements
- Use compact array initialization
---
.../apache/commons/jelly/tags/antlr/AntlrTag.java | 72 ++++++++++------------
1 file changed, 34 insertions(+), 38 deletions(-)
diff --git
a/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
b/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
index 8ee3f73b..048b8dea 100644
---
a/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
+++
b/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
@@ -17,24 +17,24 @@
package org.apache.commons.jelly.tags.antlr;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.JellyTagException;
-
-import antlr.Tool;
-
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-import java.io.BufferedReader;
import java.security.Permission;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.jelly.JellyTagException;
+import org.apache.commons.jelly.MissingAttributeException;
+import org.apache.commons.jelly.TagSupport;
+import org.apache.commons.jelly.XMLOutput;
+
+import antlr.Tool;
public class AntlrTag extends TagSupport
{
- private List grammars;
+ private final List grammars;
private File outputDir;
public AntlrTag()
@@ -59,10 +59,10 @@ public class AntlrTag extends TagSupport
invokeBody( output );
- Iterator grammarIter = this.grammars.iterator();
+ final Iterator grammarIter = this.grammars.iterator();
String eachGrammar = null;
- String sourceDir = (String) getContext().getVariable(
"maven.antlr.src.dir" );
+ final String sourceDir = (String) getContext().getVariable(
"maven.antlr.src.dir" );
File grammar = null;
while ( grammarIter.hasNext() )
@@ -72,15 +72,12 @@ public class AntlrTag extends TagSupport
grammar = new File( sourceDir,
eachGrammar );
- File generated = getGeneratedFile( grammar.getPath() );
+ final File generated = getGeneratedFile( grammar.getPath() );
- if ( generated.exists() )
+ if ( generated.exists() && (generated.lastModified() >
grammar.lastModified()) )
{
- if ( generated.lastModified() > grammar.lastModified() )
- {
- // it's more recent, skip.
- return;
- }
+ // it's more recent, skip.
+ return;
}
if ( ! generated.getParentFile().exists() )
@@ -88,14 +85,13 @@ public class AntlrTag extends TagSupport
generated.getParentFile().mkdirs();
}
- String[] args = new String[]
- {
- "-o",
- generated.getParentFile().getPath(),
- grammar.getPath(),
- };
+ final String[] args = {
+ "-o",
+ generated.getParentFile().getPath(),
+ grammar.getPath(),
+ };
- SecurityManager oldSm = System.getSecurityManager();
+ final SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager( NoExitSecurityManager.INSTANCE );
@@ -103,7 +99,7 @@ public class AntlrTag extends TagSupport
{
Tool.main( args );
}
- catch (SecurityException e)
+ catch (final SecurityException e)
{
if ( ! e.getMessage().equals( "exitVM-0" ) )
{
@@ -117,33 +113,33 @@ public class AntlrTag extends TagSupport
}
}
- protected File getGeneratedFile(String grammar) throws JellyTagException
+ protected File getGeneratedFile(final String grammar) throws
JellyTagException
{
- File grammarFile = new File( grammar );
+ final File grammarFile = new File( grammar );
String generatedFileName = null;
- String className = null;
+ final String className = null;
String packageName = "";
try {
- BufferedReader in = new BufferedReader(new FileReader(grammar));
+ final BufferedReader in = new BufferedReader(new
FileReader(grammar));
String line;
while ((line = in.readLine()) != null) {
line = line.trim();
- int extendsIndex = line.indexOf(" extends ");
+ final int extendsIndex = line.indexOf(" extends ");
if (line.startsWith("class ") && extendsIndex > -1) {
generatedFileName = line.substring(6, extendsIndex).trim();
break;
}
- else if ( line.startsWith( "package" ) ) {
+ if ( line.startsWith( "package" ) ) {
packageName = line.substring( 8 ).trim();
}
}
in.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new JellyTagException("Unable to determine generated class",
e);
}
@@ -173,12 +169,12 @@ public class AntlrTag extends TagSupport
return genFile;
}
- void addGrammar(String grammar)
+ void addGrammar(final String grammar)
{
this.grammars.add( grammar );
}
- public void setOutputDir(File outputDir)
+ public void setOutputDir(final File outputDir)
{
this.outputDir = outputDir;
}
@@ -198,12 +194,12 @@ final class NoExitSecurityManager extends SecurityManager
}
@Override
- public void checkPermission(Permission permission)
+ public void checkPermission(final Permission permission)
{
}
@Override
- public void checkExit(int status)
+ public void checkExit(final int status)
{
throw new SecurityException( "exitVM-" + status );
}
