Skip to content

Use String.format instead of MessageFormat.fomat #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
picpoc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use String.format instead of MessageFormat.fomat #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/org/nnsoft/guice/rocoto/variables/AntStyleParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.nnsoft.guice.rocoto.variables;

import static java.text.MessageFormat.format;
import static java.lang.String.format;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -77,7 +77,7 @@ public Appender parse( String pattern ) throws IllegalArgumentException
if ( endVariable < 0 )
{
throw new IllegalArgumentException(format(
"Syntax error in property value ''{0}'', missing close bracket ''{1}'' for variable beginning at col {2}: ''{3}''", pattern,
"Syntax error in property value '%s', missing close bracket '%s' for variable beginning at col %s: '%s'", pattern,
VAR_CLOSE, pos - VAR_START_LEN, pattern.substring(pos - VAR_START_LEN)));
}

Expand All @@ -94,7 +94,7 @@ public Appender parse( String pattern ) throws IllegalArgumentException
if ( endVariable < 0 )
{
throw new IllegalArgumentException(format(
"Syntax error in property value ''{0}'', missing close bracket ''{1}'' for variable beginning at col {2}: ''{3}''",
"Syntax error in property value '%s', missing close bracket '%s' for variable beginning at col %s: '%s'",
pattern, VAR_CLOSE, nextVariable, pattern.substring(nextVariable, lastEndVariable)));
}
nextVariable = pattern.indexOf(VAR_START, nextVariable + VAR_START_LEN);
Expand Down Expand Up @@ -145,7 +145,7 @@ public Appender parse( String pattern ) throws IllegalArgumentException
if ( nextEndKeyVariable < 0 )
{
throw new IllegalArgumentException(
format("Syntax error in property value ''{0}'', missing close bracket ''{1}'' for variable beginning at col {2}: ''{3}''",
format("Syntax error in property value '%s', missing close bracket '%s' for variable beginning at col %s: '%s'",
pattern, VAR_CLOSE, nextStartKeyVariable, key.substring(nextStartKeyVariable)));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/nnsoft/guice/rocoto/variables/VariableResolvingTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.nnsoft.guice.rocoto.variables;

import static java.text.MessageFormat.format;
import static java.lang.String.format;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -476,7 +476,7 @@ private void verifySyntaxError( String value )
try
{
variablesMap.put("mustFail", value);
fail(format("Expected an IllegalArgumentException for syntaxically incorrect variable value ''{0}''.", value));
fail(format("Expected an IllegalArgumentException for syntaxically incorrect variable value '%s'.", value));
} catch (IllegalArgumentException expected)
{
// ok
Expand Down