Browse Source

Polishing

pull/1130/merge
Juergen Hoeller 10 years ago
parent
commit
c926ec477a
  1. 6
      spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
  2. 21
      spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
  3. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java

6
spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java

@ -116,7 +116,7 @@ public class CronSequenceGenerator {
/* /*
The plan: The plan:
1 Round up to the next whole second 1 Start with whole second (rounding up if necessary)
2 If seconds match move on, otherwise find the next match: 2 If seconds match move on, otherwise find the next match:
2.1 If next match is in the next minute then roll forwards 2.1 If next match is in the next minute then roll forwards
@ -128,8 +128,6 @@ public class CronSequenceGenerator {
4 If hour matches move on, otherwise find the next match 4 If hour matches move on, otherwise find the next match
4.1 If next match is in the next day then roll forwards, 4.1 If next match is in the next day then roll forwards,
4.2 Reset the minutes and seconds and go to 2 4.2 Reset the minutes and seconds and go to 2
...
*/ */
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
@ -428,7 +426,7 @@ public class CronSequenceGenerator {
@Override @Override
public String toString() { public String toString() {
return (getClass().getSimpleName() + ": " + this.expression); return getClass().getSimpleName() + ": " + this.expression;
} }
} }

21
spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,17 +35,17 @@ import org.springframework.util.xml.DomUtils;
/** /**
* BeanDefinitionParser implementation for the '{@code <lang:groovy/>}', * BeanDefinitionParser implementation for the '{@code <lang:groovy/>}',
* '{@code <lang:jruby/>}' and '{@code <lang:bsh/>}' tags. * '{@code <lang:std/>}' and '{@code <lang:bsh/>}' tags.
* Allows for objects written using dynamic languages to be easily exposed with * Allows for objects written using dynamic languages to be easily exposed with
* the {@link org.springframework.beans.factory.BeanFactory}. * the {@link org.springframework.beans.factory.BeanFactory}.
* *
* <p>The script for each object can be specified either as a reference to the Resource * <p>The script for each object can be specified either as a reference to the
* containing it (using the '{@code script-source}' attribute) or inline in the XML configuration * resource containing it (using the '{@code script-source}' attribute) or inline
* itself (using the '{@code inline-script}' attribute. * in the XML configuration itself (using the '{@code inline-script}' attribute.
* *
* <p>By default, dynamic objects created with these tags are <strong>not</strong> refreshable. * <p>By default, dynamic objects created with these tags are <strong>not</strong>
* To enable refreshing, specify the refresh check delay for each object (in milliseconds) using the * refreshable. To enable refreshing, specify the refresh check delay for each
* '{@code refresh-check-delay}' attribute. * object (in milliseconds) using the '{@code refresh-check-delay}' attribute.
* *
* @author Rob Harrop * @author Rob Harrop
* @author Rod Johnson * @author Rod Johnson
@ -176,14 +176,13 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser {
// Attach any refresh metadata. // Attach any refresh metadata.
String refreshCheckDelay = element.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE); String refreshCheckDelay = element.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE);
if (StringUtils.hasText(refreshCheckDelay)) { if (StringUtils.hasText(refreshCheckDelay)) {
bd.setAttribute(ScriptFactoryPostProcessor.REFRESH_CHECK_DELAY_ATTRIBUTE, new Long(refreshCheckDelay)); bd.setAttribute(ScriptFactoryPostProcessor.REFRESH_CHECK_DELAY_ATTRIBUTE, Long.valueOf(refreshCheckDelay));
} }
// Attach any proxy target class metadata. // Attach any proxy target class metadata.
String proxyTargetClass = element.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE); String proxyTargetClass = element.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE);
if (StringUtils.hasText(proxyTargetClass)) { if (StringUtils.hasText(proxyTargetClass)) {
Boolean flag = new Boolean(proxyTargetClass); bd.setAttribute(ScriptFactoryPostProcessor.PROXY_TARGET_CLASS_ATTRIBUTE, Boolean.valueOf(proxyTargetClass));
bd.setAttribute(ScriptFactoryPostProcessor.PROXY_TARGET_CLASS_ATTRIBUTE, flag);
} }
// Add constructor arguments. // Add constructor arguments.

4
spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -390,7 +390,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
else if (str.length() > 0 && Character.isDigit(str.charAt(0))) { else if (str.length() > 0 && Character.isDigit(str.charAt(0))) {
// Looks like a number... let's try. // Looks like a number... let's try.
try { try {
return new Integer(str); return Integer.valueOf(str);
} }
catch (NumberFormatException ex) { catch (NumberFormatException ex) {
// OK, then let's keep it as a String value. // OK, then let's keep it as a String value.

Loading…
Cancel
Save