You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/02/11 15:50:25 UTC
[text] Remove trailing white spaces on all lines and Javadoc.
Repository: commons-text
Updated Branches:
refs/heads/master 7017ea97f -> 29f1108c3
Remove trailing white spaces on all lines and Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/29f1108c
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/29f1108c
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/29f1108c
Branch: refs/heads/master
Commit: 29f1108c344cfca7856bee0ff3bb33316d605b75
Parents: 7017ea9
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Feb 11 08:50:22 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Feb 11 08:50:22 2018 -0700
----------------------------------------------------------------------
.../org/apache/commons/text/StrSubstitutor.java | 18 +++++++++---------
.../commons/text/lookup/AbstractStringLookup.java | 2 +-
.../commons/text/lookup/DateStringLookup.java | 4 ++--
.../lookup/EnvironmentVariableStringLookup.java | 4 ++--
.../text/lookup/IllegalArgumentExceptions.java | 2 +-
.../text/lookup/InterpolatorStringLookup.java | 6 +++---
.../text/lookup/JavaPlatformStringLookup.java | 2 +-
.../commons/text/lookup/MapStringLookup.java | 4 ++--
.../commons/text/lookup/NullStringLookup.java | 2 +-
.../text/lookup/ResourceBundleStringLookup.java | 4 ++--
.../apache/commons/text/lookup/StringLookup.java | 10 +++++-----
.../commons/text/lookup/StringLookupFactory.java | 2 +-
.../text/lookup/SystemPropertyStringLookup.java | 6 +++---
13 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/StrSubstitutor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/StrSubstitutor.java b/src/main/java/org/apache/commons/text/StrSubstitutor.java
index 08d132a..9a39b66 100644
--- a/src/main/java/org/apache/commons/text/StrSubstitutor.java
+++ b/src/main/java/org/apache/commons/text/StrSubstitutor.java
@@ -135,12 +135,12 @@ public class StrSubstitutor {
* Constant for the default variable prefix.
*/
public static final StrMatcher DEFAULT_PREFIX = StrMatcher.stringMatcher("${");
-
+
/**
* Constant for the default variable suffix.
*/
public static final StrMatcher DEFAULT_SUFFIX = StrMatcher.stringMatcher("}");
-
+
/**
* Constant for the default value delimiter of a variable.
*/
@@ -150,37 +150,37 @@ public class StrSubstitutor {
* Stores the escape character.
*/
private char escapeChar;
-
+
/**
* Stores the variable prefix.
*/
private StrMatcher prefixMatcher;
-
+
/**
* Stores the variable suffix.
*/
private StrMatcher suffixMatcher;
-
+
/**
* Stores the default variable value delimiter.
*/
private StrMatcher valueDelimiterMatcher;
-
+
/**
* Variable resolution is delegated to an implementor of VariableResolver.
*/
private StringLookup variableResolver;
-
+
/**
* The flag whether substitution in variable names is enabled.
*/
private boolean enableSubstitutionInVariables;
-
+
/**
* Whether escapes should be preserved. Default is false;
*/
private boolean preserveEscapes = false;
-
+
/**
* The flag whether substitution in variable values is disabled.
*/
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/AbstractStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/AbstractStringLookup.java b/src/main/java/org/apache/commons/text/lookup/AbstractStringLookup.java
index 0985506..4b224c1 100644
--- a/src/main/java/org/apache/commons/text/lookup/AbstractStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/AbstractStringLookup.java
@@ -23,7 +23,7 @@ package org.apache.commons.text.lookup;
* Unfortunately, the type {@link org.apache.commons.text.StrLookup} was defined as class and not an interface, which is
* why this package introduces the interface {@link StringLookup}.
* </p>
- *
+ *
* @since 1.3
*/
public abstract class AbstractStringLookup implements StringLookup {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java b/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java
index d5cbf7d..fe69198 100644
--- a/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java
@@ -54,9 +54,9 @@ final class DateStringLookup extends AbstractStringLookup {
/**
* Looks up the value of the environment variable.
- *
+ *
* @param key
- * the format to use. If null, the default DateFormat will be used.
+ * the format to use. If null, the default {@link DateFormat} will be used.
* @return The value of the environment variable.
*/
@Override
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/EnvironmentVariableStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/EnvironmentVariableStringLookup.java b/src/main/java/org/apache/commons/text/lookup/EnvironmentVariableStringLookup.java
index def095a..23200c5 100644
--- a/src/main/java/org/apache/commons/text/lookup/EnvironmentVariableStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/EnvironmentVariableStringLookup.java
@@ -18,7 +18,7 @@ package org.apache.commons.text.lookup;
/**
* Looks up keys from environment variables.
- *
+ *
* @since 1.3
*/
final class EnvironmentVariableStringLookup extends AbstractStringLookup {
@@ -37,7 +37,7 @@ final class EnvironmentVariableStringLookup extends AbstractStringLookup {
/**
* Looks up the value of the given environment variable.
- *
+ *
* @param key
* the key to be looked up, may be null
* @return The value of the environment variable.
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java b/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java
index 307202d..0ead53e 100644
--- a/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java
+++ b/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java
@@ -19,7 +19,7 @@ package org.apache.commons.text.lookup;
/**
* Shorthands creating {@link IllegalArgumentException} instances using formatted strings.
- *
+ *
* @since 1.3
*/
final class IllegalArgumentExceptions {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java b/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java
index b696dc3..b8e4d37 100644
--- a/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java
@@ -59,7 +59,7 @@ class InterpolatorStringLookup extends AbstractStringLookup {
* <li>"java" for the JavaPlatformStringLookup.</li>
* <li>"date" for the DateStringLookup.</li>
* </ul>
- *
+ *
* @param defaultMap
* the default map for string lookups.
*/
@@ -74,7 +74,7 @@ class InterpolatorStringLookup extends AbstractStringLookup {
/**
* Creates an instance with the given lookup.
- *
+ *
* @param defaultStringLookup
* the default lookup.
*/
@@ -84,7 +84,7 @@ class InterpolatorStringLookup extends AbstractStringLookup {
/**
* Gets the lookup map.
- *
+ *
* @return the lookup map.
*/
public Map<String, StringLookup> getStringLookupMap() {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java b/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
index 5dc5121..35f7607 100644
--- a/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
@@ -20,7 +20,7 @@ import java.util.Locale;
/**
* Looks up keys related to Java: Java version, JRE version, VM version, and so on.
- *
+ *
* @since 1.3
*/
final class JavaPlatformStringLookup extends AbstractStringLookup {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/MapStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/MapStringLookup.java b/src/main/java/org/apache/commons/text/lookup/MapStringLookup.java
index 2b0e9d9..4c1a4aa 100644
--- a/src/main/java/org/apache/commons/text/lookup/MapStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/MapStringLookup.java
@@ -20,10 +20,10 @@ import java.util.Map;
/**
* A map-based lookup.
- *
+ *
* @param <V>
* A map's value type
- *
+ *
* @since 1.3
*/
public final class MapStringLookup<V> implements StringLookup {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/NullStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/NullStringLookup.java b/src/main/java/org/apache/commons/text/lookup/NullStringLookup.java
index 3aee8a8..7c97d1e 100644
--- a/src/main/java/org/apache/commons/text/lookup/NullStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/NullStringLookup.java
@@ -19,7 +19,7 @@ package org.apache.commons.text.lookup;
/**
* Always returns null.
- *
+ *
* @since 1.3
*/
final class NullStringLookup extends AbstractStringLookup {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java b/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
index 1662745..ead8e63 100644
--- a/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
@@ -21,7 +21,7 @@ import java.util.ResourceBundle;
/**
* Looks up keys from resource bundles.
- *
+ *
* @see ResourceBundle
* @since 1.3
*/
@@ -31,7 +31,7 @@ final class ResourceBundleStringLookup extends AbstractStringLookup {
* Defines the singleton for this class.
*/
public static final StringLookup INSTANCE = new ResourceBundleStringLookup();
-
+
/**
* No need to build instances for now.
*/
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/StringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/StringLookup.java b/src/main/java/org/apache/commons/text/lookup/StringLookup.java
index 4fd29b8..4ced2c4 100644
--- a/src/main/java/org/apache/commons/text/lookup/StringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/StringLookup.java
@@ -29,9 +29,9 @@ package org.apache.commons.text.lookup;
* </p>
* <p>
* Unfortunately, the type {@link org.apache.commons.text.StrLookup} was defined as class and not an interface, which is
- * why this package introduces the interface {@link StringLookup}. In time, some deprecation strategy should be created.
+ * why this package introduces the interface {@link StringLookup}.
* </p>
- *
+ *
* @since 1.3
*/
public interface StringLookup {
@@ -51,15 +51,15 @@ public interface StringLookup {
* This method always returns a String, regardless of the underlying data, by converting it as necessary. For
* example:
* </p>
- *
+ *
* <pre>
* Map<String, Object> map = new HashMap<String, Object>();
* map.put("number", new Integer(2));
* assertEquals("2", StrLookup.mapLookup(map).lookup("number"));
* </pre>
- *
+ *
* @param key
- * the key to be looked up, may be null
+ * the key to look up, may be null
* @return the matching value, null if no match
*/
String lookup(String key);
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
index 593822b..7dbea93 100644
--- a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
+++ b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
/**
* Provides access to lookups defined in this package.
- *
+ *
* @since 1.3
*/
public class StringLookupFactory {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/29f1108c/src/main/java/org/apache/commons/text/lookup/SystemPropertyStringLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/lookup/SystemPropertyStringLookup.java b/src/main/java/org/apache/commons/text/lookup/SystemPropertyStringLookup.java
index 8281008..1ae627b 100644
--- a/src/main/java/org/apache/commons/text/lookup/SystemPropertyStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/SystemPropertyStringLookup.java
@@ -18,7 +18,7 @@ package org.apache.commons.text.lookup;
/**
* Looks up keys from system properties.
- *
+ *
* @since 1.3
*/
final class SystemPropertyStringLookup extends AbstractStringLookup {
@@ -27,7 +27,7 @@ final class SystemPropertyStringLookup extends AbstractStringLookup {
* Defines the singleton for this class.
*/
public static final StringLookup INSTANCE = new SystemPropertyStringLookup();
-
+
/**
* No need to build instances for now.
*/
@@ -37,7 +37,7 @@ final class SystemPropertyStringLookup extends AbstractStringLookup {
/**
* Looks up the value for the key from system properties.
- *
+ *
* @param key
* the key to be looked up, may be null
* @return The value associated with the key.