You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/08/26 10:27:50 UTC
[1/5] groovy git commit: Minor refactoring: Identical 'catch'
branches in 'try' statement
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 4e40942dc -> b89f6a3e4
Minor refactoring: Identical 'catch' branches in 'try' statement
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8f9ec372
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8f9ec372
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8f9ec372
Branch: refs/heads/GROOVY_2_5_X
Commit: 8f9ec372abf8a192eb06f00a5234a9013b6383af
Parents: 4e40942
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 17:44:19 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 18:05:18 2018 +0800
----------------------------------------------------------------------
.../src/main/java/org/codehaus/groovy/ant/Groovy.java | 4 +---
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 12 +++---------
.../main/java/groovy/servlet/AbstractHttpServlet.java | 3 +--
.../src/main/java/groovy/servlet/GroovyServlet.java | 4 +---
.../groovy-sql/src/main/java/groovy/sql/Sql.java | 8 +-------
.../org/codehaus/groovy/binding/PropertyBinding.java | 4 +---
.../main/groovy/groovy/text/GStringTemplateEngine.java | 4 +---
.../groovy/groovy/text/StreamingTemplateEngine.java | 4 +---
.../groovy-xml/src/main/java/groovy/util/XmlParser.java | 4 +---
.../src/main/java/groovy/util/XmlSlurper.java | 4 +---
10 files changed, 12 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index 7abe713..65ea13e 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -528,9 +528,7 @@ public class Groovy extends Java {
shell.run(txt, scriptName, cmdline.getCommandline());
}
}
- catch (final CompilationFailedException e) {
- processError(e);
- } catch (IOException e) {
+ catch (final CompilationFailedException | IOException e) {
processError(e);
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
index d9f40a5..b308b9b 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
@@ -640,9 +640,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
private Class resolveFromJavaLang(String name) {
try {
return Class.forName("java.lang." + name, false, getClass().getClassLoader());
- } catch (NoClassDefFoundError e) {
- // ignore
- } catch (ClassNotFoundException e) {
+ } catch (NoClassDefFoundError | ClassNotFoundException e) {
// ignore
}
return null;
@@ -693,9 +691,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
try {
// TODO cache these??
return Class.forName(candidate, false, getClass().getClassLoader());
- } catch (NoClassDefFoundError e) {
- // ignore
- } catch (ClassNotFoundException e) {
+ } catch (NoClassDefFoundError | ClassNotFoundException e) {
// ignore
}
}
@@ -708,9 +704,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
try {
// TODO cache these??
return Class.forName(candidate, false, getClass().getClassLoader());
- } catch (NoClassDefFoundError e) {
- // ignore
- } catch (ClassNotFoundException e) {
+ } catch (NoClassDefFoundError | ClassNotFoundException e) {
// ignore
}
return null;
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
index 7e1dbbd..7a2d615 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
@@ -178,8 +178,7 @@ public abstract class AbstractHttpServlet extends HttpServlet implements Resourc
try {
URL res = servletContext.getResource("/");
if (res != null) { uri = res.toURI(); }
- } catch (MalformedURLException ignore) {
- } catch (URISyntaxException ignore) {
+ } catch (MalformedURLException | URISyntaxException ignore) {
}
if (uri != null) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
index 168f620..f64ec95 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
@@ -119,9 +119,7 @@ public class GroovyServlet extends AbstractHttpServlet {
public Object call() {
try {
return ((GroovyScriptEngine) getDelegate()).run(scriptUri, binding);
- } catch (ResourceException e) {
- throw new RuntimeException(e);
- } catch (ScriptException e) {
+ } catch (ResourceException | ScriptException e) {
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index a78c755..6c6db97 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -3577,13 +3577,7 @@ public class Sql {
connection.setAutoCommit(false);
callClosurePossiblyWithConnection(closure, connection);
connection.commit();
- } catch (SQLException e) {
- handleError(connection, e);
- throw e;
- } catch (RuntimeException e) {
- handleError(connection, e);
- throw e;
- } catch (Error e) {
+ } catch (SQLException | Error | RuntimeException e) {
handleError(connection, e);
throw e;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
index f8c051b..2df1f48 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
@@ -157,9 +157,7 @@ public class PropertyBinding implements SourceBinding, TargetBinding, TriggerBin
try {
return accessorClass.newInstance();
- } catch (InstantiationException e) {
- return DefaultPropertyAccessor.INSTANCE;
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
return DefaultPropertyAccessor.INSTANCE;
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
index 53ba715..1b2fa8c 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
@@ -209,9 +209,7 @@ public class GStringTemplateEngine extends TemplateEngine {
// books = 'foo' in a template would store 'books' in the binding of the template script itself ("script")
// instead of storing it in the delegate, which is a Binding too
this.template.setResolveStrategy(Closure.DELEGATE_FIRST);
- } catch (InstantiationException e) {
- throw new ClassNotFoundException(e.getMessage());
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new ClassNotFoundException(e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
index 6b8433a..8894978 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
@@ -624,9 +624,7 @@ public class StreamingTemplateEngine extends TemplateEngine {
Closure chicken = (Closure) object.invokeMethod("getTemplate", null);
//bind the two first parameters of the generated closure to this class and the sections list
result = chicken.curry(this, sections);
- } catch (InstantiationException e) {
- throw new ClassNotFoundException(e.getMessage());
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new ClassNotFoundException(e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
index 33ae5a1..4320d97 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
@@ -131,9 +131,7 @@ public class XmlParser implements ContentHandler {
try {
factory.setFeature(feature, value);
}
- catch (ParserConfigurationException ignored) { }
- catch (SAXNotRecognizedException ignored) { }
- catch (SAXNotSupportedException ignored) { }
+ catch (ParserConfigurationException | SAXNotSupportedException | SAXNotRecognizedException ignored) { }
}
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/8f9ec372/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
index 2d23537..ee93474 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
@@ -143,9 +143,7 @@ public class XmlSlurper extends DefaultHandler {
try {
factory.setFeature(feature, value);
}
- catch (ParserConfigurationException ignored) { }
- catch (SAXNotRecognizedException ignored) { }
- catch (SAXNotSupportedException ignored) { }
+ catch (ParserConfigurationException | SAXNotSupportedException | SAXNotRecognizedException ignored) { }
}
/**
[5/5] groovy git commit: Optimize imports
Posted by su...@apache.org.
Optimize imports
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b89f6a3e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b89f6a3e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b89f6a3e
Branch: refs/heads/GROOVY_2_5_X
Commit: b89f6a3e46faca81575f6acd307bfbbee8be6216
Parents: 746240f
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 18:25:35 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 18:25:35 2018 +0800
----------------------------------------------------------------------
.../java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java | 1 -
.../src/main/java/org/codehaus/groovy/ant/Groovydoc.java | 1 -
.../main/java/org/apache/groovy/json/internal/MapItemValue.java | 2 --
3 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/b89f6a3e/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
index b02c22a..034e77d 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
@@ -23,7 +23,6 @@ import org.apache.tools.ant.Project;
import java.util.Collection;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/groovy/blob/b89f6a3e/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
index 07de202..ccb39ea 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
@@ -35,7 +35,6 @@ import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
http://git-wip-us.apache.org/repos/asf/groovy/blob/b89f6a3e/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
index 8a10c59..fdbf5f9 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
@@ -21,8 +21,6 @@ package org.apache.groovy.json.internal;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import static org.apache.groovy.json.internal.Exceptions.die;
-
/**
* This holds a mapping from value key to value value to maximize laziness.
*
[3/5] groovy git commit: Trivial refactoring: 'indexOf()' expression
is replaceable with 'contains()'
Posted by su...@apache.org.
Trivial refactoring: 'indexOf()' expression is replaceable with 'contains()'
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a862f2cf
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a862f2cf
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a862f2cf
Branch: refs/heads/GROOVY_2_5_X
Commit: a862f2cff7e258ef295de7c967cde29a13440cc1
Parents: f396eb9
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 17:46:20 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 18:05:43 2018 +0800
----------------------------------------------------------------------
.../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java | 2 +-
.../src/main/java/org/apache/groovy/json/internal/Sys.java | 2 +-
.../src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a862f2cf/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index 65ea13e..15825f5 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -369,7 +369,7 @@ public class Groovy extends Java {
while ((line = in.readLine()) != null) {
line = getProject().replaceProperties(line);
- if (line.indexOf("--") >= 0) {
+ if (line.contains("--")) {
txt.append("\n");
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a862f2cf/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
index 6c7dac5..876ea3c 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
@@ -31,7 +31,7 @@ class Sys {
static {
BigDecimal v = new BigDecimal("-1");
String sversion = System.getProperty("java.version");
- if (sversion.indexOf("_") != -1) {
+ if (sversion.contains("_")) {
final String[] split = sversion.split("_");
try {
String ver = split[0];
http://git-wip-us.apache.org/repos/asf/groovy/blob/a862f2cf/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
index 4411ae9..10f42c4 100644
--- a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
+++ b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
@@ -204,7 +204,7 @@ public class DomToGroovy {
}
protected void printQuoted(String text) {
- if (text.indexOf("\n") != -1) {
+ if (text.contains("\n")) {
print("'''");
print(text);
print("'''");
[2/5] groovy git commit: Minor refactoring: 'try finally' replaceable
with 'try' with resources
Posted by su...@apache.org.
Minor refactoring: 'try finally' replaceable with 'try' with resources
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f396eb91
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f396eb91
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f396eb91
Branch: refs/heads/GROOVY_2_5_X
Commit: f396eb91ba2ec9f0847fc5969f553ecb337895ef
Parents: 8f9ec37
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 17:44:44 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 18:05:28 2018 +0800
----------------------------------------------------------------------
.../java/org/codehaus/groovy/runtime/WritablePath.java | 10 +++-------
.../main/groovy/groovy/text/StreamingTemplateEngine.java | 8 +-------
2 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/f396eb91/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
index 842872a..fa1157a 100644
--- a/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
+++ b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
@@ -58,20 +58,16 @@ public class WritablePath implements Path, Writable {
}
public Writer writeTo(final Writer out) throws IOException {
- final Reader reader =
- (this.encoding == null)
- ? new InputStreamReader(Files.newInputStream(this))
- : new InputStreamReader(Files.newInputStream(this), Charset.forName(this.encoding));
- try {
+ try (Reader reader = (this.encoding == null)
+ ? new InputStreamReader(Files.newInputStream(this))
+ : new InputStreamReader(Files.newInputStream(this), Charset.forName(this.encoding))) {
int c = reader.read();
while (c != -1) {
out.write(c);
c = reader.read();
}
- } finally {
- reader.close();
}
return out;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/f396eb91/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
index 8894978..23745cd 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
@@ -379,15 +379,9 @@ public class StreamingTemplateEngine extends TemplateEngine {
private int getLinesInSource() throws IOException {
int result = 0;
- LineNumberReader reader = null;
- try {
- reader = new LineNumberReader(new StringReader(templateSource.toString()));
+ try (LineNumberReader reader = new LineNumberReader(new StringReader(templateSource.toString()))) {
reader.skip(Long.MAX_VALUE);
result = reader.getLineNumber();
- } finally {
- if (reader != null) {
- reader.close();
- }
}
return result;
[4/5] groovy git commit: Trivial refactoring: avoid 'List.remove()'
called in loop
Posted by su...@apache.org.
Trivial refactoring: avoid 'List.remove()' called in loop
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/746240ff
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/746240ff
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/746240ff
Branch: refs/heads/GROOVY_2_5_X
Commit: 746240ff1593c88c06e130c5200bee60a9d58cbd
Parents: a862f2c
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 17:52:17 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 18:05:53 2018 +0800
----------------------------------------------------------------------
.../src/main/groovy/groovy/swing/impl/ListWrapperListModel.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/746240ff/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
index eb19919..ea29e54 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
@@ -151,9 +151,7 @@ public class ListWrapperListModel<E> extends AbstractListModel {
if (fromIndex > toIndex) {
throw new IllegalArgumentException("fromIndex must be <= toIndex");
}
- for (int i = toIndex; i >= fromIndex; i--) {
- delegate.remove(i);
- }
+ delegate.subList(fromIndex, toIndex + 1).clear();
fireIntervalRemoved(this, fromIndex, toIndex);
}
}
\ No newline at end of file