You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/06/26 21:44:54 UTC
svn commit: r1605890 - in /tomcat/trunk/java/org/apache/tomcat/websocket:
LocalStrings.properties TransformationFactory.java
Author: markt
Date: Thu Jun 26 19:44:54 2014
New Revision: 1605890
URL: http://svn.apache.org/r1605890
Log:
Fix an i18n TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1605890&r1=1605889&r2=1605890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Thu Jun 26 19:44:54 2014
@@ -33,6 +33,8 @@ perMessageDeflate.duplicateParameter=Dup
perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
perMessageDeflate.unknownParameter=An unknown extension parameter [{0}] was defined
+transformerFactory.unsupportedExtension=The extension [{0}] is not supported
+
util.notToken=An illegal extension parameter was specified with name [{0}] and value [{1}]
util.invalidMessageHandler=The message handler provided does not have an onMessage(Object) method
util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is not supported.
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java?rev=1605890&r1=1605889&r2=1605890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java Thu Jun 26 19:44:54 2014
@@ -20,8 +20,12 @@ import java.util.List;
import javax.websocket.Extension;
+import org.apache.tomcat.util.res.StringManager;
+
public class TransformationFactory {
+ private static final StringManager sm = StringManager.getManager(Constants.PACKAGE_NAME);
+
private static final TransformationFactory factory = new TransformationFactory();
private TransformationFactory() {
@@ -36,7 +40,6 @@ public class TransformationFactory {
if (PerMessageDeflate.NAME.equals(name)) {
return PerMessageDeflate.negotiate(preferences);
}
- // TODO i18n
- throw new IllegalArgumentException("Unsupported extension");
+ throw new IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1605890 - in /tomcat/trunk/java/org/apache/tomcat/websocket:
LocalStrings.properties TransformationFactory.java
Posted by Mark Thomas <ma...@apache.org>.
On 27/06/2014 08:09, Martin Grigorov wrote:
> Hi Mark,
>
>
> On Thu, Jun 26, 2014 at 10:44 PM, <ma...@apache.org> wrote:
>
>> Author: markt
>> Date: Thu Jun 26 19:44:54 2014
>> New Revision: 1605890
>>
>> URL: http://svn.apache.org/r1605890
>> Log:
>> Fix an i18n TODO
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>>
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1605890&r1=1605889&r2=1605890&view=diff
>>
>> ==============================================================================
>> --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>> Thu Jun 26 19:44:54 2014
>> @@ -33,6 +33,8 @@ perMessageDeflate.duplicateParameter=Dup
>> perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was
>> specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
>> perMessageDeflate.unknownParameter=An unknown extension parameter [{0}]
>> was defined
>>
>> +transformerFactory.unsupportedExtension=The extension [{0}] is not
>> supported
>> +
>> util.notToken=An illegal extension parameter was specified with name
>> [{0}] and value [{1}]
>> util.invalidMessageHandler=The message handler provided does not have an
>> onMessage(Object) method
>> util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is
>> not supported.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java?rev=1605890&r1=1605889&r2=1605890&view=diff
>>
>> ==============================================================================
>> ---
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>> (original)
>> +++
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>> Thu Jun 26 19:44:54 2014
>> @@ -20,8 +20,12 @@ import java.util.List;
>>
>> import javax.websocket.Extension;
>>
>> +import org.apache.tomcat.util.res.StringManager;
>> +
>> public class TransformationFactory {
>>
>> + private static final StringManager sm =
>> StringManager.getManager(Constants.PACKAGE_NAME);
>> +
>> private static final TransformationFactory factory = new
>> TransformationFactory();
>>
>> private TransformationFactory() {
>> @@ -36,7 +40,6 @@ public class TransformationFactory {
>> if (PerMessageDeflate.NAME.equals(name)) {
>> return PerMessageDeflate.negotiate(preferences);
>> }
>> - // TODO i18n
>> - throw new IllegalArgumentException("Unsupported extension");
>> + throw new
>> IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
>>
>
> [{0}] in
> +transformerFactory.unsupportedExtension=The extension [{0}] is not
> supported
>
> suggests that there will be a replacement of the extension's name but I see
> no String.format() or something similar in
>
> + throw new
> IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
>
> }
Look at the commit that followed a few seconds later.
Mark
>> }
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1605890 - in /tomcat/trunk/java/org/apache/tomcat/websocket:
LocalStrings.properties TransformationFactory.java
Posted by Martin Grigorov <mg...@apache.org>.
Hi Mark,
On Thu, Jun 26, 2014 at 10:44 PM, <ma...@apache.org> wrote:
> Author: markt
> Date: Thu Jun 26 19:44:54 2014
> New Revision: 1605890
>
> URL: http://svn.apache.org/r1605890
> Log:
> Fix an i18n TODO
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1605890&r1=1605889&r2=1605890&view=diff
>
> ==============================================================================
> --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> Thu Jun 26 19:44:54 2014
> @@ -33,6 +33,8 @@ perMessageDeflate.duplicateParameter=Dup
> perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was
> specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
> perMessageDeflate.unknownParameter=An unknown extension parameter [{0}]
> was defined
>
> +transformerFactory.unsupportedExtension=The extension [{0}] is not
> supported
> +
> util.notToken=An illegal extension parameter was specified with name
> [{0}] and value [{1}]
> util.invalidMessageHandler=The message handler provided does not have an
> onMessage(Object) method
> util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is
> not supported.
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java?rev=1605890&r1=1605889&r2=1605890&view=diff
>
> ==============================================================================
> ---
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
> (original)
> +++
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
> Thu Jun 26 19:44:54 2014
> @@ -20,8 +20,12 @@ import java.util.List;
>
> import javax.websocket.Extension;
>
> +import org.apache.tomcat.util.res.StringManager;
> +
> public class TransformationFactory {
>
> + private static final StringManager sm =
> StringManager.getManager(Constants.PACKAGE_NAME);
> +
> private static final TransformationFactory factory = new
> TransformationFactory();
>
> private TransformationFactory() {
> @@ -36,7 +40,6 @@ public class TransformationFactory {
> if (PerMessageDeflate.NAME.equals(name)) {
> return PerMessageDeflate.negotiate(preferences);
> }
> - // TODO i18n
> - throw new IllegalArgumentException("Unsupported extension");
> + throw new
> IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
>
[{0}] in
+transformerFactory.unsupportedExtension=The extension [{0}] is not
supported
suggests that there will be a replacement of the extension's name but I see
no String.format() or something similar in
+ throw new
IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
}
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>