You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by jr...@apache.org on 2010/03/03 22:21:55 UTC
svn commit: r918698 [6/7] - in /incubator/wink/trunk: ibm-jaxrs-server/
ibm-jaxrs-server/src/ ibm-jaxrs-server/src/main/
ibm-jaxrs-server/src/main/java/ ibm-jaxrs-server/src/main/java/com/
ibm-jaxrs-server/src/main/java/com/ibm/ ibm-jaxrs-server/src/ma...
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java Wed Mar 3 21:21:51 2010
@@ -43,7 +43,7 @@
LoggerFactory
.getLogger(PopulateResponseMediaTypeHandler.class);
- private static final MediaType APPLICATION_TYPE = new MediaType("application", "*");
+ private static final MediaType APPLICATION_TYPE = new MediaType("application", "*"); //$NON-NLS-1$ //$NON-NLS-2$
private boolean errorFlow = false;
@@ -53,7 +53,7 @@
Object result = context.getResponseEntity();
if (result == null) {
- logger.debug("No entity so no Content-Type needs to be set");
+ logger.debug("No entity so no Content-Type needs to be set"); //$NON-NLS-1$
return;
}
@@ -73,7 +73,7 @@
responseMediaType = MediaType.valueOf(first.toString());
}
}
- logger.debug("Content-Type was set by application to {}", responseMediaType);
+ logger.debug("Content-Type was set by application to {}", responseMediaType); //$NON-NLS-1$
}
if (responseMediaType == null) {
@@ -101,9 +101,9 @@
*/
logger
.info(Messages
- .getMessage("populateResponseMediaTypeHandlerFromCompatibleMessageBodyWriters"));
+ .getMessage("populateResponseMediaTypeHandlerFromCompatibleMessageBodyWriters")); //$NON-NLS-1$
logger
- .debug("Determining Content-Type from compatible generic type to {} from MessageBodyWriters: {}",
+ .debug("Determining Content-Type from compatible generic type to {} from MessageBodyWriters: {}", //$NON-NLS-1$
result.getClass(),
producedMime);
}
@@ -118,7 +118,7 @@
List<CandidateMediaType> candidates = new LinkedList<CandidateMediaType>();
for (MediaType acceptableMediaType : acceptableMediaTypes) {
for (MediaType mediaType : producedMime) {
- logger.debug("Comparing {} to {}", acceptableMediaType, mediaType);
+ logger.debug("Comparing {} to {}", acceptableMediaType, mediaType); //$NON-NLS-1$
if (mediaType.isCompatible(acceptableMediaType)) {
MediaType candidateMediaType = null;
if (MediaTypeUtils.compareTo(mediaType, acceptableMediaType) > 0) {
@@ -126,15 +126,15 @@
} else {
candidateMediaType = acceptableMediaType;
}
- logger.debug("MediaType compatible so using candidate type {}",
+ logger.debug("MediaType compatible so using candidate type {}", //$NON-NLS-1$
candidateMediaType);
- String q = acceptableMediaType.getParameters().get("q");
+ String q = acceptableMediaType.getParameters().get("q"); //$NON-NLS-1$
CandidateMediaType candidate =
new CandidateMediaType(candidateMediaType, q);
if (Double.compare(candidate.q, 0.0) != 0) {
if (logger.isDebugEnabled()) {
logger
- .debug("Candidate {} has q value {} so adding to possible candidates",
+ .debug("Candidate {} has q value {} so adding to possible candidates", //$NON-NLS-1$
candidate.getMediaType(),
q);
}
@@ -147,11 +147,11 @@
// there are no candidates
if (candidates.isEmpty()) {
if (isErrorFlow()) {
- logger.debug("Error flow and no candidates so not going to set a Content-Type");
+ logger.debug("Error flow and no candidates so not going to set a Content-Type"); //$NON-NLS-1$
return;
}
logger.info(Messages
- .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse"));
+ .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse")); //$NON-NLS-1$
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
}
@@ -164,7 +164,7 @@
if (max == null) {
max = candidate;
if (logger.isDebugEnabled()) {
- logger.debug("No previous best candidate so using candidate {}", max
+ logger.debug("No previous best candidate so using candidate {}", max //$NON-NLS-1$
.getMediaType());
}
} else {
@@ -177,14 +177,14 @@
max = candidate;
if (logger.isDebugEnabled()) {
logger
- .debug("Best candidate is now {} because it was a more specific media type",
+ .debug("Best candidate is now {} because it was a more specific media type", //$NON-NLS-1$
max.getMediaType());
}
} else if (comparison == 0 && candidate.getQ() > max.getQ()) {
max = candidate;
if (logger.isDebugEnabled()) {
logger
- .debug("Best candidate is now {} because it had a higher quality value {} compared to {} with quality value {}",
+ .debug("Best candidate is now {} because it had a higher quality value {} compared to {} with quality value {}", //$NON-NLS-1$
new Object[] {max.getMediaType(), max.getQ(), candidate,
candidate.getQ()});
}
@@ -194,7 +194,7 @@
if (!useOctetStream && (candidate.getMediaType().equals(MediaType.WILDCARD_TYPE) || candidate
.getMediaType().equals(APPLICATION_TYPE))) {
logger
- .debug("If necessary, use an application/octet-stream because there is a wildcard",
+ .debug("If necessary, use an application/octet-stream because there is a wildcard", //$NON-NLS-1$
candidate.getMediaType());
useOctetStream = true;
}
@@ -204,20 +204,20 @@
responseMediaType = max.getMediaType();
} else if (useOctetStream) {
logger
- .debug("Content-Type was reset to application/octet-stream because it was either */* or was application/*");
+ .debug("Content-Type was reset to application/octet-stream because it was either */* or was application/*"); //$NON-NLS-1$
responseMediaType = MediaType.APPLICATION_OCTET_STREAM_TYPE;
} else {
if (isErrorFlow()) {
- logger.debug("Error flow so not going to set a response Content-Type");
+ logger.debug("Error flow so not going to set a response Content-Type"); //$NON-NLS-1$
return;
}
logger.info(Messages
- .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse"));
+ .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse")); //$NON-NLS-1$
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
}
}
- logger.debug("Response Content-Type will be set to {}", responseMediaType);
+ logger.debug("Response Content-Type will be set to {}", responseMediaType); //$NON-NLS-1$
context.setResponseMediaType(responseMediaType);
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseStatusHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseStatusHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseStatusHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseStatusHandler.java Wed Mar 3 21:21:51 2010
@@ -53,10 +53,10 @@
if (status == -1) {
if (entity == null) {
logger
- .debug("No status set and no entity so setting response status to 204 No Content");
+ .debug("No status set and no entity so setting response status to 204 No Content"); //$NON-NLS-1$
status = HttpServletResponse.SC_NO_CONTENT;
} else {
- logger.debug("No status set so setting response status to 200 OK");
+ logger.debug("No status set so setting response status to 200 OK"); //$NON-NLS-1$
status = HttpServletResponse.SC_OK;
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/SearchResult.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/SearchResult.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/SearchResult.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/SearchResult.java Wed Mar 3 21:21:51 2010
@@ -131,7 +131,7 @@
List<PathSegment> segments = uriInfo.getPathSegments(false);
// count the number of segments in input uri
- int count = uri.equals("") ? 0 : UriHelper.parsePath(uri).size();
+ int count = uri.equals("") ? 0 : UriHelper.parsePath(uri).size(); //$NON-NLS-1$
// get the offset of the provided uri from the complete request path
int offset = calculateUriOffset();
@@ -162,7 +162,7 @@
// the
// offset by the number of empty segments
for (PathSegment segment : firstMatchedUri) {
- if (segment.getPath().equals("")) {
+ if (segment.getPath().equals("")) { //$NON-NLS-1$
--offset;
}
}
@@ -180,7 +180,7 @@
// if the given uri was an empty string (which itself can happen
// if the resource/sub-resource are annotated with @Path("") or
// @Path("/").
- subListSegments = UriHelper.parsePath("");
+ subListSegments = UriHelper.parsePath(""); //$NON-NLS-1$
}
LinkedList<List<PathSegment>> matchedURIs = getMatchedURIs();
@@ -212,7 +212,7 @@
@Override
public String toString() {
- return String.format("Found: %s, Resource: %s, Method: %s, Error: %s", String
+ return String.format("Found: %s, Resource: %s, Method: %s, Error: %s", String //$NON-NLS-1$
.valueOf(found), String.valueOf(resource), String.valueOf(method), String
.valueOf(error));
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java Wed Mar 3 21:21:51 2010
@@ -163,7 +163,7 @@
@Override
public String toString() {
- return String.format("Method: %s, Path: %s, MediaType: %s",
+ return String.format("Method: %s, Path: %s, MediaType: %s", //$NON-NLS-1$
String.valueOf(getHttpMethod()),
String.valueOf(getUriInfo().getPath(false)),
String.valueOf(getHttpHeaders().getMediaType()));
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/properties/WinkSystemProperties.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/properties/WinkSystemProperties.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/properties/WinkSystemProperties.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/properties/WinkSystemProperties.java Wed Mar 3 21:21:51 2010
@@ -59,11 +59,11 @@
systemProperties.setProperty(key, value);
}
} else {
- logger.debug("Property {} is already defined with value {}", key, value);
+ logger.debug("Property {} is already defined with value {}", key, value); //$NON-NLS-1$
}
}
} else {
- logger.debug("Properties are null");
+ logger.debug("Properties are null"); //$NON-NLS-1$
}
return systemProperties;
}
@@ -75,7 +75,7 @@
String value = AccessController.doPrivileged(new PrivilegedAction<String>() {
public String run() {
String v = System.getProperty(key);
- logger.debug(key + " = " + v);
+ logger.debug(key + " = " + v); //$NON-NLS-1$
return v;
}
});
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/ExpandableSectionHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/ExpandableSectionHelper.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/ExpandableSectionHelper.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/ExpandableSectionHelper.java Wed Mar 3 21:21:51 2010
@@ -44,33 +44,33 @@
*/
public static String getFormHeaderHtml(String title, String id, boolean isStateCollapsed) {
StringBuilder stringBuilder = new StringBuilder();
- String collapseStr = "-";
- String expandStr = "+";
+ String collapseStr = "-"; //$NON-NLS-1$
+ String expandStr = "+"; //$NON-NLS-1$
- stringBuilder.append("<script type='text/javascript' >").append('\n')
- .append("var collapseExpand").append(id).append(" = new CollapseExpand('").append(id)
- .append("');").append('\n').append("</script>").append("\n");
+ stringBuilder.append("<script type='text/javascript' >").append('\n') //$NON-NLS-1$
+ .append("var collapseExpand").append(id).append(" = new CollapseExpand('").append(id) //$NON-NLS-1$ //$NON-NLS-2$
+ .append("');").append('\n').append("</script>").append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
// the section header
stringBuilder
- .append("<table class='wide-table")
- .append("' margin-top='0' cellpadding='0' cellspacing='0'>\n")
- .append("<tr>\n")
- .append("<td >\n")
- .append("<table class='wide-table expandable-form-header'>\n")
- .append("<tr>\n")
- .append("<td style='{CURSOR: pointer};' class='portlet-expand-button minimum-icon-size'>")
- .append("<div id='").append(id).append("_div' onclick=\"collapseExpand").append(id)
- .append(".collapseExpand();\">").append(isStateCollapsed ? expandStr : collapseStr)
- .append("</div>").append("</td>\n").append("<td> ").append(title)
- .append("</td>\n").append("</tr>").append("</table>\n").append("</td>\n")
- .append("</tr>\n").append("</table>\n");
+ .append("<table class='wide-table") //$NON-NLS-1$
+ .append("' margin-top='0' cellpadding='0' cellspacing='0'>\n") //$NON-NLS-1$
+ .append("<tr>\n") //$NON-NLS-1$
+ .append("<td >\n") //$NON-NLS-1$
+ .append("<table class='wide-table expandable-form-header'>\n") //$NON-NLS-1$
+ .append("<tr>\n") //$NON-NLS-1$
+ .append("<td style='{CURSOR: pointer};' class='portlet-expand-button minimum-icon-size'>") //$NON-NLS-1$
+ .append("<div id='").append(id).append("_div' onclick=\"collapseExpand").append(id) //$NON-NLS-1$ //$NON-NLS-2$
+ .append(".collapseExpand();\">").append(isStateCollapsed ? expandStr : collapseStr) //$NON-NLS-1$
+ .append("</div>").append("</td>\n").append("<td> ").append(title) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .append("</td>\n").append("</tr>").append("</table>\n").append("</td>\n") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ .append("</tr>\n").append("</table>\n"); //$NON-NLS-1$ //$NON-NLS-2$
// the collapsed/expanded table
- stringBuilder.append("<table id='").append(id).append("' style='").append(isStateCollapsed
- ? "display: none" : "display: block")
- .append("' class='wide-table' cellpadding=0 cellspacing=0>\n")
- .append("<td class='form-area-width'>\n");
+ stringBuilder.append("<table id='").append(id).append("' style='").append(isStateCollapsed //$NON-NLS-1$ //$NON-NLS-2$
+ ? "display: none" : "display: block") //$NON-NLS-1$ //$NON-NLS-2$
+ .append("' class='wide-table' cellpadding=0 cellspacing=0>\n") //$NON-NLS-1$
+ .append("<td class='form-area-width'>\n"); //$NON-NLS-1$
return stringBuilder.toString();
}
@@ -89,12 +89,12 @@
StringBuilder stringBuilder = new StringBuilder();
// end of collapsed/expended table
- stringBuilder.append("</td>\n").append("</table>\n");
+ stringBuilder.append("</td>\n").append("</table>\n"); //$NON-NLS-1$ //$NON-NLS-2$
// collapse if needed
if (isStateCollapsed) {
- stringBuilder.append("<script type='text/javascript' >\n").append("collapseExpand")
- .append(id).append(".collapse();\n").append("</script>\n");
+ stringBuilder.append("<script type='text/javascript' >\n").append("collapseExpand") //$NON-NLS-1$ //$NON-NLS-2$
+ .append(id).append(".collapse();\n").append("</script>\n"); //$NON-NLS-1$ //$NON-NLS-2$
}
return stringBuilder.toString();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlConstants.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlConstants.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlConstants.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlConstants.java Wed Mar 3 21:21:51 2010
@@ -21,12 +21,12 @@
public final class HtmlConstants {
public static final String DEFAULT_JSP_ENTRY_PATH =
- "/HtmlDefaultRepresentation/defaultHtmlEntry.jsp";
+ "/HtmlDefaultRepresentation/defaultHtmlEntry.jsp"; //$NON-NLS-1$
public static final String DEFAULT_JSP_COLLECTION_PATH =
- "/HtmlDefaultRepresentation/defaultHtmlCollection.jsp";
- public static final String RESOURCE_ATTRIBUTE_NAME_REQUEST = "HtmlRepresentationResource";
+ "/HtmlDefaultRepresentation/defaultHtmlCollection.jsp"; //$NON-NLS-1$
+ public static final String RESOURCE_ATTRIBUTE_NAME_REQUEST = "HtmlRepresentationResource"; //$NON-NLS-1$
public static final String SERVICE_DOCUMENT_URL =
- "/HtmlDefaultRepresentation/defaultHtmlServiceDocument.jsp";
- public static final String RESOURCES_MAP_ATTRIBUTE_NAME_REQUEST = "resourcesMap";
- public static final String BASE_URI_ATTRIBUTE_NAME_REQUEST = "baseUri";
+ "/HtmlDefaultRepresentation/defaultHtmlServiceDocument.jsp"; //$NON-NLS-1$
+ public static final String RESOURCES_MAP_ATTRIBUTE_NAME_REQUEST = "resourcesMap"; //$NON-NLS-1$
+ public static final String BASE_URI_ATTRIBUTE_NAME_REQUEST = "baseUri"; //$NON-NLS-1$
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndEntryAdapter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndEntryAdapter.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndEntryAdapter.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndEntryAdapter.java Wed Mar 3 21:21:51 2010
@@ -64,7 +64,7 @@
if (id != null) {
return id;
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -76,7 +76,7 @@
if (syndEntry.getUpdated() != null) {
return simpleDateFormat.format(syndEntry.getUpdated());
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -89,7 +89,7 @@
if (title != null) {
return title.getValue();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -123,7 +123,7 @@
return name;
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -135,7 +135,7 @@
if (syndEntry.getPublished() != null) {
return simpleDateFormat.format(syndEntry.getPublished());
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -144,7 +144,7 @@
* @return the summary
*/
public String getSummary() {
- String summary = "";
+ String summary = ""; //$NON-NLS-1$
if (syndEntry.getSummary() != null) {
summary = syndEntry.getSummary().getValue();
}
@@ -170,7 +170,7 @@
String type = content.getType();
// TODO: get content using type?
String value = String.valueOf(content.getValue());
- value = value != null ? value : "";
+ value = value != null ? value : ""; //$NON-NLS-1$
if (type != null && (SyndTextType.xhtml.name().equals(type) || ModelUtils
.isTypeXml(type))) {
return StringEscapeUtils.escapeXml(value);
@@ -178,7 +178,7 @@
return value;
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndFeedAdapter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndFeedAdapter.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndFeedAdapter.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndFeedAdapter.java Wed Mar 3 21:21:51 2010
@@ -39,7 +39,7 @@
private final SyndFeed syndFeed;
- private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); //$NON-NLS-1$
/**
* This constructor sets the resource.
@@ -60,7 +60,7 @@
if (id != null) {
return id;
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -72,7 +72,7 @@
if (syndFeed.getUpdated() != null) {
return simpleDateFormat.format(syndFeed.getUpdated());
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -85,7 +85,7 @@
if (textBean != null) {
return textBean.getValue();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -119,7 +119,7 @@
return name;
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -132,7 +132,7 @@
if (textBean != null) {
return textBean.getValue();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/OutputStreamHttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/OutputStreamHttpServletResponseWrapper.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/OutputStreamHttpServletResponseWrapper.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/OutputStreamHttpServletResponseWrapper.java Wed Mar 3 21:21:51 2010
@@ -71,7 +71,7 @@
// retrieved.
if (printWriter != null) {
throw new IllegalStateException(Messages
- .getMessage("cannotGetOutputStreamSinceWriterRequested"));
+ .getMessage("cannotGetOutputStreamSinceWriterRequested")); //$NON-NLS-1$
}
// indicates that output stream was requested.
isOutputStream = true;
@@ -91,7 +91,7 @@
// retrieved.
if (isOutputStream) {
throw new IllegalStateException(Messages
- .getMessage("writerCannotGetWriterSinceOutputStreamRequested"));
+ .getMessage("writerCannotGetWriterSinceOutputStreamRequested")); //$NON-NLS-1$
}
// gets the printWriter if exists
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java Wed Mar 3 21:21:51 2010
@@ -93,7 +93,7 @@
@Override
public String toString() {
- return String.format("ResourceRecord: %s; UriTemplateMatcher: %s",
+ return String.format("ResourceRecord: %s; UriTemplateMatcher: %s", //$NON-NLS-1$
String.valueOf(record),
String.valueOf(matcher));
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java Wed Mar 3 21:21:51 2010
@@ -163,7 +163,7 @@
@Override
public String toString() {
- return String.format("Path: %s; ClassMetadata: %s", super.toString(), String
+ return String.format("Path: %s; ClassMetadata: %s", super.toString(), String //$NON-NLS-1$
.valueOf(metadata));
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java Wed Mar 3 21:21:51 2010
@@ -209,8 +209,8 @@
appendPathWithParent(parentMetadata, pathStr);
}
String path = UriTemplateProcessor.normalizeUri(metadata.getPath());
- if (!path.endsWith("/")) {
- pathStr.append("/");
+ if (!path.endsWith("/")) { //$NON-NLS-1$
+ pathStr.append("/"); //$NON-NLS-1$
}
pathStr.append(path);
}
@@ -241,7 +241,7 @@
if (path != null) {
classMetadata.addPath(path);
if (logger.isDebugEnabled()) {
- logger.debug("Adding dispatched path from instance: {}", path);
+ logger.debug("Adding dispatched path from instance: {}", path); //$NON-NLS-1$
}
}
@@ -249,7 +249,7 @@
if (parent != null) {
classMetadata.getParentInstances().add(parent);
if (logger.isDebugEnabled()) {
- logger.debug("Adding parent beans from instance: {}", parent);
+ logger.debug("Adding parent beans from instance: {}", parent); //$NON-NLS-1$
}
}
@@ -284,7 +284,7 @@
@Override
public String toString() {
- return String.format("InstanceObjectFactory: %s", getInstanceClass());
+ return String.format("InstanceObjectFactory: %s", getInstanceClass()); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java Wed Mar 3 21:21:51 2010
@@ -116,12 +116,12 @@
* @param priority priority of the resource
*/
public void addResource(Object instance, double priority) {
- logger.debug("Adding resource instance: {} with priority: {}", instance, priority);
+ logger.debug("Adding resource instance: {} with priority: {}", instance, priority); //$NON-NLS-1$
writersLock.lock();
try {
if (!applicationValidator.isValidResource(instance.getClass())) {
- logger.warn(Messages.getMessage("resourceClassNotValid", instance.getClass()));
+ logger.warn(Messages.getMessage("resourceClassNotValid", instance.getClass())); //$NON-NLS-1$
return;
}
@@ -141,12 +141,12 @@
* @param priority priority of the resource
*/
public void addResource(Class<?> clazz, double priority) {
- logger.debug("Adding resource class: {} with priority: {}", clazz, priority);
+ logger.debug("Adding resource class: {} with priority: {}", clazz, priority); //$NON-NLS-1$
writersLock.lock();
try {
if (!applicationValidator.isValidResource(clazz)) {
- logger.warn(Messages.getMessage("resourceClassNotValid", clazz));
+ logger.warn(Messages.getMessage("resourceClassNotValid", clazz)); //$NON-NLS-1$
return;
}
ResourceRecord record = getRecord(clazz);
@@ -435,7 +435,7 @@
}
}
if (methodRecords.size() == 0) {
- logger.info(Messages.getMessage("noMethodInClassConsumesHTTPMethod", resource
+ logger.info(Messages.getMessage("noMethodInClassConsumesHTTPMethod", resource //$NON-NLS-1$
.getResourceClass().getName(), context.getHttpHeaders().getMediaType()));
throw new WebApplicationException(Response.Status.UNSUPPORTED_MEDIA_TYPE);
}
@@ -449,7 +449,7 @@
}
}
if (methodRecords.size() == 0) {
- logger.info(Messages.getMessage("noMethodInClassProducesHTTPMethod", resource
+ logger.info(Messages.getMessage("noMethodInClassProducesHTTPMethod", resource //$NON-NLS-1$
.getResourceClass().getName(), context.getHttpHeaders()
.getRequestHeader(HttpHeaders.ACCEPT)));
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
@@ -529,7 +529,7 @@
List<MediaType> acceptableMediaTypes = new ArrayList<MediaType>();
for (MediaType received : receivedMediaTypes) {
- String q = received.getParameters().get("q");
+ String q = received.getParameters().get("q"); //$NON-NLS-1$
if (q != null && Double.valueOf(q).equals(0.0)) {
deniableMediaTypes.add(received);
} else {
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java Wed Mar 3 21:21:51 2010
@@ -300,14 +300,14 @@
public static class FormParamBinding extends BoundInjectable {
static final String FORM_PARAMATERS =
- "wink.formParameters";
+ "wink.formParameters"; //$NON-NLS-1$
public final static MultivaluedMap<String, String> dummyMultivaluedMap = null;
private static Type MULTIVALUED_MAP_STRING_TYPE = null;
static {
try {
MULTIVALUED_MAP_STRING_TYPE =
- FormParamBinding.class.getField("dummyMultivaluedMap").getGenericType();
+ FormParamBinding.class.getField("dummyMultivaluedMap").getGenericType(); //$NON-NLS-1$
} catch (SecurityException e) {
throw new WebApplicationException(e);
} catch (NoSuchFieldException e) {
@@ -473,7 +473,7 @@
// into separate segments, otherwise, pass the default value
// as-is.
if (isTypeOf(PathSegment.class) || isTypeCollectionOf(PathSegment.class)) {
- String[] segmentsArray = StringUtils.fastSplit(defaultValue, "/", true);
+ String[] segmentsArray = StringUtils.fastSplit(defaultValue, "/", true); //$NON-NLS-1$
values.addAll(Arrays.asList(segmentsArray));
} else {
values.add(defaultValue);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/HtmlServiceDocumentResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/HtmlServiceDocumentResource.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/HtmlServiceDocumentResource.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/HtmlServiceDocumentResource.java Wed Mar 3 21:21:51 2010
@@ -49,46 +49,46 @@
MediaTypeUtils
.toEncodedString(MediaTypeUtils.ATOM_SERVICE_DOCUMENT_TYPE);
- private static final String TEXT_CSS = "text/css";
+ private static final String TEXT_CSS = "text/css"; //$NON-NLS-1$
private String serviceDocumentCssPath;
- private static final String START_HTML = "<html>";
- private static final String END_HTML = "</html>";
- private static final String START_HEAD = "<head>";
+ private static final String START_HTML = "<html>"; //$NON-NLS-1$
+ private static final String END_HTML = "</html>"; //$NON-NLS-1$
+ private static final String START_HEAD = "<head>"; //$NON-NLS-1$
private static final String CSS =
- "<style type=\"text/css\" media=\"all\"> h1 { padding: 4px 4px 4px 24px; color: #333333; background-color: #C8C8C8; font-weight: bold; font-size: 24px;} h2 { padding: 4px 4px 4px 24px; color: #F8F8F8; background-color: #686868; font-weight: bold; font-size: 16px;} </style>";
- private static final String END_HEAD = "</head>";
- private static final String START_TITLE = "<title>";
- private static final String END_TITLE = "</title>";
- private static final String START_LINK = "<link rel=";
- private static final String END_TAG = "/>";
- private static final String CLOSE_TAG = ">";
- private static final String START_BODY = "<body>";
- private static final String END_BODY = "</body>";
- private static final String START_HEAD_1 = "<h1>";
- private static final String END_HEAD_1 = "</h1>";
- private static final String START_PARAGRAPH = "<p>";
- private static final String END_PARAGRAPH = "</p>";
- private static final String START_A_HREF = "<a ";
- private static final String END_A_HREF = "</a>";
- private static final String START_HEAD_2 = "<h2>";
- private static final String END_HEAD_2 = "</h2>";
- private static final String START_TABLE = "<table>";
- private static final String END_TABLE = "</table>";
- private static final String START_T_BODY = "<tbody>";
- private static final String END_T_BODY = "</tbody>";
- private static final String START_TR = "<tr>";
- private static final String END_TR = "</tr>";
- private static final String START_TD = "<td>";
- private static final String END_TD = "</td>";
- private static final String TYPE = "type=";
- private static final String HREF = "href=";
- private static final String TITLE = "title=";
- private static final String SPACE = " ";
- private static final String APOSTROPHE = "\"";
- private static final String CSS_REL = "stylesheet";
- private static final String OPEN_SEARCH_REL = "search";
+ "<style type=\"text/css\" media=\"all\"> h1 { padding: 4px 4px 4px 24px; color: #333333; background-color: #C8C8C8; font-weight: bold; font-size: 24px;} h2 { padding: 4px 4px 4px 24px; color: #F8F8F8; background-color: #686868; font-weight: bold; font-size: 16px;} </style>"; //$NON-NLS-1$
+ private static final String END_HEAD = "</head>"; //$NON-NLS-1$
+ private static final String START_TITLE = "<title>"; //$NON-NLS-1$
+ private static final String END_TITLE = "</title>"; //$NON-NLS-1$
+ private static final String START_LINK = "<link rel="; //$NON-NLS-1$
+ private static final String END_TAG = "/>"; //$NON-NLS-1$
+ private static final String CLOSE_TAG = ">"; //$NON-NLS-1$
+ private static final String START_BODY = "<body>"; //$NON-NLS-1$
+ private static final String END_BODY = "</body>"; //$NON-NLS-1$
+ private static final String START_HEAD_1 = "<h1>"; //$NON-NLS-1$
+ private static final String END_HEAD_1 = "</h1>"; //$NON-NLS-1$
+ private static final String START_PARAGRAPH = "<p>"; //$NON-NLS-1$
+ private static final String END_PARAGRAPH = "</p>"; //$NON-NLS-1$
+ private static final String START_A_HREF = "<a "; //$NON-NLS-1$
+ private static final String END_A_HREF = "</a>"; //$NON-NLS-1$
+ private static final String START_HEAD_2 = "<h2>"; //$NON-NLS-1$
+ private static final String END_HEAD_2 = "</h2>"; //$NON-NLS-1$
+ private static final String START_TABLE = "<table>"; //$NON-NLS-1$
+ private static final String END_TABLE = "</table>"; //$NON-NLS-1$
+ private static final String START_T_BODY = "<tbody>"; //$NON-NLS-1$
+ private static final String END_T_BODY = "</tbody>"; //$NON-NLS-1$
+ private static final String START_TR = "<tr>"; //$NON-NLS-1$
+ private static final String END_TR = "</tr>"; //$NON-NLS-1$
+ private static final String START_TD = "<td>"; //$NON-NLS-1$
+ private static final String END_TD = "</td>"; //$NON-NLS-1$
+ private static final String TYPE = "type="; //$NON-NLS-1$
+ private static final String HREF = "href="; //$NON-NLS-1$
+ private static final String TITLE = "title="; //$NON-NLS-1$
+ private static final String SPACE = " "; //$NON-NLS-1$
+ private static final String APOSTROPHE = "\""; //$NON-NLS-1$
+ private static final String CSS_REL = "stylesheet"; //$NON-NLS-1$
+ private static final String OPEN_SEARCH_REL = "search"; //$NON-NLS-1$
/**
* Sets the service document CSS path for HTML representation.
@@ -117,7 +117,7 @@
@Produces(MediaType.TEXT_HTML)
public String getServiceDocumentHtml(@Context UriInfo uriInfo) {
final String baseUri = uriInfo.getBaseUri().toString();
- final String titleValue = "Service Document"; // use
+ final String titleValue = "Service Document"; // use //$NON-NLS-1$
// Accept-Langugage
StringBuilder htmlDocStrBldr = new StringBuilder(START_HTML);
@@ -140,7 +140,7 @@
.toString();
htmlDocStrBldr.append(START_PARAGRAPH).append(START_A_HREF).append(HREF).append(APOSTROPHE)
.append(linkToAdd).append(APOSTROPHE).append(CLOSE_TAG)
- .append("View Service Document in XML format").append(END_A_HREF).append(END_PARAGRAPH);
+ .append("View Service Document in XML format").append(END_A_HREF).append(END_PARAGRAPH); //$NON-NLS-1$
// go over each workspace and print its collections
Map<String, List<ServiceDocumentCollectionData>> workspaces =
@@ -189,17 +189,17 @@
boolean isParameterOnUri = collectionHasTemplateHref(template);
htmlDocStrBldr.append(START_TR).append(START_TD).append(collectionName)
- .append(":").append(END_TD);
+ .append(":").append(END_TD); //$NON-NLS-1$
htmlDocStrBldr.append(START_TD);
if (!isParameterOnUri) { // only if parameter isn't
// included, display the path
// as link
- htmlDocStrBldr.append(" ").append(START_A_HREF).append(HREF)
+ htmlDocStrBldr.append(" ").append(START_A_HREF).append(HREF) //$NON-NLS-1$
.append(APOSTROPHE).append(colUri).append(APOSTROPHE).append(CLOSE_TAG)
.append(UriEncoder.decodeString(colUri)).append(END_A_HREF);
} else {
- htmlDocStrBldr.append(" ").append(UriEncoder
+ htmlDocStrBldr.append(" ").append(UriEncoder //$NON-NLS-1$
.decodeString(colUri));
}
htmlDocStrBldr.append(END_TD).append(END_TR);
@@ -218,7 +218,7 @@
}
private void addCssLink(StringBuilder htmlDocStrBldr) {
- if (serviceDocumentCssPath != null && !serviceDocumentCssPath.equals("")) {
+ if (serviceDocumentCssPath != null && !serviceDocumentCssPath.equals("")) { //$NON-NLS-1$
htmlDocStrBldr.append(START_LINK).append(APOSTROPHE).append(CSS_REL).append(APOSTROPHE)
.append(SPACE).append(TYPE).append(APOSTROPHE).append(TEXT_CSS).append(APOSTROPHE)
.append(SPACE).append(HREF).append(APOSTROPHE).append(serviceDocumentCssPath)
@@ -256,7 +256,7 @@
MediaTypeUtils.OPENSEARCH_TYPE)).append(APOSTROPHE);
htmlDocStrBldr.append(SPACE).append(TITLE).append(APOSTROPHE).append(record
- .getMetadata().getCollectionTitle()).append(SPACE).append("Search")
+ .getMetadata().getCollectionTitle()).append(SPACE).append("Search") //$NON-NLS-1$
.append(APOSTROPHE).append(END_TAG);
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/RootResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/RootResource.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/RootResource.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/RootResource.java Wed Mar 3 21:21:51 2010
@@ -80,7 +80,7 @@
UriInfo uriInfo) {
if (collectionList == null) {
// this should never happen
- throw new NullPointerException(Messages.getMessage("rootResourceCollectionListIsNull"));
+ throw new NullPointerException(Messages.getMessage("rootResourceCollectionListIsNull")); //$NON-NLS-1$
}
// Map of all APP workspaces
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java Wed Mar 3 21:21:51 2010
@@ -35,7 +35,7 @@
LoggerFactory
.getLogger(AbstractRestServlet.class);
- private static final String REQUEST_PROCESSOR_ATTRIBUTE = "requestProcessorAttribute";
+ private static final String REQUEST_PROCESSOR_ATTRIBUTE = "requestProcessorAttribute"; //$NON-NLS-1$
private static final long serialVersionUID = 7721777326714438571L;
private String requestProcessorAttribute;
@@ -43,7 +43,7 @@
public void init() throws ServletException {
super.init();
requestProcessorAttribute = getInitParameter(REQUEST_PROCESSOR_ATTRIBUTE);
- logger.debug("Request processor attribute is {} for {}", requestProcessorAttribute, this);
+ logger.debug("Request processor attribute is {} for {}", requestProcessorAttribute, this); //$NON-NLS-1$
}
protected RequestProcessor getRequestProcessor() {
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java Wed Mar 3 21:21:51 2010
@@ -60,15 +60,15 @@
private static final long serialVersionUID =
-5972412568762942420L;
private static final String APPLICATION_XML =
- "application/xml";
+ "application/xml"; //$NON-NLS-1$
private static final String DOCUMENT_TYPE =
- "doc";
+ "doc"; //$NON-NLS-1$
private static final String DOCUMENT_TYPE_REGISTRY =
- "registry";
+ "registry"; //$NON-NLS-1$
private static final String DOCUMENT_TYPE_RESOURCE =
- "resources";
+ "resources"; //$NON-NLS-1$
private static final String SLASH =
- "/";
+ "/"; //$NON-NLS-1$
private static final JAXBContext resourceCtx;
private static final org.apache.wink.common.internal.model.admin.ObjectFactory resourcesObjectFactory;
@@ -82,7 +82,7 @@
.getPackage().getName());
} catch (JAXBException e) {
throw new RuntimeException(Messages
- .getMessage("adminServletFailCreateJAXBForAdminServlet"), e);
+ .getMessage("adminServletFailCreateJAXBForAdminServlet"), e); //$NON-NLS-1$
}
}
@@ -93,7 +93,7 @@
RequestProcessor requestProcessor = getRequestProcessor();
if (requestProcessor == null) {
throw new ServletException(Messages
- .getMessage("adminServletRequestProcessorInitBeforeAdmin"));
+ .getMessage("adminServletRequestProcessorInitBeforeAdmin")); //$NON-NLS-1$
}
ResourceRegistry registry = requestProcessor.getConfiguration().getResourceRegistry();
@@ -168,9 +168,9 @@
UriTemplateProcessor uriTemplate = record.getTemplateProcessor();
subResource.setUri(SLASH + uriTemplate.getTemplate() + subResourceLocator.getPath());
if (isLocator) {
- subResource.setType("Locator");
+ subResource.setType("Locator"); //$NON-NLS-1$
} else {
- subResource.setType("Method");
+ subResource.setType("Method"); //$NON-NLS-1$
subResource.setMethod(subResourceLocator.getHttpMethod().toString());
}
@@ -288,7 +288,7 @@
org.apache.wink.common.internal.model.admin.Methods.Method httpMethod =
resourcesObjectFactory.createMethodsMethod();
- httpMethod.setName("Dynamic");
+ httpMethod.setName("Dynamic"); //$NON-NLS-1$
// Add consume mime types
org.apache.wink.common.internal.model.admin.AcceptMediaTypes acceptMediaTypes =
resourcesObjectFactory.createAcceptMediaTypes();
@@ -438,30 +438,30 @@
private void buildAdminHome(HttpServletResponse response) throws IOException {
PrintWriter writer = response.getWriter();
writer
- .write("<html>\r\n" + "<head>\r\n"
- + "<title>Admin Console</title>\r\n"
- + "<style type=\"text/css\" media=\"all\"> h2 { padding: 4px 4px 4px 24px; color: #333333; background-color: #D8D8D8; font-weight: bold; font-size: 16px;} h1 { padding: 4px 4px 4px 24px; color: #F8F8F8; background-color: #909090; font-weight: bold; font-size: 24px;} </style>"
- + "</head>\r\n"
- + "<body>\r\n"
- + "<form name=\"AdministrationPage\" method=\"POST\">\r\n"
- + "<div align=\"left\">\r\n"
- + "</br>\r\n"
- + "<h1>Wink Admin Console</h1>\r\n"
- + "</br>\r\n"
- + "</div>\r\n"
- + "<h2>\r\n"
- + "<a href=\"?doc="
+ .write("<html>\r\n" + "<head>\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+ + "<title>Admin Console</title>\r\n" //$NON-NLS-1$
+ + "<style type=\"text/css\" media=\"all\"> h2 { padding: 4px 4px 4px 24px; color: #333333; background-color: #D8D8D8; font-weight: bold; font-size: 16px;} h1 { padding: 4px 4px 4px 24px; color: #F8F8F8; background-color: #909090; font-weight: bold; font-size: 24px;} </style>" //$NON-NLS-1$
+ + "</head>\r\n" //$NON-NLS-1$
+ + "<body>\r\n" //$NON-NLS-1$
+ + "<form name=\"AdministrationPage\" method=\"POST\">\r\n" //$NON-NLS-1$
+ + "<div align=\"left\">\r\n" //$NON-NLS-1$
+ + "</br>\r\n" //$NON-NLS-1$
+ + "<h1>Wink Admin Console</h1>\r\n" //$NON-NLS-1$
+ + "</br>\r\n" //$NON-NLS-1$
+ + "</div>\r\n" //$NON-NLS-1$
+ + "<h2>\r\n" //$NON-NLS-1$
+ + "<a href=\"?doc=" //$NON-NLS-1$
+ DOCUMENT_TYPE_RESOURCE
- + "\"> Application resources xml view</a>->\r\n"
- + "</h2>\r\n"
- + "<h2>\r\n"
- + "<a href=\"?doc="
+ + "\"> Application resources xml view</a>->\r\n" //$NON-NLS-1$
+ + "</h2>\r\n" //$NON-NLS-1$
+ + "<h2>\r\n" //$NON-NLS-1$
+ + "<a href=\"?doc=" //$NON-NLS-1$
+ DOCUMENT_TYPE_REGISTRY
- + "\"> Wink Resource registry xml view</a>->\r\n"
- + "</h2>\r\n"
- + "</form>\r\n"
- + "</body>\r\n"
- + "</html>");
+ + "\"> Wink Resource registry xml view</a>->\r\n" //$NON-NLS-1$
+ + "</h2>\r\n" //$NON-NLS-1$
+ + "</form>\r\n" //$NON-NLS-1$
+ + "</body>\r\n" //$NON-NLS-1$
+ + "</html>"); //$NON-NLS-1$
response.setStatus(HttpStatus.BAD_REQUEST.getCode());
writer.close();
return;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestFilter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestFilter.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestFilter.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestFilter.java Wed Mar 3 21:21:51 2010
@@ -68,14 +68,14 @@
public void setStatus(int statusCode) {
super.setStatus(statusCode);
this.statusCode = statusCode;
- logger.debug("FilteredHttpServletResponse set status code to {}", statusCode);
+ logger.debug("FilteredHttpServletResponse set status code to {}", statusCode); //$NON-NLS-1$
}
@Override
public void setStatus(int statusCode, String msg) {
super.setStatus(statusCode, msg);
this.statusCode = statusCode;
- logger.debug("FilteredHttpServletResponse set status code to {}", statusCode);
+ logger.debug("FilteredHttpServletResponse set status code to {}", statusCode); //$NON-NLS-1$
}
int getStatusCode() {
@@ -102,7 +102,7 @@
* invoked
*/
logger
- .debug("Filter {} did not match a resource so letting request continue on FilterChain {}",
+ .debug("Filter {} did not match a resource so letting request continue on FilterChain {}", //$NON-NLS-1$
this,
chain);
httpServletResponse.setStatus(HttpServletResponse.SC_OK);
@@ -110,7 +110,7 @@
}
} else {
logger
- .debug("Filter {} did not expect a non-HttpServletRequest and/or non-HttpServletResponse but letting chain continue");
+ .debug("Filter {} did not expect a non-HttpServletRequest and/or non-HttpServletResponse but letting chain continue"); //$NON-NLS-1$
chain.doFilter(servletRequest, servletResponse);
}
}
@@ -138,7 +138,7 @@
public void init(final FilterConfig filterConfig) throws ServletException {
restServlet = new RestServletForFilter(filterConfig);
- logger.debug("Initializing RestFilter {} with {} config and {} servlet", new Object[] {
+ logger.debug("Initializing RestFilter {} with {} config and {} servlet", new Object[] { //$NON-NLS-1$
this, filterConfig, restServlet});
restServlet.init(new ServletConfig() {
@@ -161,7 +161,7 @@
}
public void destroy() {
- logger.debug("Destroying RestFilter {}", this);
+ logger.debug("Destroying RestFilter {}", this); //$NON-NLS-1$
restServlet.destroy();
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Wed Mar 3 21:21:51 2010
@@ -67,16 +67,16 @@
private static final Logger logger =
LoggerFactory
.getLogger(RestServlet.class);
- private static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application";
- private static final String PROPERTIES_DEFAULT_FILE = "META-INF/wink-default.properties";
- private static final String PROPERTIES_INIT_PARAM = "propertiesLocation";
- private static final String APP_LOCATION_PARAM = "applicationConfigLocation";
- private static final String DEPLYMENT_CONF_PARAM = "deploymentConfiguration";
+ private static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application"; //$NON-NLS-1$
+ private static final String PROPERTIES_DEFAULT_FILE = "META-INF/wink-default.properties"; //$NON-NLS-1$
+ private static final String PROPERTIES_INIT_PARAM = "propertiesLocation"; //$NON-NLS-1$
+ private static final String APP_LOCATION_PARAM = "applicationConfigLocation"; //$NON-NLS-1$
+ private static final String DEPLYMENT_CONF_PARAM = "deploymentConfiguration"; //$NON-NLS-1$
@Override
public void init() throws ServletException {
- logger.debug("Initializing {} servlet", this);
+ logger.debug("Initializing {} servlet", this); //$NON-NLS-1$
try {
super.init();
@@ -90,7 +90,7 @@
requestProcessor = createRequestProcessor();
if (requestProcessor == null) {
throw new IllegalStateException(Messages
- .getMessage("restServletRequestProcessorCouldNotBeCreated"));
+ .getMessage("restServletRequestProcessorCouldNotBeCreated")); //$NON-NLS-1$
}
storeRequestProcessorOnServletContext(requestProcessor);
}
@@ -131,10 +131,10 @@
protected Properties getProperties() throws IOException {
Properties defaultProperties = loadProperties(PROPERTIES_DEFAULT_FILE, null);
- logger.debug("Default properties {} used in RestServlet {}", defaultProperties, this);
+ logger.debug("Default properties {} used in RestServlet {}", defaultProperties, this); //$NON-NLS-1$
String propertiesLocation = getInitParameter(PROPERTIES_INIT_PARAM);
if (propertiesLocation != null) {
- logger.info(Messages.getMessage("restServletUsePropertiesFileAtLocation",
+ logger.info(Messages.getMessage("restServletUsePropertiesFileAtLocation", //$NON-NLS-1$
propertiesLocation,
PROPERTIES_INIT_PARAM));
@@ -144,7 +144,7 @@
properties.putAll(WinkSystemProperties.loadSystemProperties(properties));
return properties;
}
- logger.debug("Final properties {} used in RestServlet {}", defaultProperties, this);
+ logger.debug("Final properties {} used in RestServlet {}", defaultProperties, this); //$NON-NLS-1$
// Load properties set on JVM. These should not override
// the ones set in the configuration file.
@@ -157,7 +157,7 @@
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String initParameter = getInitParameter(DEPLYMENT_CONF_PARAM);
if (initParameter != null) {
- logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam",
+ logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam", //$NON-NLS-1$
initParameter,
DEPLYMENT_CONF_PARAM));
// use ClassUtils.loadClass instead of Class.forName so we have
@@ -174,7 +174,7 @@
Class<? extends Application> appClass = null;
String initParameter = getInitParameter(APPLICATION_INIT_PARAM);
if (initParameter != null) {
- logger.info(Messages.getMessage("restServletJAXRSApplicationInitParam",
+ logger.info(Messages.getMessage("restServletJAXRSApplicationInitParam", //$NON-NLS-1$
initParameter,
APPLICATION_INIT_PARAM));
// use ClassUtils.loadClass instead of Class.forName so we have
@@ -225,7 +225,7 @@
is.close();
}
} catch (IOException e) {
- logger.warn(Messages.getMessage("exceptionClosingFile") + ": " + resourceName, e);
+ logger.warn(Messages.getMessage("exceptionClosingFile") + ": " + resourceName, e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/WebSphereParametersFilter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/WebSphereParametersFilter.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/WebSphereParametersFilter.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/WebSphereParametersFilter.java Wed Mar 3 21:21:51 2010
@@ -50,7 +50,7 @@
public class WebSphereParametersFilter implements Filter {
public static final String CONTENT_TYPE_WWW_FORM_URLENCODED =
- "application/x-www-form-urlencoded";
+ "application/x-www-form-urlencoded"; //$NON-NLS-1$
public void init(FilterConfig filterConfig) throws ServletException {
}
@@ -110,7 +110,7 @@
*/
private static void parseQuery(Map<String, List<String>> paramMap, String query) {
- StringTokenizer tokenizer = new StringTokenizer(query, "&");
+ StringTokenizer tokenizer = new StringTokenizer(query, "&"); //$NON-NLS-1$
while (tokenizer.hasMoreTokens()) {
String name;
@@ -123,7 +123,7 @@
value = UriEncoder.decodeString(token.substring(equal + 1));
} else {
name = UriEncoder.decodeString(token);
- value = "";
+ value = ""; //$NON-NLS-1$
}
List<String> values = paramMap.get(name);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/AbstractLinksBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/AbstractLinksBuilderImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/AbstractLinksBuilderImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/AbstractLinksBuilderImpl.java Wed Mar 3 21:21:51 2010
@@ -126,8 +126,8 @@
private void initRelativize() {
relativize =
- Boolean.parseBoolean(context.getProperties().getProperty("wink.defaultUrisRelative",
- "true"));
+ Boolean.parseBoolean(context.getProperties().getProperty("wink.defaultUrisRelative", //$NON-NLS-1$
+ "true")); //$NON-NLS-1$
String relative =
context.getUriInfo().getQueryParameters(false)
.getFirst(RestConstants.REST_PARAM_RELATIVE_URLS);
@@ -138,7 +138,7 @@
private void initAddAltParam() {
addAltParam =
- Boolean.parseBoolean(context.getProperties().getProperty("wink.addAltParam", "true"));
+ Boolean.parseBoolean(context.getProperties().getProperty("wink.addAltParam", "true")); //$NON-NLS-1$ //$NON-NLS-2$
}
@SuppressWarnings("unchecked")
@@ -214,7 +214,7 @@
builder = UriBuilder.fromUri(baseUri);
// special treatment if the path resulting from the base uri equals
// "/"
- if (baseUri.getPath() != null && baseUri.getPath().equals("/")) {
+ if (baseUri.getPath() != null && baseUri.getPath().equals("/")) { //$NON-NLS-1$
builder.replacePath(path);
} else {
builder.path(path);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/SystemLinksBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/SystemLinksBuilderImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/SystemLinksBuilderImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/SystemLinksBuilderImpl.java Wed Mar 3 21:21:51 2010
@@ -57,7 +57,7 @@
protected boolean isContinuedSearchMode() {
return Boolean.valueOf(context.getProperties()
- .getProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "false"));
+ .getProperty(FindRootResourceHandler.SEARCH_POLICY_CONTINUED_SEARCH_KEY, "false")); //$NON-NLS-1$
}
public SystemLinksBuilder types(LinkType... types) {
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java Wed Mar 3 21:21:51 2010
@@ -47,7 +47,7 @@
CreationUtils.injectFields(bean, classMetadata, RuntimeContextTLS
.getRuntimeContext());
} catch (Exception e) {
- logger.error(Messages.getMessage("springExceptionOccurredDuringFieldInject"),
+ logger.error(Messages.getMessage("springExceptionOccurredDuringFieldInject"), //$NON-NLS-1$
e);
throw new WebApplicationException(e);
}
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java Wed Mar 3 21:21:51 2010
@@ -90,10 +90,10 @@
.isProvider(cls)) {
SpringObjectFactory old = class2factory.put(cls, objectFactory);
if (old != null) {
- logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory", cls));
+ logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory", cls)); //$NON-NLS-1$
}
} else {
- logger.warn(Messages.getMessage("springBeanNotResourceNorProvider", beanName, cls));
+ logger.warn(Messages.getMessage("springBeanNotResourceNorProvider", beanName, cls)); //$NON-NLS-1$
}
}
@@ -104,10 +104,10 @@
dynResource.setBeanName(beanName);
SpringObjectFactory old = id2factory.put(beanName, objectFactory);
if (old != null) {
- logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory", beanName));
+ logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory", beanName)); //$NON-NLS-1$
}
} else {
- logger.warn(Messages.getMessage("springBeanClassNotDynamicResource", beanName, cls));
+ logger.warn(Messages.getMessage("springBeanClassNotDynamicResource", beanName, cls)); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVConstants.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVConstants.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVConstants.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVConstants.java Wed Mar 3 21:21:51 2010
@@ -33,38 +33,38 @@
private WebDAVConstants() {
} // no instances
- public static final String NAMESPACE_DAV = "DAV:";
+ public static final String NAMESPACE_DAV = "DAV:"; //$NON-NLS-1$
public static final QName PROPERTY_CREATIONDATE =
new QName(NAMESPACE_DAV,
- "creationdate");
+ "creationdate"); //$NON-NLS-1$
public static final QName PROPERTY_DISPLAYNAME =
new QName(NAMESPACE_DAV,
- "displayname");
+ "displayname"); //$NON-NLS-1$
public static final QName PROPERTY_GETCONTENTLANGUAGE =
new QName(NAMESPACE_DAV,
- "getcontentlanguage");
+ "getcontentlanguage"); //$NON-NLS-1$
public static final QName PROPERTY_GETCONTENTLENGTH =
new QName(NAMESPACE_DAV,
- "getcontentlength");
+ "getcontentlength"); //$NON-NLS-1$
public static final QName PROPERTY_GETCONTENTTYPE =
new QName(NAMESPACE_DAV,
- "getcontenttype");
+ "getcontenttype"); //$NON-NLS-1$
public static final QName PROPERTY_GETETAG =
new QName(NAMESPACE_DAV,
- "getetag");
+ "getetag"); //$NON-NLS-1$
public static final QName PROPERTY_GETLASTMODIFIED =
new QName(NAMESPACE_DAV,
- "getlastmodified");
+ "getlastmodified"); //$NON-NLS-1$
public static final QName PROPERTY_LOCKDISCOVERY =
new QName(NAMESPACE_DAV,
- "lockdiscovery");
+ "lockdiscovery"); //$NON-NLS-1$
public static final QName PROPERTY_RESOURCETYPE =
new QName(NAMESPACE_DAV,
- "resourcetype");
+ "resourcetype"); //$NON-NLS-1$
public static final QName PROPERTY_SUPPORTEDLOCK =
new QName(NAMESPACE_DAV,
- "supportedlock");
+ "supportedlock"); //$NON-NLS-1$
public static final Set<QName> PROPERTIES_SET = new HashSet<QName>();
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVHeaders.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVHeaders.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVHeaders.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVHeaders.java Wed Mar 3 21:21:51 2010
@@ -22,18 +22,18 @@
public final class WebDAVHeaders {
- public static final String DAV = "DAV";
- public static final String DEPTH = "Depth";
- public static final String OVERWRITE = "Overwrite";
- public static final String DESTINATION = "Destination";
- public static final String IF = "If";
- public static final String LOCK_TOKEN = "Lock-Token";
- public static final String TIMEOUT = "Timeout";
+ public static final String DAV = "DAV"; //$NON-NLS-1$
+ public static final String DEPTH = "Depth"; //$NON-NLS-1$
+ public static final String OVERWRITE = "Overwrite"; //$NON-NLS-1$
+ public static final String DESTINATION = "Destination"; //$NON-NLS-1$
+ public static final String IF = "If"; //$NON-NLS-1$
+ public static final String LOCK_TOKEN = "Lock-Token"; //$NON-NLS-1$
+ public static final String TIMEOUT = "Timeout"; //$NON-NLS-1$
/**
* Microsoft <a
* href="http://msdn.microsoft.com/en-us/library/cc250217.aspx">
* authorization header</a>
*/
- public static final String MS_AUTHOR_VIA = "MS-Author-Via";
+ public static final String MS_AUTHOR_VIA = "MS-Author-Via"; //$NON-NLS-1$
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Multistatus.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Multistatus.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Multistatus.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Multistatus.java Wed Mar 3 21:21:51 2010
@@ -176,7 +176,7 @@
public static Multistatus unmarshal(Reader reader) throws IOException {
Unmarshaller unmarshaller = WebDAVModelHelper.createUnmarshaller();
Multistatus instance =
- WebDAVModelHelper.unmarshal(unmarshaller, reader, Multistatus.class, "multistatus");
+ WebDAVModelHelper.unmarshal(unmarshaller, reader, Multistatus.class, "multistatus"); //$NON-NLS-1$
return instance;
}
@@ -189,7 +189,7 @@
*/
public static void marshal(Multistatus instance, Writer writer) throws IOException {
Marshaller marshaller = WebDAVModelHelper.createMarshaller();
- WebDAVModelHelper.marshal(marshaller, instance, writer, "multistatus");
+ WebDAVModelHelper.marshal(marshaller, instance, writer, "multistatus"); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/ObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/ObjectFactory.java Wed Mar 3 21:21:51 2010
@@ -44,15 +44,15 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _Status_QNAME = new QName("DAV:", "status");
- private final static QName _Depth_QNAME = new QName("DAV:", "depth");
- private final static QName _Dst_QNAME = new QName("DAV:", "dst");
+ private final static QName _Status_QNAME = new QName("DAV:", "status"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Depth_QNAME = new QName("DAV:", "depth"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Dst_QNAME = new QName("DAV:", "dst"); //$NON-NLS-1$ //$NON-NLS-2$
private final static QName _Responsedescription_QNAME =
- new QName("DAV:",
- "responsedescription");
- private final static QName _Timeout_QNAME = new QName("DAV:", "timeout");
- private final static QName _Src_QNAME = new QName("DAV:", "src");
- private final static QName _Href_QNAME = new QName("DAV:", "href");
+ new QName("DAV:", //$NON-NLS-1$
+ "responsedescription"); //$NON-NLS-1$
+ private final static QName _Timeout_QNAME = new QName("DAV:", "timeout"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Src_QNAME = new QName("DAV:", "src"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Href_QNAME = new QName("DAV:", "href"); //$NON-NLS-1$ //$NON-NLS-2$
/**
* Create a new ObjectFactory that can be used to create new instances of
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Prop.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Prop.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Prop.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Prop.java Wed Mar 3 21:21:51 2010
@@ -301,7 +301,7 @@
String elementName = element.getLocalName();
String elementNamespaceURI = element.getNamespaceURI();
if (elementNamespaceURI == null) {
- elementNamespaceURI = "";
+ elementNamespaceURI = ""; //$NON-NLS-1$
}
if (elementNamespaceURI.equals(namespaceURI) && elementName.equals(name)) {
return element;
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propertyupdate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propertyupdate.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propertyupdate.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propertyupdate.java Wed Mar 3 21:21:51 2010
@@ -159,7 +159,7 @@
WebDAVModelHelper.unmarshal(unmarshaller,
reader,
Propertyupdate.class,
- "propertyupdate");
+ "propertyupdate"); //$NON-NLS-1$
return instance;
}
@@ -172,7 +172,7 @@
*/
public static void marshal(Propertyupdate instance, Writer writer) throws IOException {
Marshaller marshaller = WebDAVModelHelper.createMarshaller();
- WebDAVModelHelper.marshal(marshaller, instance, writer, "propertyupdate");
+ WebDAVModelHelper.marshal(marshaller, instance, writer, "propertyupdate"); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propfind.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propfind.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propfind.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propfind.java Wed Mar 3 21:21:51 2010
@@ -158,7 +158,7 @@
public static Propfind unmarshal(Reader reader) throws IOException {
Unmarshaller unmarshaller = WebDAVModelHelper.createUnmarshaller();
Propfind instance =
- WebDAVModelHelper.unmarshal(unmarshaller, reader, Propfind.class, "propfind");
+ WebDAVModelHelper.unmarshal(unmarshaller, reader, Propfind.class, "propfind"); //$NON-NLS-1$
return instance;
}
@@ -171,7 +171,7 @@
*/
public static void marshal(Propfind instance, Writer writer) throws IOException {
Marshaller marshaller = WebDAVModelHelper.createMarshaller();
- WebDAVModelHelper.marshal(marshaller, instance, writer, "propfind");
+ WebDAVModelHelper.marshal(marshaller, instance, writer, "propfind"); //$NON-NLS-1$
}
}