From c9598b3110d4ae4ed027afe9e5483f2565765c4c Mon Sep 17 00:00:00 2001 From: samskivert Date: Tue, 9 Feb 2010 21:29:01 +0000 Subject: [PATCH] More finality. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2729 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/servlet/util/HTMLUtil.java | 5 ++--- src/java/com/samskivert/servlet/util/ParameterUtil.java | 2 +- src/java/com/samskivert/swing/IntField.java | 3 +-- src/java/com/samskivert/swing/util/SwingUtil.java | 2 +- src/java/com/samskivert/util/ArrayUtil.java | 2 +- src/java/com/samskivert/util/CurrencyUtil.java | 2 +- src/java/com/samskivert/util/IntSets.java | 2 +- src/java/com/samskivert/util/KeyUtil.java | 2 +- src/java/com/samskivert/util/ValueMarshaller.java | 6 ++---- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/java/com/samskivert/servlet/util/HTMLUtil.java b/src/java/com/samskivert/servlet/util/HTMLUtil.java index 4b76f9af..75dc4c4c 100644 --- a/src/java/com/samskivert/servlet/util/HTMLUtil.java +++ b/src/java/com/samskivert/servlet/util/HTMLUtil.java @@ -92,7 +92,7 @@ public class HTMLUtil public static String simpleFormat (String text) { // first replace the image and other URLs - Matcher m = _url.matcher(text); + Matcher m = URL_PAT.matcher(text); StringBuffer tbuf = new StringBuffer(); while (m.find()) { String match = m.group(); @@ -239,6 +239,5 @@ public class HTMLUtil return buf.toString(); } - protected static Pattern _url = - Pattern.compile("^http://\\S+", Pattern.MULTILINE); + protected static final Pattern URL_PAT = Pattern.compile("^http://\\S+", Pattern.MULTILINE); } diff --git a/src/java/com/samskivert/servlet/util/ParameterUtil.java b/src/java/com/samskivert/servlet/util/ParameterUtil.java index 2b74f8e3..20c28d69 100644 --- a/src/java/com/samskivert/servlet/util/ParameterUtil.java +++ b/src/java/com/samskivert/servlet/util/ParameterUtil.java @@ -410,5 +410,5 @@ public class ParameterUtil } /** We use this to parse dates in requireDateParameter(). */ - protected static SimpleDateFormat _dparser = new SimpleDateFormat("yyyy-MM-dd"); + protected static final SimpleDateFormat _dparser = new SimpleDateFormat("yyyy-MM-dd"); } diff --git a/src/java/com/samskivert/swing/IntField.java b/src/java/com/samskivert/swing/IntField.java index d7c9c672..0b82077d 100644 --- a/src/java/com/samskivert/swing/IntField.java +++ b/src/java/com/samskivert/swing/IntField.java @@ -342,6 +342,5 @@ public class IntField extends JTextField protected int _minValue, _maxValue; /** Formats and parses numbers with commas in them. */ - protected static NumberFormat _formatter = - NumberFormat.getIntegerInstance(); + protected static final NumberFormat _formatter = NumberFormat.getIntegerInstance(); } diff --git a/src/java/com/samskivert/swing/util/SwingUtil.java b/src/java/com/samskivert/swing/util/SwingUtil.java index ceff5704..e04301d1 100644 --- a/src/java/com/samskivert/swing/util/SwingUtil.java +++ b/src/java/com/samskivert/swing/util/SwingUtil.java @@ -642,7 +642,7 @@ public class SwingUtil } /** Used by {@link #addDebugBorders}. */ - protected static Random _rando = new Random(); + protected static final Random _rando = new Random(); /** Used by {@link #getDefaultTextAntialiasing}. */ protected static boolean _defaultTextAntialiasing; diff --git a/src/java/com/samskivert/util/ArrayUtil.java b/src/java/com/samskivert/util/ArrayUtil.java index bbacf703..466ad690 100644 --- a/src/java/com/samskivert/util/ArrayUtil.java +++ b/src/java/com/samskivert/util/ArrayUtil.java @@ -883,5 +883,5 @@ public class ArrayUtil } /** The default random object used when shuffling an array. */ - protected static Random _rnd = new Random(); + protected static final Random _rnd = new Random(); } diff --git a/src/java/com/samskivert/util/CurrencyUtil.java b/src/java/com/samskivert/util/CurrencyUtil.java index ea6c4662..2a70298b 100644 --- a/src/java/com/samskivert/util/CurrencyUtil.java +++ b/src/java/com/samskivert/util/CurrencyUtil.java @@ -74,6 +74,6 @@ public class CurrencyUtil } /** A number format for formatting dollars. */ - protected static NumberFormat _dollarFormatter = + protected static final NumberFormat _dollarFormatter = NumberFormat.getCurrencyInstance(Locale.US); } diff --git a/src/java/com/samskivert/util/IntSets.java b/src/java/com/samskivert/util/IntSets.java index 6692b364..94781354 100644 --- a/src/java/com/samskivert/util/IntSets.java +++ b/src/java/com/samskivert/util/IntSets.java @@ -212,7 +212,7 @@ public class IntSets return EMPTY_INTERATOR; } - protected static Interator EMPTY_INTERATOR = new AbstractInterator() { + protected static final Interator EMPTY_INTERATOR = new AbstractInterator() { public boolean hasNext () { return false; } public int nextInt () { throw new NoSuchElementException(); } }; diff --git a/src/java/com/samskivert/util/KeyUtil.java b/src/java/com/samskivert/util/KeyUtil.java index fa07ba07..84b6a544 100644 --- a/src/java/com/samskivert/util/KeyUtil.java +++ b/src/java/com/samskivert/util/KeyUtil.java @@ -112,5 +112,5 @@ public class KeyUtil } /** Characters used in creating key strings. */ - protected static String KEY_CHARS = "0123456789"; + protected static final String KEY_CHARS = "0123456789"; } diff --git a/src/java/com/samskivert/util/ValueMarshaller.java b/src/java/com/samskivert/util/ValueMarshaller.java index e4cae148..239cac2e 100644 --- a/src/java/com/samskivert/util/ValueMarshaller.java +++ b/src/java/com/samskivert/util/ValueMarshaller.java @@ -22,6 +22,7 @@ package com.samskivert.util; import java.awt.Color; import java.util.HashMap; +import java.util.Map; /** * Provides a mechanism for converting a string representation of a value @@ -56,11 +57,8 @@ public class ValueMarshaller public Object parse (String source) throws Exception; } - protected static HashMap,Parser> _parsers; - + protected static Map,Parser> _parsers = new HashMap,Parser>(); static { - _parsers = new HashMap,Parser>(); - // we can parse strings _parsers.put(String.class, new Parser() { public Object parse (String source) throws Exception {