Author: jboynes Date: Sun Feb 8 22:08:30 2015 New Revision: 1658262 URL: http://svn.apache.org/r1658262 Log: Make constant fields static
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java Sun Feb 8 22:08:30 2015 @@ -64,7 +64,7 @@ public abstract class JstlBaseTLV extend // Constants // parameter names - private final String EXP_ATT_PARAM = "expressionAttributes"; + private static final String EXP_ATT_PARAM = "expressionAttributes"; // attributes protected static final String VAR = "var"; Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java Sun Feb 8 22:08:30 2015 @@ -67,26 +67,25 @@ public class JstlCoreTLV extends JstlBas // Constants // tag names - private final String CHOOSE = "choose"; - private final String WHEN = "when"; - private final String OTHERWISE = "otherwise"; - private final String EXPR = "out"; - private final String SET = "set"; - private final String IMPORT = "import"; - private final String URL = "url"; - private final String REDIRECT = "redirect"; - private final String PARAM = "param"; - // private final String EXPLANG = "expressionLanguage"; - private final String TEXT = "text"; + private static final String CHOOSE = "choose"; + private static final String WHEN = "when"; + private static final String OTHERWISE = "otherwise"; + private static final String EXPR = "out"; + private static final String SET = "set"; + private static final String IMPORT = "import"; + private static final String URL = "url"; + private static final String REDIRECT = "redirect"; + private static final String PARAM = "param"; + private static final String TEXT = "text"; // attribute names - private final String VALUE = "value"; - private final String DEFAULT = "default"; - private final String VAR_READER = "varReader"; + private static final String VALUE = "value"; + private static final String DEFAULT = "default"; + private static final String VAR_READER = "varReader"; // alternative identifiers for tags - private final String IMPORT_WITH_READER = "import varReader=''"; - private final String IMPORT_WITHOUT_READER = "import var=''"; + private static final String IMPORT_WITH_READER = "import varReader=''"; + private static final String IMPORT_WITHOUT_READER = "import var=''"; //********************************************************************* Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java Sun Feb 8 22:08:30 2015 @@ -70,23 +70,22 @@ public class JstlFmtTLV extends JstlBase // Constants // tag names - private final String SETLOCALE = "setLocale"; - private final String SETBUNDLE = "setBundle"; - private final String SETTIMEZONE = "setTimeZone"; - private final String BUNDLE = "bundle"; - private final String MESSAGE = "message"; - private final String MESSAGE_PARAM = "param"; - private final String FORMAT_NUMBER = "formatNumber"; - private final String PARSE_NUMBER = "parseNumber"; - private final String PARSE_DATE = "parseDate"; - // private final String EXPLANG = "expressionLanguage"; - private final String JSP_TEXT = "jsp:text"; + private static final String SETLOCALE = "setLocale"; + private static final String SETBUNDLE = "setBundle"; + private static final String SETTIMEZONE = "setTimeZone"; + private static final String BUNDLE = "bundle"; + private static final String MESSAGE = "message"; + private static final String MESSAGE_PARAM = "param"; + private static final String FORMAT_NUMBER = "formatNumber"; + private static final String PARSE_NUMBER = "parseNumber"; + private static final String PARSE_DATE = "parseDate"; + private static final String JSP_TEXT = "jsp:text"; // attribute names - private final String EVAL = "evaluator"; - private final String MESSAGE_KEY = "key"; - private final String BUNDLE_PREFIX = "prefix"; - private final String VALUE = "value"; + private static final String EVAL = "evaluator"; + private static final String MESSAGE_KEY = "key"; + private static final String BUNDLE_PREFIX = "prefix"; + private static final String VALUE = "value"; //********************************************************************* Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java Sun Feb 8 22:08:30 2015 @@ -38,18 +38,18 @@ public class JstlSqlTLV extends JstlBase // Constants // tag names - private final String SETDATASOURCE = "setDataSource"; - private final String QUERY = "query"; - private final String UPDATE = "update"; - private final String TRANSACTION = "transaction"; - private final String PARAM = "param"; - private final String DATEPARAM = "dateParam"; + private static final String SETDATASOURCE = "setDataSource"; + private static final String QUERY = "query"; + private static final String UPDATE = "update"; + private static final String TRANSACTION = "transaction"; + private static final String PARAM = "param"; + private static final String DATEPARAM = "dateParam"; - private final String JSP_TEXT = "jsp:text"; + private static final String JSP_TEXT = "jsp:text"; // attribute names - private final String SQL = "sql"; - private final String DATASOURCE = "dataSource"; + private static final String SQL = "sql"; + private static final String DATASOURCE = "dataSource"; //********************************************************************* Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java Sun Feb 8 22:08:30 2015 @@ -71,17 +71,17 @@ public class JstlXmlTLV extends JstlBase // Constants // tag names - private final String CHOOSE = "choose"; - private final String WHEN = "when"; - private final String OTHERWISE = "otherwise"; - private final String PARSE = "parse"; - private final String PARAM = "param"; - private final String TRANSFORM = "transform"; - private final String JSP_TEXT = "jsp:text"; + private static final String CHOOSE = "choose"; + private static final String WHEN = "when"; + private static final String OTHERWISE = "otherwise"; + private static final String PARSE = "parse"; + private static final String PARAM = "param"; + private static final String TRANSFORM = "transform"; + private static final String JSP_TEXT = "jsp:text"; // attribute names - private final String VALUE = "value"; - private final String SOURCE = "xml"; + private static final String VALUE = "value"; + private static final String SOURCE = "xml"; //********************************************************************* --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org