[prev in list] [next in list] [prev in thread] [next in thread]
List: wink-commits
Subject: svn commit: r918698 [2/7] - in /incubator/wink/trunk: ibm-jaxrs-server/
From: jramos () apache ! org
Date: 2010-03-03 21:21:55
Message-ID: 20100303212158.06F6A2388A43 () eris ! apache ! org
[Download RAW message or body]
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/application/ApplicationFileLoader.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java \
Wed Mar 3 21:21:51 2010 @@ -48,11 +48,11 @@
*/
public class ApplicationFileLoader {
- private static final String WINK_APPLICATION = "META-INF/wink-application";
+ private static final String WINK_APPLICATION = "META-INF/wink-application"; \
//$NON-NLS-1$ private static final Logger logger =
LoggerFactory
\
.getLogger(ApplicationFileLoader.class);
- private static final String CORE_APPLICATION = "META-INF/core/wink-providers";
+ private static final String CORE_APPLICATION = "META-INF/core/wink-providers"; \
//$NON-NLS-1$
private final Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
/**
@@ -72,7 +72,7 @@
FileLoader.loadFileUsingClassLoaders(WINK_APPLICATION);
while (applications.hasMoreElements()) {
URL url = applications.nextElement();
- logger.info(Messages.getMessage("loadingApplication", \
url.toExternalForm())); + \
logger.info(Messages.getMessage("loadingApplication", url.toExternalForm())); \
//$NON-NLS-1$ loadClasses(url.openStream());
}
}
@@ -143,7 +143,7 @@
try {
is.close();
} catch (IOException e) {
- logger.info(Messages.getMessage("exceptionClosingFile"), e);
+ logger.info(Messages.getMessage("exceptionClosingFile"), e); \
//$NON-NLS-1$ }
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/application/ApplicationValidator.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java \
Wed Mar 3 21:21:51 2010 @@ -81,7 +81,7 @@
private boolean classUnique(Class<? extends Object> cls) {
if (!singletonClasses.add(cls)) {
// the singleton of this class already exists
- logger.warn(Messages.getMessage("classAlreadyAdded", cls));
+ logger.warn(Messages.getMessage("classAlreadyAdded", cls)); \
//$NON-NLS-1$ return false;
}
return true;
@@ -108,7 +108,7 @@
boolean valid = counter <= 1;
if (!valid) {
- logger.warn(Messages.getMessage("classNotValid",
+ logger.warn(Messages.getMessage("classNotValid", //$NON-NLS-1$
new Object[] {cls, Path.class.getName(), \
DynamicResource.class.getName(), Provider.class.getName()}));
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/application/SimpleWinkApplication.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java \
Wed Mar 3 21:21:51 2010 @@ -51,7 +51,7 @@
private static final Logger logger =
LoggerFactory
\
.getLogger(SimpleWinkApplication.class);
- private static final String FILE_SEPARATOR = ";";
+ private static final String FILE_SEPARATOR = ";"; //$NON-NLS-1$
private final String applicationConfigFiles;
private Set<Class<?>> jaxRSClasses;
@@ -79,7 +79,7 @@
\
.addAll(getApplicationFileLoader(getFileStream(applicationConfigFile))
.getClasses());
} catch (FileNotFoundException e) {
- logger.warn(Messages.getMessage("configNotFound", \
applicationConfigFile)); + \
logger.warn(Messages.getMessage("configNotFound", applicationConfigFile)); \
//$NON-NLS-1$ }
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/Accept.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/http/Accept.java?rev=918698&r1=918697&r2=918698&view=diff \
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/Accept.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/Accept.java \
Wed Mar 3 21:21:51 2010 @@ -159,7 +159,7 @@
public ValuedMediaType(MediaType mediaType) {
double q = 1;
- String qStr = mediaType.getParameters().get("q");
+ String qStr = mediaType.getParameters().get("q"); //$NON-NLS-1$
if (qStr != null) {
q = Double.parseDouble(qStr);
}
@@ -172,7 +172,7 @@
private void init(MediaType mediaType, double q) {
if (mediaType == null) {
- throw new NullPointerException("mediaType");
+ throw new NullPointerException("mediaType"); //$NON-NLS-1$
}
if (q < 0 || q > 1) {
throw new IllegalArgumentException(String.valueOf(q));
@@ -186,7 +186,7 @@
if (this.q != q) {
Map<String, String> parameters = new LinkedHashMap<String, \
String>(); parameters.putAll(mediaType.getParameters());
- parameters.put("q", Double.toString(this.q));
+ parameters.put("q", Double.toString(this.q)); //$NON-NLS-1$
this.mediaType =
new MediaType(mediaType.getType(), mediaType.getSubtype(), \
parameters); }
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/AcceptCharset.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/http/AcceptCharset.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/AcceptCharset.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/AcceptCharset.java \
Wed Mar 3 21:21:51 2010 @@ -75,19 +75,19 @@
this.banned = Collections.unmodifiableList(bannedCharsets);
boolean isISO8859Explicit = false;
for (ValuedCharset vCharset : valuedCharsets) {
- if ("ISO-8859-1".equalsIgnoreCase(vCharset.charset)) {
+ if ("ISO-8859-1".equalsIgnoreCase(vCharset.charset)) { //$NON-NLS-1$
isISO8859Explicit = true;
break;
}
}
if (!isISO8859Explicit && !anyAllowed) {
ArrayList<String> acceptableCharsetsTemp = new \
ArrayList<String>(acceptableCharsets);
- acceptableCharsetsTemp.add("ISO-8859-1");
+ acceptableCharsetsTemp.add("ISO-8859-1"); //$NON-NLS-1$
this.acceptable = Collections.unmodifiableList(acceptableCharsetsTemp);
ArrayList<AcceptCharset.ValuedCharset> valuedCharsetsTemp =
new ArrayList<ValuedCharset>(valuedCharsets);
- valuedCharsetsTemp.add(new AcceptCharset.ValuedCharset(1.0d, \
"ISO-8859-1")); + valuedCharsetsTemp.add(new \
AcceptCharset.ValuedCharset(1.0d, "ISO-8859-1")); //$NON-NLS-1$
this.valuedCharsets = Collections.unmodifiableList(valuedCharsetsTemp);
} else {
this.acceptable = Collections.unmodifiableList(acceptableCharsets);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/ContentDispositionHeader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/http/ContentDispositionHeader.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/ContentDispositionHeader.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/ContentDispositionHeader.java \
Wed Mar 3 21:21:51 2010 @@ -40,8 +40,8 @@
private static Map<MediaType, ContentDispositionHeader> \
contructMediaType2ContentDisposition() { Map<MediaType, ContentDispositionHeader> \
result = new HashMap<MediaType, ContentDispositionHeader>();
- putContentDispositionRecord(result, MediaTypeUtils.CSV, true, "csv");
- putContentDispositionRecord(result, MediaTypeUtils.PDF_TYPE, false, "pdf");
+ putContentDispositionRecord(result, MediaTypeUtils.CSV, true, "csv"); \
//$NON-NLS-1$ + putContentDispositionRecord(result, MediaTypeUtils.PDF_TYPE, \
false, "pdf"); //$NON-NLS-1$ return Collections.unmodifiableMap(result);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/EntityTagMatchHeader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/http/EntityTagMatchHeader.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/EntityTagMatchHeader.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/EntityTagMatchHeader.java \
Wed Mar 3 21:21:51 2010 @@ -38,7 +38,7 @@
if (isWildcard) {
return true;
}
- if (eTag.getValue().equals("*")) {
+ if (eTag.getValue().equals("*")) { //$NON-NLS-1$
isWildcard = true;
eTags.clear();
return true;
@@ -69,7 +69,7 @@
@Override
public String toString() {
if (isWildcard) {
- return "*";
+ return "*"; //$NON-NLS-1$
}
return eTags.toString();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/MessageBundle.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/i18n/MessageBundle.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/MessageBundle.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/MessageBundle.java \
Wed Mar 3 21:21:51 2010 @@ -48,8 +48,8 @@
String msg = resourceBundle.getString(key);
if (msg == null) {
- throw new MissingResourceException("Cannot find resource key \"" + key
- + "\" in base name "
+ throw new MissingResourceException("Cannot find resource key \"" + key \
//$NON-NLS-1$ + + "\" in base name " //$NON-NLS-1$
+ className, className, key);
}
return msg;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/Messages.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/i18n/Messages.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/Messages.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/Messages.java \
Wed Mar 3 21:21:51 2010 @@ -24,7 +24,7 @@
public class Messages {
- private static final String resourceName = "resource";
+ private static final String resourceName = "resource"; //$NON-NLS-1$
private static final MessageBundle messageBundle;
static {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/lifecycle/DefaultLifecycleManager.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java \
Wed Mar 3 21:21:51 2010 @@ -21,6 +21,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
@@ -54,10 +55,10 @@
*/
public ObjectFactory<T> createObjectFactory(T object) {
if (object == null) {
- throw new NullPointerException("object");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", \
"object")); //$NON-NLS-1$ //$NON-NLS-2$ }
- logger.debug("Creating a {} for {}", SingletonObjectFactory.class, object);
+ logger.debug("Creating a {} for {}", SingletonObjectFactory.class, object); \
//$NON-NLS-1$
return LifecycleManagerUtils.createSingletonObjectFactory(object);
}
@@ -65,14 +66,13 @@
public ObjectFactory<T> createObjectFactory(final Class<T> cls) {
if (cls == null) {
- throw new NullPointerException("cls");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", \
"cls")); //$NON-NLS-1$ //$NON-NLS-2$ }
if (ResourceMetadataCollector.isDynamicResource(cls)) {
// default factory cannot create instance of DynamicResource
- throw new IllegalArgumentException(String
- .format("Cannot create default factory for DynamicResource: %s", \
String
- .valueOf(cls)));
+ throw new IllegalArgumentException(Messages
+ .getMessage("cannotCreateDefaultFactoryForDR", \
String.valueOf(cls))); //$NON-NLS-1$ }
if (ProviderMetadataCollector.isProvider(cls)) {
@@ -86,8 +86,8 @@
}
// unknown object, should never reach this code
- throw new IllegalArgumentException(String
- .format("Cannot create default factory for class: %s", \
String.valueOf(cls))); + throw new IllegalArgumentException(Messages
+ .getMessage("cannotCreateDefaultFactoryFor", String.valueOf(cls))); \
//$NON-NLS-1$ }
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/lifecycle/LifecycleManagerUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java \
Wed Mar 3 21:21:51 2010 @@ -42,10 +42,10 @@
CreationUtils.injectFields(object, classMetadata, null);
return new SingletonObjectFactory<T>(object);
} catch (IOException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton", cls));
+ logger.error(Messages.getMessage("injectionFailureSingleton", cls)); \
//$NON-NLS-1$ throw new ObjectCreationException(e);
} catch (PrivilegedActionException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton", cls));
+ logger.error(Messages.getMessage("injectionFailureSingleton", cls)); \
//$NON-NLS-1$ throw new ObjectCreationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/lifecycle/PrototypeObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java \
Wed Mar 3 21:21:51 2010 @@ -20,6 +20,7 @@
package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.RuntimeContext;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
/**
@@ -35,7 +36,7 @@
public PrototypeObjectFactory(ClassMetadata metadata) {
this.metadata = metadata;
if (metadata == null) {
- throw new NullPointerException("metadata");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", \
"metadata")); //$NON-NLS-1$ //$NON-NLS-2$ }
}
@@ -51,6 +52,6 @@
@Override
public String toString() {
- return String.format("ClassMetadataPrototypeOF %s", \
String.valueOf(metadata)); + return String.format("ClassMetadataPrototypeOF \
%s", String.valueOf(metadata)); //$NON-NLS-1$ }
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/lifecycle/SingletonObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java \
Wed Mar 3 21:21:51 2010 @@ -47,6 +47,6 @@
@Override
public String toString() {
- return String.format("SingletonOF: %s", objectClass);
+ return String.format("SingletonOF: %s", objectClass); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/model/AnyContentHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java \
Wed Mar 3 21:21:51 2010 @@ -64,7 +64,7 @@
if (contentType == null) {
// should never happen
type = MediaType.APPLICATION_OCTET_STREAM_TYPE;
- } else if (contentType.equals("xhtml")) {
+ } else if (contentType.equals("xhtml")) { //$NON-NLS-1$
type = MediaType.APPLICATION_XML_TYPE;
} else {
type = MediaType.valueOf(contentType);
@@ -82,7 +82,7 @@
(MessageBodyWriter<Object>)providers.getMessageBodyWriter(cls, cls, \
null, type);
if (writer == null) {
- logger.error(Messages.getMessage("noWriterFound", cls.getName(), \
type.toString())); + logger.error(Messages.getMessage("noWriterFound", \
cls.getName(), type.toString())); //$NON-NLS-1$ throw new \
WebApplicationException(500); }
@@ -99,12 +99,12 @@
throw new WebApplicationException(e);
}
byte[] result;
- if (contentType.equals("xhtml")) {
+ if (contentType.equals("xhtml")) { //$NON-NLS-1$
try {
result =
- new StringBuilder().append("<div xmlns=\"")
- \
.append(RestConstants.NAMESPACE_XHTML).append("\">").append(os
- \
.toString(ProviderUtils.getCharset(type))).append("</div>").toString() + \
new StringBuilder().append("<div xmlns=\"") //$NON-NLS-1$ + \
.append(RestConstants.NAMESPACE_XHTML).append("\">").append(os //$NON-NLS-1$ + \
.toString(ProviderUtils.getCharset(type))).append("</div>").toString() \
//$NON-NLS-1$
.getBytes();
} catch (UnsupportedEncodingException e) {
throw new WebApplicationException(e);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/model/ModelUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java \
Wed Mar 3 21:21:51 2010 @@ -111,11 +111,11 @@
// as per RFC3023 and Atom specification
type = type.toLowerCase();
- if (type.endsWith("/xml") || type.endsWith("+xml")
- || type.equals("xhtml")
- || type.equals("text/xml-external-parsed-entity")
- || type.equals("application/xml-external-parsed-entity")
- || type.equals("application/xml-dtd")) {
+ if (type.endsWith("/xml") || type.endsWith("+xml") //$NON-NLS-1$ \
//$NON-NLS-2$ + || type.equals("xhtml") //$NON-NLS-1$
+ || type.equals("text/xml-external-parsed-entity") //$NON-NLS-1$
+ || type.equals("application/xml-external-parsed-entity") //$NON-NLS-1$
+ || type.equals("application/xml-dtd")) { //$NON-NLS-1$
return true;
}
@@ -147,7 +147,7 @@
// setting this property will cause the handler to get lexical
// events as well
if (handler instanceof LexicalHandler) {
- xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", \
handler); + \
xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", handler); \
//$NON-NLS-1$ }
xmlReader.parse(new InputSource(reader));
} catch (SAXException e) {
@@ -346,9 +346,9 @@
public static MediaType determineMediaType(String type) {
MediaType mediaType;
- if (type == null || type.equals("text") || type.equals("html")) {
+ if (type == null || type.equals("text") || type.equals("html")) { \
//$NON-NLS-1$ //$NON-NLS-2$ mediaType = MediaType.TEXT_PLAIN_TYPE;
- } else if (type.equals("xhtml")) {
+ } else if (type.equals("xhtml")) { //$NON-NLS-1$
mediaType = MediaType.APPLICATION_XML_TYPE;
} else {
mediaType = MediaType.valueOf(type);
@@ -425,7 +425,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(cls);
} else {
- logger.warn(Messages.getMessage("classNotAProvider", cls));
+ logger.warn(Messages.getMessage("classNotAProvider", cls)); \
//$NON-NLS-1$ }
}
}
@@ -437,7 +437,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj);
} else {
- logger.warn(Messages.getMessage("classNotAProvider", \
obj.getClass())); + \
logger.warn(Messages.getMessage("classNotAProvider", obj.getClass())); //$NON-NLS-1$ \
} }
}
@@ -455,7 +455,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority);
} else {
- logger.warn(Messages.getMessage("classNotAProvider", \
obj.getClass())); + \
logger.warn(Messages.getMessage("classNotAProvider", obj.getClass())); //$NON-NLS-1$ \
} }
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MandatoryYesNo.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/model/admin/MandatoryYesNo.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MandatoryYesNo.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MandatoryYesNo.java \
Wed Mar 3 21:21:51 2010 @@ -52,8 +52,8 @@
public enum MandatoryYesNo {
@XmlEnumValue("yes")
- YES("yes"), @XmlEnumValue("no")
- NO("no");
+ YES("yes"), @XmlEnumValue("no") //$NON-NLS-1$
+ NO("no"); //$NON-NLS-1$
private final String value;
MandatoryYesNo(String v) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/AssetProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java \
Wed Mar 3 21:21:51 2010 @@ -114,11 +114,11 @@
entityStream);
} catch (IllegalArgumentException e) {
logger.error(Messages
- .getMessage("assetMethodInvokeError", \
method.getMethod().getName())); + \
.getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$ \
throw new WebApplicationException(e); } catch (IllegalAccessException e) {
logger.error(Messages
- .getMessage("assetMethodInvokeError", \
method.getMethod().getName())); + \
.getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$ \
throw new WebApplicationException(e); } catch (InvocationTargetException e) {
Throwable targetException = e.getTargetException();
@@ -126,7 +126,7 @@
throw (RuntimeException)targetException;
}
logger.error(Messages
- .getMessage("assetMethodInvokeError", \
method.getMethod().getName())); + \
.getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$ \
throw new WebApplicationException(targetException); }
}
@@ -172,15 +172,15 @@
throw (RuntimeException)targetException;
}
logger.error(Messages
- .getMessage("assetMethodInvokeError", \
method.getMethod().getName())); + \
.getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$ \
throw new WebApplicationException(e); } catch (InstantiationException e) {
- logger.error(Messages.getMessage("assetMustHavePublicConstructor", \
type.getName())); + \
logger.error(Messages.getMessage("assetMustHavePublicConstructor", type.getName())); \
//$NON-NLS-1$ throw new WebApplicationException(e);
} catch (Exception e) {
logger.error(Messages
- .getMessage("assetMethodInvokeError", \
method.getMethod().getName())); + \
.getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$ \
throw new WebApplicationException(e); }
}
@@ -228,14 +228,14 @@
// verify that the asset has a default public constructor
try {
if (assetType.getConstructor() == null) {
- logger.info(Messages.getMessage("assetCannotInstantiate", \
assetType.getName())); + \
logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); \
//$NON-NLS-1$ return false;
}
} catch (SecurityException e) {
- logger.info(Messages.getMessage("assetCannotInstantiate", \
assetType.getName())); + \
logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); \
//$NON-NLS-1$ return false;
} catch (NoSuchMethodException e) {
- logger.info(Messages.getMessage("assetCannotInstantiate", \
assetType.getName())); + \
logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); \
//$NON-NLS-1$ return false;
}
@@ -414,9 +414,9 @@
if (type != null) {
// we allow to have only one entity parameter
String methodName =
- method.getDeclaringClass().getName() + "." + \
method.getName(); + method.getDeclaringClass().getName() + \
"." + method.getName(); //$NON-NLS-1$ logger.error(Messages
- .getMessage("assetLocatorMethodMoreThanOneEntityParam", \
methodName)); + \
.getMessage("assetLocatorMethodMoreThanOneEntityParam", methodName)); //$NON-NLS-1$ \
throw new WebApplicationException(); }
type = fp.getGenericType();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/FileProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java \
Wed Mar 3 21:21:51 2010 @@ -46,9 +46,9 @@
@Consumes("*/*")
public class FileProvider implements MessageBodyWriter<File>, \
MessageBodyReader<File> {
private static final Logger logger = \
LoggerFactory.getLogger(FileProvider.class);
- private String prefix = "FP_PRE";
+ private String prefix = "FP_PRE"; //$NON-NLS-1$
private String uploadDir = null;
- private String suffix = "FP_SUF";
+ private String suffix = "FP_SUF"; //$NON-NLS-1$
/********************** Writer **************************************/
@@ -108,7 +108,7 @@
dir = new File(uploadDir);
if (!dir.exists() || !dir.isDirectory()) {
dir = null;
- logger.warn(Messages.getMessage("uploadDirDoesNotExist", \
uploadDir)); + \
logger.warn(Messages.getMessage("uploadDirDoesNotExist", uploadDir)); //$NON-NLS-1$ \
throw new WebApplicationException();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormMultivaluedMapProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/FormMultivaluedMapProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormMultivaluedMapProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormMultivaluedMapProvider.java \
Wed Mar 3 21:21:51 2010 @@ -85,7 +85,7 @@
// delim = "&";
// }
// }
- String string = MultivaluedMapImpl.toString(t, "&");
+ String string = MultivaluedMapImpl.toString(t, "&"); //$NON-NLS-1$
string = UriEncoder.encodeQuery(string, true);
ProviderUtils.writeToStream(string, entityStream, mediaType);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormatedExceptionProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/FormatedExceptionProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormatedExceptionProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormatedExceptionProvider.java \
Wed Mar 3 21:21:51 2010 @@ -48,7 +48,7 @@
@Produces(MediaType.WILDCARD)
public class FormatedExceptionProvider implements MessageBodyWriter<Throwable> {
- private static final String ID_PREFIX = "urn:uuid:";
+ private static final String ID_PREFIX = "urn:uuid:"; //$NON-NLS-1$
@Context
private Providers providers;
@@ -110,7 +110,7 @@
httpHeaders,
entityStream);
} else {
- localizedMessage = "<error>" + localizedMessage + "</error>";
+ localizedMessage = "<error>" + localizedMessage + "</error>"; \
//$NON-NLS-1$ //$NON-NLS-2$
entityStream.write(localizedMessage.getBytes(ProviderUtils.getCharset(mediaType)));
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/ReaderProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java \
Wed Mar 3 21:21:51 2010 @@ -44,10 +44,10 @@
@Consumes("*/*")
public final class ReaderProvider implements MessageBodyReader<Reader>, \
MessageBodyWriter<Reader> {
- public static final Charset UTF8 = Charset.forName("UTF-8");
+ public static final Charset UTF8 = Charset.forName("UTF-8"); //$NON-NLS-1$
public static final Charset getCharset(MediaType m) {
- String name = (m == null) ? null : m.getParameters().get("charset");
+ String name = (m == null) ? null : m.getParameters().get("charset"); \
//$NON-NLS-1$ return (name == null) ? UTF8 : Charset.forName(name);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/StringProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java \
Wed Mar 3 21:21:51 2010 @@ -69,11 +69,11 @@
Annotation[] annotations,
MediaType mediaType) {
String charSet = ProviderUtils.getCharset(mediaType);
- if (charSet != null && !"UTF-8".equals(charSet)) {
+ if (charSet != null && !"UTF-8".equals(charSet)) { //$NON-NLS-1$
try {
return t.getBytes(charSet).length;
} catch (UnsupportedEncodingException e) {
- logger.debug("Unsupported character encoding exception: {}", e);
+ logger.debug("Unsupported character encoding exception: {}", e); \
//$NON-NLS-1$ throw new WebApplicationException(e, 500);
}
}
@@ -95,7 +95,7 @@
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException, \
WebApplicationException {
- logger.debug("Writing {} to stream using {}", t, getClass().getName());
+ logger.debug("Writing {} to stream using {}", t, getClass().getName()); \
//$NON-NLS-1$
entityStream.write(t.getBytes(ProviderUtils.getCharset(mediaType)));
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSerializerProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/csv/CsvSerializerProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSerializerProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSerializerProvider.java \
Wed Mar 3 21:21:51 2010 @@ -47,7 +47,7 @@
public class CsvSerializerProvider implements MessageBodyWriter<CsvSerializer> {
public static final String \
CONTENT_DISPOSITION_HEADER =
- \
"Content-Disposition"; + \
"Content-Disposition"; //$NON-NLS-1$
private final static HeaderDelegate<ContentDispositionHeader> header \
=
\
RuntimeDelegate
\
.getInstance() @@ -79,7 +79,7 @@
// set content disposition. This will enable browsers to open excel
ContentDispositionHeader contentDispositionHeader =
ContentDispositionHeader.createContentDispositionHeader(MediaTypeUtils.CSV);
- contentDispositionHeader.setFileName("representation");
+ contentDispositionHeader.setFileName("representation"); //$NON-NLS-1$
httpHeaders
.putSingle(CONTENT_DISPOSITION_HEADER, \
header.toString(contentDispositionHeader));
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSyndFeedSerializerProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/csv/CsvSyndFeedSerializerProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSyndFeedSerializerProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSyndFeedSerializerProvider.java \
Wed Mar 3 21:21:51 2010 @@ -130,15 +130,15 @@
// pay attention that the order of header must math the order of
// elements (see next() method below)
- header.add("id");
- header.add("title");
- header.add("content");
- header.add("authors");
- header.add("published");
- header.add("summary");
- header.add("updated");
- header.add("base");
- header.add("lang");
+ header.add("id"); //$NON-NLS-1$
+ header.add("title"); //$NON-NLS-1$
+ header.add("content"); //$NON-NLS-1$
+ header.add("authors"); //$NON-NLS-1$
+ header.add("published"); //$NON-NLS-1$
+ header.add("summary"); //$NON-NLS-1$
+ header.add("updated"); //$NON-NLS-1$
+ header.add("base"); //$NON-NLS-1$
+ header.add("lang"); //$NON-NLS-1$
for (String categoryName : categoriesNames) {
header.add(categoryName);
}
@@ -168,13 +168,13 @@
String authors =
entry.getAuthors() != null && !entry.getAuthors().isEmpty() ? \
entry.getAuthors()
- .get(0).getName() : "";
- String title = entry.getTitle() != null ? entry.getTitle().getValue() : \
"";
- String content = entry.getContent() != null ? \
entry.getContent().getValue() : ""; + .get(0).getName() : ""; \
//$NON-NLS-1$ + String title = entry.getTitle() != null ? \
entry.getTitle().getValue() : ""; //$NON-NLS-1$ + String content = \
entry.getContent() != null ? entry.getContent().getValue() : ""; //$NON-NLS-1$ \
String published =
- entry.getPublished() != null ? String.valueOf(entry.getPublished()) \
: "";
- String updated = entry.getUpdated() != null ? \
String.valueOf(entry.getUpdated()) : "";
- String summary = entry.getSummary() != null ? \
entry.getSummary().getValue() : ""; + entry.getPublished() != null ? \
String.valueOf(entry.getPublished()) : ""; //$NON-NLS-1$ + String updated \
= entry.getUpdated() != null ? String.valueOf(entry.getUpdated()) : ""; //$NON-NLS-1$ \
+ String summary = entry.getSummary() != null ? \
entry.getSummary().getValue() : ""; //$NON-NLS-1$
// to improve the search, convert categories to Map
Map<String, String> categoriesMap = new HashMap<String, String>();
@@ -202,7 +202,7 @@
// add categories to the end of the row
for (String categoryName : categoriesNames) {
String category = categoriesMap.get(categoryName);
- row[index++] = category != null ? category : "";
+ row[index++] = category != null ? category : ""; //$NON-NLS-1$
}
return row;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvWriter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/csv/CsvWriter.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvWriter.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvWriter.java \
Wed Mar 3 21:21:51 2010 @@ -41,7 +41,7 @@
for (int i = 0; i < row.length; i++) {
if (i != 0) {
- buf.append(",");
+ buf.append(","); //$NON-NLS-1$
}
buf.append(row[i]);
}
@@ -57,7 +57,7 @@
static void escape(String[] array) {
for (int i = array.length - 1; i >= 0; --i) {
if (array[i] == null) {
- array[i] = "";
+ array[i] = ""; //$NON-NLS-1$
} else {
StringBuilder buf = new StringBuilder(array[i]);
boolean surroundElementWithDoubleQuotes = false;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java \
Wed Mar 3 21:21:51 2010 @@ -96,15 +96,15 @@
theType,
annotations,
mediaType);
- logger.debug("readerProvider was {} of type {}", \
System.identityHashCode(readerProvider), readerProvider.getClass().getName()); + \
logger.debug("readerProvider was {} of type {}", \
System.identityHashCode(readerProvider), readerProvider.getClass().getName()); \
//$NON-NLS-1$ }
Queue<String> queue = new LinkedList<String>();
List<Object> collection = new ArrayList<Object>();
- Pattern p = Pattern.compile("\\S");
+ Pattern p = Pattern.compile("\\S"); //$NON-NLS-1$
Matcher m = null;
int next = entityStream.read();
while (next != -1) {
- m = p.matcher("" + (char)next);
+ m = p.matcher("" + (char)next); //$NON-NLS-1$
if (m.matches() && (char)next != '[')
throw new WebApplicationException(500);
else if (!m.matches())
@@ -118,12 +118,12 @@
}
// parse the content and deserialize the JSON Object one by one
- String objectString = "";
+ String objectString = ""; //$NON-NLS-1$
while (next != -1) {
if (((char)next != ',') || ((char)next == ',' && !queue.isEmpty()))
objectString += (char)next;
if ((char)next == '{')
- queue.offer("" + (char)next);
+ queue.offer("" + (char)next); //$NON-NLS-1$
else if ((char)next == '}') {
queue.poll();
if (queue.isEmpty()) {
@@ -134,7 +134,7 @@
mediaType,
httpHeaders,
new \
ByteArrayInputStream(objectString.getBytes())));
- objectString = "";
+ objectString = ""; //$NON-NLS-1$
}
}
next = entityStream.read();
@@ -167,9 +167,9 @@
theType,
annotations,
mediaType);
- logger.debug("writerProvider was {} of type {}", \
System.identityHashCode(writerProvider), writerProvider.getClass().getName()); + \
logger.debug("writerProvider was {} of type {}", \
System.identityHashCode(writerProvider), writerProvider.getClass().getName()); \
//$NON-NLS-1$ }
- entityStream.write("[".getBytes());
+ entityStream.write("[".getBytes()); //$NON-NLS-1$
int i = 0;
for (Object o : t) {
this.writerProvider.writeTo(o,
@@ -180,9 +180,9 @@
httpHeaders,
entityStream);
if ((++i) != t.length)
- entityStream.write(",".getBytes());
+ entityStream.write(",".getBytes()); //$NON-NLS-1$
}
- entityStream.write("]".getBytes());
+ entityStream.write("]".getBytes()); //$NON-NLS-1$
}
public boolean isWriteable(Class<?> type,
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java \
Wed Mar 3 21:21:51 2010 @@ -55,8 +55,8 @@
import org.slf4j.LoggerFactory;
public abstract class AbstractJAXBCollectionProvider extends AbstractJAXBProvider {
- private static final String JAXB_DEFAULT_NAMESPACE = "##default";
- private static final String JAXB_DEFAULT_NAME = "##default";
+ private static final String JAXB_DEFAULT_NAMESPACE = "##default"; //$NON-NLS-1$
+ private static final String JAXB_DEFAULT_NAME = "##default"; //$NON-NLS-1$
private static final Logger logger =
LoggerFactory
\
.getLogger(AbstractJAXBCollectionProvider.class); @@ -108,12 +108,12 @@
releaseJAXBUnmarshaller(context, unmarshaller);
return ret;
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), \
e); // TODO + logger.error(Messages.getMessage("jaxbFailToUnmarshal", \
type.getName()), e); // TODO //$NON-NLS-1$ // change
// message
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), \
e); + logger.error(Messages.getMessage("jaxbFailToUnmarshal", \
type.getName()), e); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
}
@@ -170,7 +170,7 @@
writeEndTag(qname, entityStream);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName()), \
e); + logger.error(Messages.getMessage("jaxbFailToMarshal", \
type.getName()), e); //$NON-NLS-1$ throw new WebApplicationException(e);
}
}
@@ -187,29 +187,29 @@
throws IOException {
String startTag = null;
Charset charSet = getCharSet(m);
- startTag = "<?xml version=\"1.0\" encoding=\"" + charSet.name() + "\" \
standalone=\"yes\"?>"; + startTag = "<?xml version=\"1.0\" encoding=\"" + \
charSet.name() + "\" standalone=\"yes\"?>"; //$NON-NLS-1$ //$NON-NLS-2$ \
entityStream.write(startTag.getBytes()); // if (qname.getNamespaceURI().length() > \
0) // startTag = "<" + qname.getLocalPart() + "s xmlns=\"" +
// qname.getNamespaceURI() + "\">";
// else
- startTag = "<" + qname.getLocalPart() + "s>";
+ startTag = "<" + qname.getLocalPart() + "s>"; //$NON-NLS-1$ //$NON-NLS-2$
entityStream.write(startTag.getBytes());
}
protected static Charset getCharSet(MediaType m) {
- String charSetString = m.getParameters().get("charset");
+ String charSetString = m.getParameters().get("charset"); //$NON-NLS-1$
Charset charSet =
- charSetString == null ? Charset.forName("UTF-8") : \
Charset.forName(charSetString); + charSetString == null ? \
Charset.forName("UTF-8") : Charset.forName(charSetString); //$NON-NLS-1$ return \
charSet; }
protected static void writeEndTag(QName qname, OutputStream entityStream) throws \
IOException { String endTag = null;
if (qname.getNamespaceURI().length() > 0)
- endTag = "</" + qname.getLocalPart() + "s>";
+ endTag = "</" + qname.getLocalPart() + "s>"; //$NON-NLS-1$ //$NON-NLS-2$
else
- endTag = "</" + qname.getLocalPart() + "s>";
+ endTag = "</" + qname.getLocalPart() + "s>"; //$NON-NLS-1$ //$NON-NLS-2$
entityStream.write(endTag.getBytes());
}
@@ -262,7 +262,7 @@
protected static String getNamespace(String namespace) {
if (JAXB_DEFAULT_NAMESPACE.equals(namespace)) {
- return "";
+ return ""; //$NON-NLS-1$
}
return namespace;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java \
Wed Mar 3 21:21:51 2010 @@ -94,12 +94,12 @@
Unmarshaller unm = upool.get(context);
if (unm == null) {
if (logger.isDebugEnabled()) {
- logger.debug("Unmarshaller created [not in pool]");
+ logger.debug("Unmarshaller created [not in pool]"); //$NON-NLS-1$
}
unm = internalCreateUnmarshaller(context);
} else {
if (logger.isDebugEnabled()) {
- logger.debug("Unmarshaller obtained [from pool]");
+ logger.debug("Unmarshaller obtained [from pool]"); //$NON-NLS-1$
}
}
return unm;
@@ -129,7 +129,7 @@
*/
protected void releaseJAXBUnmarshaller(JAXBContext context, Unmarshaller \
unmarshaller) { if (logger.isDebugEnabled()) {
- logger.debug("Unmarshaller placed back into pool");
+ logger.debug("Unmarshaller placed back into pool"); //$NON-NLS-1$
}
unmarshaller.setAttachmentUnmarshaller(null);
upool.put(context, unmarshaller);
@@ -164,12 +164,12 @@
if (m == null) {
if (logger.isDebugEnabled()) {
- logger.debug("Marshaller created [not in pool]");
+ logger.debug("Marshaller created [not in pool]"); //$NON-NLS-1$
}
m = internalCreateMarshaller(context);
} else {
if (logger.isDebugEnabled()) {
- logger.debug("Marshaller obtained [from pool]");
+ logger.debug("Marshaller obtained [from pool]"); //$NON-NLS-1$
}
}
@@ -198,7 +198,7 @@
*/
protected void releaseJAXBMarshaller(JAXBContext context, Marshaller marshaller) \
{ if (logger.isDebugEnabled()) {
- logger.debug("Marshaller placed back into pool");
+ logger.debug("Marshaller placed back into pool"); //$NON-NLS-1$
}
marshaller.setAttachmentMarshaller(null);
@@ -279,7 +279,7 @@
if (!isXMLRootElement(type) && isXMLType(type)) {
JAXBElement<?> wrappedJAXBElement = wrapInJAXBElement(jaxbObject, type);
if (wrappedJAXBElement == null) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", \
type.getName())); + \
logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName())); \
//$NON-NLS-1$ throw new WebApplicationException();
}
return wrappedJAXBElement;
@@ -304,17 +304,17 @@
Method current = method[i];
if (current.getParameterTypes().length == 1 && \
current.getParameterTypes()[0]
.equals(type)
- && current.getName().startsWith("create")) {
+ && current.getName().startsWith("create")) { //$NON-NLS-1$
Object result = current.invoke(factory, new Object[] \
{jaxbObject}); return JAXBElement.class.cast(result);
}
}
return null;
}
- logger.warn(Messages.getMessage("jaxbObjectFactoryInstantiate", \
type.getName())); + \
logger.warn(Messages.getMessage("jaxbObjectFactoryInstantiate", type.getName())); \
//$NON-NLS-1$ return defaultWrapInJAXBElement(jaxbObject, type);
} catch (Exception e) {
- logger.error(Messages.getMessage("jaxbElementFailToBuild", \
type.getName())); + \
logger.error(Messages.getMessage("jaxbElementFailToBuild", type.getName())); \
//$NON-NLS-1$ return null;
}
@@ -329,17 +329,17 @@
// }
// Search for Factory
StringBuilder b = new StringBuilder(type.getPackage().getName());
- b.append(".ObjectFactory");
+ b.append(".ObjectFactory"); //$NON-NLS-1$
Class<?> factoryClass = null;
try {
factoryClass = \
Thread.currentThread().getContextClassLoader().loadClass(b.toString()); } catch \
(ClassNotFoundException e) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", \
type.getName())); + \
logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName())); \
//$NON-NLS-1$ return null;
}
if (!factoryClass.isAnnotationPresent(XmlRegistry.class)) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotAnnotatedXMLRegistry", \
type + logger.error(Messages.getMessage("jaxbObjectFactoryNotAnnotatedXMLRegistry", \
type //$NON-NLS-1$
.getName()));
return null;
}
@@ -349,7 +349,7 @@
@SuppressWarnings("unchecked")
private JAXBElement<?> defaultWrapInJAXBElement(Object jaxbObject, Class<?> \
type) {
- logger.info(Messages.getMessage("jaxbCreateDefaultJAXBElement", \
type.getName())); + \
logger.info(Messages.getMessage("jaxbCreateDefaultJAXBElement", type.getName())); \
//$NON-NLS-1$ String typeStr = type.getAnnotation(XmlType.class).name();
return new JAXBElement(new QName(typeStr), type, jaxbObject);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java \
Wed Mar 3 21:21:51 2010 @@ -93,7 +93,7 @@
releaseJAXBUnmarshaller(context, unmarshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), \
e); + logger.error(Messages.getMessage("jaxbFailToUnmarshal", \
type.getName()), e); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -131,7 +131,7 @@
releaseJAXBMarshaller(context, marshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName()), e);
+ logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName()), e); \
//$NON-NLS-1$
throw new WebApplicationException(e, \
Response.Status.INTERNAL_SERVER_ERROR); }
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java \
Wed Mar 3 21:21:51 2010 @@ -90,7 +90,7 @@
releaseJAXBUnmarshaller(context, unmarshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), \
e); + logger.error(Messages.getMessage("jaxbFailToUnmarshal", \
type.getName()), e); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -128,7 +128,7 @@
releaseJAXBMarshaller(context, marshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName()), \
e); + logger.error(Messages.getMessage("jaxbFailToMarshal", \
type.getName()), e); //$NON-NLS-1$ throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -62,7 +62,7 @@
return qCharsets;
}
- for (String charsetRange : acceptableCharsetValue.split(",")) {
+ for (String charsetRange : acceptableCharsetValue.split(",")) { \
//$NON-NLS-1$ int semicolonIndex = charsetRange.indexOf(';');
double qValue;
String charsetSpec;
@@ -86,7 +86,7 @@
if (charsetSpec.length() == 0) {
// ignore empty encoding specifications
continue;
- } else if (charsetSpec.equals("*")) {
+ } else if (charsetSpec.equals("*")) { //$NON-NLS-1$
qCharsets.add(new AcceptCharset.ValuedCharset(qValue, null));
} else {
qCharsets.add(new AcceptCharset.ValuedCharset(qValue, charsetSpec));
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -64,7 +64,7 @@
return qEncodings;
}
- for (String encodingRange : acceptableEncodingValue.split(",")) {
+ for (String encodingRange : acceptableEncodingValue.split(",")) { \
//$NON-NLS-1$ int semicolonIndex = encodingRange.indexOf(';');
double qValue;
String encodingSpec;
@@ -88,7 +88,7 @@
if (encodingSpec.length() == 0) {
// ignore empty encoding specifications
continue;
- } else if (encodingSpec.equals("*")) {
+ } else if (encodingSpec.equals("*")) { //$NON-NLS-1$
qEncodings.add(new AcceptEncoding.ValuedEncoding(qValue, null));
} else {
qEncodings.add(new AcceptEncoding.ValuedEncoding(qValue, \
encodingSpec));
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/AcceptHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -46,7 +46,7 @@
value = MediaType.WILDCARD;
}
List<MediaType> list = new LinkedList<MediaType>();
- String[] mediaTypes = StringUtils.fastSplit(value, ",");
+ String[] mediaTypes = StringUtils.fastSplit(value, ","); //$NON-NLS-1$
for (String mediaRange : mediaTypes) {
mediaRange = mediaRange.trim();
if (mediaRange.length() == 0) {
@@ -61,7 +61,7 @@
StringBuilder result = new StringBuilder();
for (MediaType valuedMediaType : value.getMediaTypes()) {
if (result.length() != 0)
- result.append(", ");
+ result.append(", "); //$NON-NLS-1$
result.append(valuedMediaType.toString());
}
return result.toString();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptLanguageHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/AcceptLanguageHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptLanguageHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptLanguageHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -65,7 +65,7 @@
return qLocales;
}
- for (String languageRange : acceptLanguageValue.split(",")) {
+ for (String languageRange : acceptLanguageValue.split(",")) { //$NON-NLS-1$
int semicolonIndex = languageRange.indexOf(';');
double qValue;
String languageSpec;
@@ -89,7 +89,7 @@
if (languageSpec.length() == 0) {
// ignore empty language specifications
continue;
- } else if (languageSpec.equals("*")) {
+ } else if (languageSpec.equals("*")) { //$NON-NLS-1$
qLocales.add(new AcceptLanguage.ValuedLocale(qValue, null));
} else {
Locale newLocale = HeaderUtils.languageToLocale(languageSpec);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/CacheControlHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -91,7 +91,7 @@
private void appendDirective(StringBuffer cacheControlHeader, String directive) \
{ if (cacheControlHeader.length() > 0) {
- cacheControlHeader.append(", ");
+ cacheControlHeader.append(", "); //$NON-NLS-1$
}
cacheControlHeader.append(directive);
@@ -108,7 +108,7 @@
StringBuffer stringBuffer = new StringBuffer();
for (String value : values) {
if (stringBuffer.length() > 0)
- stringBuffer.append(", ");
+ stringBuffer.append(", "); //$NON-NLS-1$
stringBuffer.append(value);
}
return stringBuffer.toString();
@@ -125,9 +125,9 @@
String directiveValue) {
appendDirective(cacheControlHeader, directive);
if (directiveValue != null && directiveValue.length() > 0) {
- cacheControlHeader.append("=\"");
+ cacheControlHeader.append("=\""); //$NON-NLS-1$
cacheControlHeader.append(directiveValue);
- cacheControlHeader.append("\"");
+ cacheControlHeader.append("\""); //$NON-NLS-1$
}
}
@@ -143,7 +143,7 @@
String value) {
appendDirective(cacheControlHeader, directive);
if (value != null && value.length() > 0) {
- cacheControlHeader.append("=");
+ cacheControlHeader.append("="); //$NON-NLS-1$
cacheControlHeader.append(value);
}
}
@@ -157,7 +157,7 @@
*/
private void appendDirective(StringBuffer cacheControlHeader, String directive, \
int value) { appendDirective(cacheControlHeader, directive);
- cacheControlHeader.append("=");
+ cacheControlHeader.append("="); //$NON-NLS-1$
cacheControlHeader.append(value);
}
@@ -171,8 +171,8 @@
if (value == null) {
return null;
}
- if (value.replaceAll("\\s+", "").length() < value.length()) {
- return "\"" + value + "\"";
+ if (value.replaceAll("\\s+", "").length() < value.length()) { //$NON-NLS-1$ \
//$NON-NLS-2$ + return "\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$
}
return value;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/ContentDispositionHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -29,13 +29,13 @@
*/
public class ContentDispositionHeaderDelegate implements \
HeaderDelegate<ContentDispositionHeader> {
- private static final String INLINE_DISPOSITION_TYPE = "inline"; // \
disposition + private static final String INLINE_DISPOSITION_TYPE = "inline"; \
// disposition //$NON-NLS-1$
// type
// \
values
// are
// case
// \
insensitive
- private static final String ATTACHMENT_DISPOSITION_TYPE = "attachment";
+ private static final String ATTACHMENT_DISPOSITION_TYPE = "attachment"; \
//$NON-NLS-1$
public ContentDispositionHeader fromString(String value) throws \
IllegalArgumentException { // TODO: implement according to spec
@@ -47,7 +47,7 @@
StringBuilder value = new StringBuilder();
value.append(header.isAttachment() ? ATTACHMENT_DISPOSITION_TYPE : \
INLINE_DISPOSITION_TYPE); if (fileName != null) {
- value.append("; filename=\"");
+ value.append("; filename=\""); //$NON-NLS-1$
value.append(fileName);
String defaultExtension = header.getDefaultExtension();
if (defaultExtension != null) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/EntityTagMatchHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/EntityTagMatchHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/EntityTagMatchHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/EntityTagMatchHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -35,7 +35,7 @@
\
.createHeaderDelegate(EntityTag.class);
public EntityTagMatchHeader fromString(String value) throws \
IllegalArgumentException {
- String[] valueTokens = value.split(",");
+ String[] valueTokens = value.split(","); //$NON-NLS-1$
EntityTagMatchHeader ifMatchHeader = new EntityTagMatchHeader();
for (String token : valueTokens) {
ifMatchHeader.addETag(ENTITY_TAG_HEADER_DELEGATE.fromString(token));
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -52,8 +52,8 @@
return cached;
}
- String type = "*";
- String subType = "*";
+ String type = "*"; //$NON-NLS-1$
+ String subType = "*"; //$NON-NLS-1$
Map<String, String> paramsMap = null;
String[] all = SEMICOLON.split(value);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java \
Wed Mar 3 21:21:51 2010 @@ -101,25 +101,25 @@
int maxAge,
boolean secure) {
StringBuilder sb = new StringBuilder();
- sb.append(name).append("=");
+ sb.append(name).append("="); //$NON-NLS-1$
if (value == null || value.length() == 0)
- sb.append("\"\"");
+ sb.append("\"\""); //$NON-NLS-1$
else
sb.append(value);
// Path=path
- sb.append(";").append("Version=").append(version);
+ sb.append(";").append("Version=").append(version); //$NON-NLS-1$ \
//$NON-NLS-2$ if (path != null)
- sb.append(";Path=").append(path);
+ sb.append(";Path=").append(path); //$NON-NLS-1$
if (domain != null)
- sb.append(";Domain=").append(domain);
+ sb.append(";Domain=").append(domain); //$NON-NLS-1$
if (comment != null)
- sb.append(";Comment=").append(comment);
+ sb.append(";Comment=").append(comment); //$NON-NLS-1$
if (maxAge >= 0) {
- sb.append(";Max-Age=").append(maxAge);
+ sb.append(";Max-Age=").append(maxAge); //$NON-NLS-1$
}
if (secure)
- sb.append(";Secure");
+ sb.append(";Secure"); //$NON-NLS-1$
return sb.toString();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/InMultiPartProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/multipart/InMultiPartProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/InMultiPartProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/InMultiPartProvider.java \
Wed Mar 3 21:21:51 2010 @@ -52,7 +52,7 @@
MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
throws IOException, WebApplicationException {
- String boundary = mediaType.getParameters().get("boundary");
+ String boundary = mediaType.getParameters().get("boundary"); //$NON-NLS-1$
MultiPartParser mpParser = new MultiPartParser(entityStream,boundary);
InMultiPart imp = new InMultiPart(mpParser);
imp.setProviders(providers);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/MultiPartParser.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/multipart/MultiPartParser.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/MultiPartParser.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/MultiPartParser.java \
Wed Mar 3 21:21:51 2010 @@ -26,6 +26,7 @@
import javax.ws.rs.core.MultivaluedMap;
import org.apache.wink.common.internal.CaseInsensitiveMultivaluedMap;
+import org.apache.wink.common.internal.i18n.Messages;
/*
* TODO: Add the option to get the preamble
@@ -34,11 +35,11 @@
*/
public class MultiPartParser {
- public final static String SEP = "\n";
-
+ public final static String SEP = "\n"; \
//$NON-NLS-1$ +
private InputStream is;
private byte[] boundaryBA;
- static private byte[] boundaryDelimiterBA = "--".getBytes();
+ static private byte[] boundaryDelimiterBA = "--".getBytes(); \
//$NON-NLS-1$
private MultivaluedMap<String, String> partHeaders;
private PartInputStream partIS;
@@ -63,7 +64,7 @@
public MultiPartParser(InputStream is, String boundary) {
this.is = is;
- boundaryBA = ("--" + boundary).getBytes();
+ boundaryBA = ("--" + boundary).getBytes(); //$NON-NLS-1$
// make sure to allocate a buffer that is at least double then the
// boundary length
int buffLength = Math.max(8192, boundaryBA.length * 2);
@@ -253,13 +254,13 @@
private MultivaluedMap<String, String> parseHeaders() throws IOException {
MultivaluedMap<String, String> headers = new \
CaseInsensitiveMultivaluedMap<String>();
-
+
String line;
do {
line = readLine();
- if (line == null || line.equals(""))
+ if (line == null || line.equals("")) //$NON-NLS-1$
break;
- int semIdx = line.indexOf(":");
+ int semIdx = line.indexOf(":"); //$NON-NLS-1$
headers.add(line.substring(0, semIdx).trim(), line.substring(semIdx + \
1).trim());
} while (true);
@@ -317,8 +318,7 @@
@Override
public int read(byte[] b, int off, int len) throws IOException {
if (state == STATE_NOT_ACTIVE) {
- throw new IOException(
- "Stream allready closed: the PartInputStream \
is not accesable after moving to the next part"); + throw new \
IOException(Messages.getMessage("multiPartStreamAlreadyClosed")); //$NON-NLS-1$ }
int available = verifyNumOfByteToReadB4Boundary(len);
if (available < 1) {
@@ -333,8 +333,7 @@
@Override
public int read() throws IOException {
if (state == STATE_NOT_ACTIVE) {
- throw new IOException(
- "Stream allready closed: the PartInputStream \
is not accesable after moving to the next part"); + throw new \
IOException(Messages.getMessage("multiPartStreamAlreadyClosed")); //$NON-NLS-1$ }
int i = verifyNumOfByteToReadB4Boundary(1);
if (i < 1)
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/OutMultiPartProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/providers/multipart/OutMultiPartProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/OutMultiPartProvider.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/OutMultiPartProvider.java \
Wed Mar 3 21:21:51 2010 @@ -61,11 +61,11 @@
// Sync between the boundary of the MediaType (if exist) and the one
// in the MultiPart object. priority to the one on the MediaType
- String boundary = mediaType.getParameters().get("boundary");
+ String boundary = mediaType.getParameters().get("boundary"); //$NON-NLS-1$
if (boundary != null){
multiPart.setBoundary(boundary);
}else{
- httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString() + "; \
boundary=" + multiPart.getBoundary()); \
+ httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString() + "; \
boundary=" + multiPart.getBoundary()); //$NON-NLS-1$ }
multiPart.write(entityStream,providers);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic