You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2005/05/07 18:11:42 UTC
svn commit: r169091 [4/5] - in
/struts/core/trunk/src/share/org/apache/struts: ./ action/ actions/ chain/
chain/commands/ chain/commands/generic/ chain/commands/servlet/
chain/commands/util/ chain/contexts/ config/ config/impl/ mock/ plugins/
upload/ util/ validator/ validator/validwhen/
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockEnumeration.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockEnumeration.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockEnumeration.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockEnumeration.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,16 +38,16 @@
* or throw an Exception
*/
private boolean throwException = false;
-
-
+
+
private boolean returnNulls = false;
private String defaultValue;
private Double defaultDouble;
private int arrayCount;
protected boolean booleanProperty = false;
-
+
// ------------------- Constructors
-
+
public MockFormBean() {
this(null);
}
@@ -57,48 +57,48 @@
this.throwException = throwException;
this.returnNulls = returnNulls;
}
-
+
public MockFormBean(boolean throwException){
this.throwException = throwException;
}
-
- public MockFormBean(boolean throwException,
+
+ public MockFormBean(boolean throwException,
boolean returnNulls, String defaultValue){
this(throwException, returnNulls);
this.defaultValue = defaultValue;
-
+
}
public MockFormBean(String stringProperty) {
this.stringProperty = stringProperty;
}
- public MockFormBean(boolean throwException,
+ public MockFormBean(boolean throwException,
boolean returnNulls, String defaultValue, int arrayCount){
this(throwException, returnNulls, defaultValue);
this.arrayCount = arrayCount;
-
+
}
-
- public MockFormBean(boolean throwException,
+
+ public MockFormBean(boolean throwException,
boolean returnNulls, Double defaultDouble){
this(throwException, returnNulls);
this.defaultDouble = defaultDouble;
-
+
}
-
+
// ------------------- public methods
-
+
public String getJustThrowAnException() throws Exception{
throw new Exception();
}
-
+
public Object getThrowIllegalAccessException() throws Exception{
if (true)
throw new IllegalAccessException();
return null;
}
-
+
public String getStringValue() throws Exception{
if (throwException)
throw new Exception();
@@ -112,7 +112,7 @@
throw new Exception();
if (returnNulls)
return null;
-
+
String[] rtn = new String[arrayCount];
for (int i = 0; i < rtn.length; i++) {
rtn[i] = defaultValue + i;
@@ -126,7 +126,7 @@
if (returnNulls)
return null;
return defaultDouble;
-
+
}
public boolean getBooleanProperty() {
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletRequest.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletRequest.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletRequest.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletRequest.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -302,7 +302,7 @@
public HttpSession getSession( boolean create ) {
if (create && (session == null)) {
session = new MockHttpSession();
-
+
// modified to act like the real deal,
// call with (false) if you want null
// throw new UnsupportedOperationException();
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletResponse.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletResponse.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletResponse.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockHttpServletResponse.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockHttpSession.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockHttpSession.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockHttpSession.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockHttpSession.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -68,7 +68,7 @@
private boolean throwIOException;
private boolean returnBodyContent;
-
+
@@ -88,9 +88,9 @@
/**
* Construct a new PageContext impl.
- * @param throwIOException Determines if the returned JspWriter should
+ * @param throwIOException Determines if the returned JspWriter should
* throw an IOException on any method call.
- * @param returnBody Determines if getOut() should return a new
+ * @param returnBody Determines if getOut() should return a new
* <code>JspWriter</code> or a <code>BodyContent</code>.
*/
public MockPageContext(boolean throwIOException, boolean returnBody){
@@ -226,8 +226,8 @@
/**
- * Custom JspWriter that throws the specified exception
- * (supplied on the constructor...if any), else it simply
+ * Custom JspWriter that throws the specified exception
+ * (supplied on the constructor...if any), else it simply
* returns.
*/
public JspWriter getOut() {
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockPrincipal.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockPrincipal.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockPrincipal.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockPrincipal.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockServletConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockServletConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockServletConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockServletConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockServletContext.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockServletContext.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockServletContext.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockServletContext.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/mock/TestMockBase.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/TestMockBase.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/TestMockBase.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/TestMockBase.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/plugins/DigestingPlugIn.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/plugins/DigestingPlugIn.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/plugins/DigestingPlugIn.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/plugins/DigestingPlugIn.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2003,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,60 +31,60 @@
* class will be removed after Struts 1.2.
*/
public class BufferedMultipartInputStream extends InputStream {
-
+
/**
* The underlying InputStream used by this class
*/
protected InputStream inputStream;
-
+
/**
* The byte array used to hold buffered data
*/
protected byte[] buffer;
-
+
/**
* The current offset we're at in the buffer's byte array
*/
protected int bufferOffset = 0;
-
+
/**
* The size of the byte array buffer
*/
protected int bufferSize = 8192;
-
+
/**
* The number of bytes read from the underlying InputStream that are
* in the buffer
*/
protected int bufferLength = 0;
-
+
/**
* The total number of bytes read so far
*/
protected int totalLength = 0;
-
+
/**
* The content length of the multipart data
*/
protected long contentLength;
-
+
/**
* The maximum allowed size for the multipart data, or -1 for an unlimited
* maximum file length
*/
protected long maxSize = -1;
-
+
/**
* Whether or not bytes up to the Content-Length have been read
*/
protected boolean contentLengthMet = false;
-
+
/**
* Whether or not bytes up to the maximum length have been read
*/
protected boolean maxLengthMet = false;
-
-
+
+
/**
* Public constructor for this class, just wraps the InputStream
* given
@@ -102,14 +102,14 @@
this.bufferSize = bufferSize;
this.contentLength = contentLength;
this.maxSize = maxSize;
-
+
if ((maxSize != -1) && (maxSize < contentLength)) {
throw new MaxLengthExceededException(maxSize);
}
buffer = new byte[bufferSize];
fill();
}
-
+
/**
* This method returns the number of available bytes left to read
* in the buffer before it has to be refilled
@@ -117,50 +117,50 @@
public int available() {
return bufferLength - bufferOffset;
}
-
+
/**
* This method attempts to close the underlying InputStream
*/
public void close() throws IOException {
inputStream.close();
}
-
+
/**
* This method calls on the mark() method of the underlying InputStream
*/
public void mark(int position) {
- inputStream.mark(position);
- }
-
+ inputStream.mark(position);
+ }
+
/**
* This method calls on the markSupported() method of the underlying InputStream
* @return Whether or not the underlying InputStream supports marking
*/
public boolean markSupported() {
- return inputStream.markSupported();
+ return inputStream.markSupported();
}
-
+
/**
* @return true if the maximum length has been reached, false otherwise
*/
public boolean maxLengthMet() {
return maxLengthMet;
}
-
+
/**
* @return true if the content length has been reached, false otherwise
*/
public boolean contentLengthMet() {
return contentLengthMet;
}
-
+
/**
* This method returns the next byte in the buffer, and refills it if necessary.
* @return The next byte read in the buffer, or -1 if the end of the stream has
* been reached
*/
public int read() throws IOException {
-
+
if (maxLengthMet) {
throw new MaxLengthExceededException(maxSize);
}
@@ -170,34 +170,34 @@
if (buffer == null) {
return -1;
}
-
- if (bufferOffset < bufferLength) {
- return (int)(char) buffer[bufferOffset++];
+
+ if (bufferOffset < bufferLength) {
+ return (int)(char) buffer[bufferOffset++];
}
fill();
- return read();
+ return read();
}
-
+
/**
* This method populates the byte array <code>b</code> with data up to
* <code>b.length</code> bytes
*/
public int read(byte[] b) throws IOException {
- return read(b, 0, b.length);
+ return read(b, 0, b.length);
}
-
+
/**
- * This method populates the byte array <code>b</code> with data up to
+ * This method populates the byte array <code>b</code> with data up to
* <code>length</code> starting at b[offset]
*/
public int read(byte[] b, int offset, int length) throws IOException {
-
+
int count = 0;
int read = read();
if (read == -1) {
return -1;
}
-
+
while ((read != -1) && (count < length)) {
b[offset] = (byte) read;
read = read();
@@ -206,20 +206,20 @@
}
return count;
}
-
+
/**
* This method reads into the byte array <code>b</code> until
* a newline ('\n') character is encountered or the number of bytes
* specified by <code>length</code> have been read
*/
public int readLine(byte[] b, int offset, int length) throws IOException {
-
+
int count = 0;
int read = read();
if (read == -1) {
return -1;
}
-
+
while ((read != -1) && (count < length)) {
if (read == '\n')
break;
@@ -257,7 +257,7 @@
* InputStream
*/
public void reset() throws IOException {
- inputStream.reset();
+ inputStream.reset();
}
/**
@@ -291,7 +291,7 @@
else {
bufferLength = bytesRead;
totalLength += bytesRead;
- bufferOffset = 0;
+ bufferOffset = 0;
}
}
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -329,7 +329,7 @@
if (multiplier != 1) {
sizeString = sizeString.substring(0, sizeString.length() - 1);
}
-
+
long size = 0;
try {
size = Long.parseLong(sizeString);
@@ -339,7 +339,7 @@
size = defaultSize;
multiplier = 1;
}
-
+
return (size * multiplier);
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/ContentLengthExceededException.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/ContentLengthExceededException.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/ContentLengthExceededException.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/ContentLengthExceededException.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,19 +28,19 @@
* class will be removed after Struts 1.2.
*/
public class ContentLengthExceededException extends IOException {
-
+
protected String message;
-
+
public ContentLengthExceededException() {
message = "The Content-Length has been exceeded for this request";
}
-
+
public ContentLengthExceededException(long contentLength) {
-
+
message = "The Content-Length of " + contentLength + " bytes has been " +
"exceeded";
}
-
+
public String getMessage() {
return message;
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/DiskFile.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/DiskFile.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/DiskFile.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/DiskFile.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,102 +30,102 @@
* class will be removed after Struts 1.2.
*/
public class DiskFile implements FormFile {
-
+
/**
* The filepath to the temporary file
*/
protected String filePath;
-
+
/**
* The content type of the file
*/
protected String contentType;
-
+
/**
* The size in bytes of the file
*/
protected int fileSize;
-
+
/**
* The name of the file
*/
- protected String fileName;
-
+ protected String fileName;
+
public DiskFile(String filePath) {
this.filePath = filePath;
}
-
+
/**
* Attempt to read the temporary file and get it's data in byte
* array form. Tries to read the entire file (using a byte array
* the size of getFileSize()) at once, in one call to FileInputStream.read(byte[]).
* For buffered reading, see {@link #getFileData(int) getFileData(int)}.
* Note that this method can be dangerous, and that the size of a file
- * can cause an OutOfMemoryError quite easily. You should use
+ * can cause an OutOfMemoryError quite easily. You should use
* {@link #getInputStream() getInputStream} and do your own thing.
*
* @exception FileNotFoundException If the temp file no longer exists
* @exception IOException if there is some sort of IO problem.
* @see #getFileData(int)
- */
+ */
public byte[] getFileData() throws FileNotFoundException, IOException {
-
+
byte[] bytes = new byte[getFileSize()];
-
+
FileInputStream fis = new FileInputStream(filePath);
fis.read(bytes);
fis.close();
return bytes;
}
-
+
/**
* Attempts to read a file n bytes at a time, n being equal to "bufferSize".
* Note that this method can be dangerous, and that the size of a file
- * can cause an OutOfMemoryError quite easily. You should use
+ * can cause an OutOfMemoryError quite easily. You should use
* {@link #getInputStream() getInputStream} and do your own thing.
*
* @param bufferSize The size in bytes that are read from the file at a time
* @exception FileNotFoundException If the temp file no longer exists
- */
+ */
public byte[] getFileData(int bufferSize) throws FileNotFoundException, IOException {
-
+
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
FileInputStream fis = new FileInputStream(filePath);
-
+
int readLength = 0;
int totalLength = 0;
int offset = 0;
-
+
byte[] bytes = new byte[bufferSize];
-
+
while ((readLength = fis.read(bytes, offset, bufferSize)) != -1) {
-
- byteStream.write(bytes, offset, bufferSize);
+
+ byteStream.write(bytes, offset, bufferSize);
totalLength += readLength;
offset += readLength;
}
-
+
bytes = byteStream.toByteArray();
-
+
fis.close();
byteStream.close();
-
- return bytes;
+
+ return bytes;
}
-
-
+
+
/**
* Delete the temporary file.
*/
public void destroy() {
-
+
File tempFile = new File(filePath);
-
+
if (tempFile.exists()) {
tempFile.delete();
- }
+ }
}
-
+
/**
* Get the temporary file path for this form file
* @return A filepath to the temporary file
@@ -133,21 +133,21 @@
public String getFilePath() {
return filePath;
}
-
+
/**
* Set the file name
*/
public void setFileName(String filename) {
this.fileName = filename;
}
-
+
/**
* Set the content type
*/
public void setContentType(String contentType) {
this.contentType = contentType;
}
-
+
/**
* Set the file size
* @param fileSize The size of the file in bytes
@@ -155,21 +155,21 @@
public void setFileSize(int fileSize) {
this.fileSize = fileSize;
}
-
+
/**
* Get the file name
*/
public String getFileName() {
return fileName;
}
-
+
/**
* Get the content type
*/
public String getContentType() {
return contentType;
}
-
+
/**
* Get the file size
* @return The size of this file in bytes
@@ -177,7 +177,7 @@
public int getFileSize() {
return fileSize;
}
-
+
/**
* Returns a FileInputStream to the file
*/
Modified: struts/core/trunk/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -88,7 +88,7 @@
public void handleRequest(HttpServletRequest request) throws ServletException {
ModuleConfig moduleConfig = ModuleUtils.getInstance().getModuleConfig(request);
this.retrieveTempDir(moduleConfig);
-
+
try {
MultipartIterator iterator =
new MultipartIterator(
@@ -96,7 +96,7 @@
moduleConfig.getControllerConfig().getBufferSize(),
getMaxSize(moduleConfig.getControllerConfig().getMaxFileSize()),
tempDir);
-
+
MultipartElement element;
textElements = new Hashtable();
@@ -110,12 +110,12 @@
createDiskFile(element);
}
}
-
+
//take care of maximum length being exceeded
if (iterator.isMaxLengthExceeded()) {
request.setAttribute(MultipartRequestHandler.ATTRIBUTE_MAX_LENGTH_EXCEEDED, Boolean.TRUE);
}
-
+
} catch(IOException ioe) {
throw new ServletException(ioe);
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,28 +38,28 @@
* @return A String representing content type.
*/
public String getContentType();
-
+
/**
* Sets the content type for this file.
*
* @param contentType The content type for the file.
*/
public void setContentType(String contentType);
-
+
/**
* Returns the size of this file.
*
* @return The size of the file, in bytes.
*/
public int getFileSize();
-
+
/**
* Sets the file size.
*
* @param fileSize The size of the file, in bytes,
*/
- public void setFileSize(int fileSize);
-
+ public void setFileSize(int fileSize);
+
/**
* Returns the file name of this file. This is the base name of the file,
* as supplied by the user when the file was uploaded.
@@ -67,14 +67,14 @@
* @return The base file name.
*/
public String getFileName();
-
+
/**
* Sets the file name of this file.
*
* @param fileName The base file name.
*/
public void setFileName(String fileName);
-
+
/**
* Returns the data for the entire file as byte array. Care is needed when
* using this method, since a large upload could easily exhaust available
@@ -89,7 +89,7 @@
*/
public byte[] getFileData()
throws FileNotFoundException, IOException;
-
+
/**
* Returns an input stream for this file. The caller must close the
* stream when it is no longer needed.
@@ -100,10 +100,10 @@
*/
public InputStream getInputStream()
throws FileNotFoundException, IOException;
-
+
/**
* Destroys all content for the uploaded file, including any underlying
* data files.
*/
- public void destroy();
+ public void destroy();
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MaxLengthExceededException.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MaxLengthExceededException.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MaxLengthExceededException.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MaxLengthExceededException.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,19 +28,19 @@
* class will be removed after Struts 1.2.
*/
public class MaxLengthExceededException extends IOException {
-
+
protected String message;
-
+
public MaxLengthExceededException() {
message = "The maximum length has been exceeded for this request";
}
-
+
public MaxLengthExceededException(long maxLength) {
-
+
message = "The maximum length of " + maxLength + " bytes has been " +
"exceeded";
}
-
+
public String getMessage() {
return message;
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -80,7 +80,7 @@
* values of the request input parameters
*/
public Hashtable getTextElements();
-
+
/**
* This method is called on to retrieve all the FormFile
* input elements of the request.
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestWrapper.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestWrapper.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestWrapper.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,22 +50,22 @@
* HttpServletRequest object.
*/
public class MultipartRequestWrapper implements HttpServletRequest {
-
+
/**
* The parameters for this multipart request
*/
protected Map parameters;
-
+
/**
* The underlying HttpServletRequest
*/
protected HttpServletRequest request;
-
+
public MultipartRequestWrapper(HttpServletRequest request) {
this.request = request;
this.parameters = new HashMap();
}
-
+
/**
* Sets a parameter for this request. The parameter is actually
* separate from the request parameters, but calling on the
@@ -79,10 +79,10 @@
String[] newValue = new String[mValue.length + 1];
System.arraycopy(mValue, 0, newValue, 0, mValue.length);
newValue[mValue.length] = value;
-
+
parameters.put(name, newValue);
}
-
+
/**
* Attempts to get a parameter for this request. It first looks in the
* underlying HttpServletRequest object for the parameter, and if that
@@ -99,7 +99,7 @@
}
return value;
}
-
+
/**
* Returns the names of the parameters for this request.
* The enumeration consists of the normal request parameter
@@ -118,7 +118,7 @@
}
return Collections.enumeration(list);
}
-
+
public String[] getParameterValues(String name) {
String[] value = request.getParameterValues(name);
if (value == null) {
@@ -126,14 +126,14 @@
}
return value;
}
-
+
/**
* Returns the underlying HttpServletRequest for this wrapper
*/
public HttpServletRequest getRequest() {
return request;
}
-
+
//WRAPPER IMPLEMENTATIONS OF SERVLET REQUEST METHODS
public Object getAttribute(String name) {
return request.getAttribute(name);
@@ -195,7 +195,7 @@
public String getRealPath(String path) {
return request.getRealPath(path);
}
-
+
//WRAPPER IMPLEMENTATIONS OF HTTPSERVLETREQUEST METHODS
public String getAuthType() {
return request.getAuthType();
@@ -266,7 +266,7 @@
public boolean isRequestedSessionIdFromUrl() {
return request.isRequestedSessionIdFromUrl();
}
-
+
//SERVLET 2.3 EMPTY METHODS
/**
* This method returns null. To use any Servlet 2.3 methods,
@@ -300,12 +300,12 @@
public boolean isRequestedSessionIdFromCookie() {
return false;
}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
}
Modified: struts/core/trunk/src/share/org/apache/struts/upload/MultipartValueStream.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartValueStream.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartValueStream.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartValueStream.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
import javax.servlet.ServletException;
/**
- * This class implements an inputStream that reads another stream until
+ * This class implements an inputStream that reads another stream until
* a multipart boundary is found. The class reports eof when boundary found.
* The undelying stream is not closed.
*
@@ -44,7 +44,7 @@
/** the underlying stream */
private InputStream in;
-
+
/** byte buffer with the boundary */
private byte boundaryBytes[];
@@ -72,7 +72,7 @@
*
* NOTE: the boundary parameter is without the trailing dashes "--".
*/
- public MultipartValueStream(InputStream in, String boundary)
+ public MultipartValueStream(InputStream in, String boundary)
throws IOException
{
this.in = in;
@@ -100,8 +100,8 @@
readAheadBufferStartI = 0;
readAheadBufferEndI = readAheadBytes.length - 1;
}
-
-
+
+
/**
* Read the next byte
*
@@ -118,7 +118,7 @@
boundaryReached = true;
- /*
+ /*
* Boundary found...
*
* Read two more bytes:
@@ -152,11 +152,11 @@
return -1;
}
-
- /*
- * Might seem odd, but we are supposed to return
+
+ /*
+ * Might seem odd, but we are supposed to return
* a byte as an int in range 0 - 255, and the byte type
- * is signed (-128 to 127)
+ * is signed (-128 to 127)
*
*/
int returnByte = (int)(char) readAheadBytes[readAheadBufferStartI];
@@ -198,8 +198,8 @@
* @exception ServletException if the boundary has not yet been reached
*/
- public boolean encounteredFinalBoundary()
- throws ServletException
+ public boolean encounteredFinalBoundary()
+ throws ServletException
{
if (!boundaryReached) {
throw new ServletException("have not reached boundary yet!");
Modified: struts/core/trunk/src/share/org/apache/struts/util/ImageButtonBean.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/ImageButtonBean.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/ImageButtonBean.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/ImageButtonBean.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2002-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
* throw an UnsupportedOperationException. Added for use by TagLib so
* Enumeration can be supported
*
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date$
*/
public class IteratorAdapter implements Iterator {
Modified: struts/core/trunk/src/share/org/apache/struts/util/LabelValueBean.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/LabelValueBean.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/LabelValueBean.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/LabelValueBean.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,17 +26,17 @@
* when constructing user interface elements which have a label to be displayed
* to the user, and a corresponding value to be returned to the server. One
* example is the <code><html:options></code> tag.
- *
+ *
* <p>
* Note: this class has a natural ordering that is inconsistent with equals.
* </p>
- *
+ *
* @version $Rev$ $Date$
*/
public class LabelValueBean implements Comparable, Serializable {
/**
- * Comparator that can be used for a case insensitive sort of
+ * Comparator that can be used for a case insensitive sort of
* <code>LabelValueBean</code> objects.
*/
public static final Comparator CASE_INSENSITIVE_ORDER = new Comparator() {
@@ -104,12 +104,12 @@
// --------------------------------------------------------- Public Methods
/**
- * Compare LabelValueBeans based on the label, because that's the human
+ * Compare LabelValueBeans based on the label, because that's the human
* viewable part of the object.
* @see Comparable
*/
public int compareTo(Object o) {
- // Implicitly tests for the correct type, throwing
+ // Implicitly tests for the correct type, throwing
// ClassCastException as required by interface
String otherLabel = ((LabelValueBean) o).getLabel();
Modified: struts/core/trunk/src/share/org/apache/struts/util/MessageResources.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/MessageResources.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/MessageResources.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/MessageResources.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/util/MessageResourcesFactory.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/MessageResourcesFactory.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/MessageResourcesFactory.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/MessageResourcesFactory.java Sat May 7 09:11:38 2005
@@ -1,20 +1,20 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.struts.util;
Modified: struts/core/trunk/src/share/org/apache/struts/util/ModuleException.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/ModuleException.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/ModuleException.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/ModuleException.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,14 +24,14 @@
* Used for specialized exception handling.
*/
public class ModuleException extends Exception {
-
+
protected String property = null;
-
+
/**
* @deprecated Use message instead.
*/
protected ActionError error = null;
-
+
/**
* The ActionMessage associated with this exception.
* @since Struts 1.2
@@ -114,7 +114,7 @@
error = new ActionError(key, values);
message = new ActionMessage(key, values);
}
-
+
/**
* Returns the property associated with the exception.
* @return Value of property.
@@ -140,7 +140,7 @@
public ActionError getError() {
return error;
}
-
+
/**
* Returns the error associated with the exception.
* @return Value of property error.
Modified: struts/core/trunk/src/share/org/apache/struts/util/ModuleUtils.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/ModuleUtils.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/ModuleUtils.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/ModuleUtils.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
/**
* General purpose utility methods related to module processing.
- *
+ *
* @version $Rev$
* @since Struts 1.2
*/
@@ -59,7 +59,7 @@
protected ModuleUtils() {
super();
}
-
+
/**
* Return the current ModuleConfig object stored in request, if it exists,
* null otherwise.
@@ -75,11 +75,11 @@
public ModuleConfig getModuleConfig(HttpServletRequest request) {
return (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
}
-
+
/**
* Return the desired ModuleConfig object stored in context, if it exists,
* null otherwise.
- *
+ *
* @param prefix The module prefix of the desired module
* @param context The ServletContext for this web application
* @return the ModuleConfig object specified, or null if not found in
@@ -88,11 +88,11 @@
public ModuleConfig getModuleConfig(String prefix, ServletContext context) {
return (ModuleConfig) context.getAttribute(Globals.MODULE_KEY + prefix);
}
-
+
/**
* Return the desired ModuleConfig object stored in context, if it exists,
* otherwise return the current ModuleConfig
- *
+ *
* @param prefix The module prefix of the desired module
* @param request The servlet request we are processing
* @param context The ServletContext for this web application
@@ -101,8 +101,8 @@
*/
public ModuleConfig getModuleConfig(String prefix, HttpServletRequest request, ServletContext context) {
ModuleConfig moduleConfig = null;
-
-
+
+
if(prefix != null) {
//lookup module stored with the given prefix.
moduleConfig = this.getModuleConfig(prefix, context);
@@ -250,7 +250,7 @@
request.setAttribute(key, resources);
} else {
request.removeAttribute(key);
- }
+ }
}
} else {
request.removeAttribute(Globals.MODULE_KEY);
Modified: struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResources.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResources.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResources.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResources.java Sat May 7 09:11:38 2005
@@ -1,20 +1,20 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.struts.util;
@@ -223,12 +223,12 @@
if (log.isTraceEnabled()) {
log.trace("loadLocale(" + localeKey + ")");
}
-
+
// Have we already attempted to load messages for this locale?
if (locales.get(localeKey) != null) {
return;
}
-
+
locales.put(localeKey, localeKey);
// Set up to load the property resource for this locale key, if we can
@@ -236,7 +236,7 @@
if (localeKey.length() > 0) {
name += "_" + localeKey;
}
-
+
name += ".properties";
InputStream is = null;
Properties props = new Properties();
@@ -245,17 +245,17 @@
if (log.isTraceEnabled()) {
log.trace(" Loading resource '" + name + "'");
}
-
+
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if (classLoader == null) {
classLoader = this.getClass().getClassLoader();
}
-
+
is = classLoader.getResourceAsStream(name);
if (is != null) {
try {
props.load(is);
-
+
} catch (IOException e) {
log.error("loadLocale()", e);
} finally {
@@ -266,7 +266,7 @@
}
}
}
-
+
if (log.isTraceEnabled()) {
log.trace(" Loading resource completed");
}
@@ -275,7 +275,7 @@
if (props.size() < 1) {
return;
}
-
+
synchronized (messages) {
Iterator names = props.keySet().iterator();
while (names.hasNext()) {
Modified: struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResourcesFactory.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResourcesFactory.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResourcesFactory.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/PropertyMessageResourcesFactory.java Sat May 7 09:11:38 2005
@@ -1,20 +1,20 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.struts.util;
Modified: struts/core/trunk/src/share/org/apache/struts/util/RequestUtils.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/RequestUtils.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/RequestUtils.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/RequestUtils.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -731,17 +731,17 @@
if(moduleConfig == null) {
moduleConfig = ModuleUtils.getInstance().getModuleConfig(request);
}
-
+
String path = forward.getPath();
//load default prefix
String prefix = moduleConfig.getPrefix();
-
+
//override prefix if supplied by forward
if(forward.getModule() != null) {
prefix = forward.getModule();
if ("/".equals(prefix)) {
prefix = "";
- }
+ }
}
// Handle a ForwardConfig marked as context relative
Modified: struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -131,8 +131,8 @@
return result == null ? value : result.toString();
}
-
-
+
+
/**
* URLencodes a string assuming the character encoding is UTF-8.
*
Modified: struts/core/trunk/src/share/org/apache/struts/util/ServletContextWriter.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/ServletContextWriter.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/ServletContextWriter.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/ServletContextWriter.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/util/TokenProcessor.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/TokenProcessor.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/TokenProcessor.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/TokenProcessor.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2003-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,12 +27,12 @@
import org.apache.struts.Globals;
/**
- * TokenProcessor is responsible for handling all token related functionality. The
+ * TokenProcessor is responsible for handling all token related functionality. The
* methods in this class are synchronized to protect token processing from multiple
* threads. Servlet containers are allowed to return a different HttpSession object
- * for two threads accessing the same session so it is not possible to synchronize
+ * for two threads accessing the same session so it is not possible to synchronize
* on the session.
- *
+ *
* @since Struts 1.1
*/
public class TokenProcessor {
@@ -161,7 +161,7 @@
/**
* Generate a new transaction token, to be used for enforcing a single
* request for a particular transaction.
- *
+ *
* @param request The request we are processing
*/
public synchronized String generateToken(HttpServletRequest request) {
@@ -174,7 +174,7 @@
/**
* Generate a new transaction token, to be used for enforcing a single
* request for a particular transaction.
- *
+ *
* @param id a unique Identifier for the session or other context in
* which this token is to be used.
*/
Modified: struts/core/trunk/src/share/org/apache/struts/util/WildcardHelper.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/WildcardHelper.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/WildcardHelper.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/util/WildcardHelper.java Sat May 7 09:11:38 2005
@@ -1,21 +1,21 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2003-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.struts.util;
import java.util.Map;
@@ -31,16 +31,16 @@
/** The int representing '*' in the pattern <code>int []</code>. */
protected static final int MATCH_FILE = -1;
-
+
/** The int representing '**' in the pattern <code>int []</code>. */
protected static final int MATCH_PATH = -2;
-
+
/** The int representing begin in the pattern <code>int []</code>. */
protected static final int MATCH_BEGIN = -4;
-
+
/** The int representing end in pattern <code>int []</code>. */
protected static final int MATCH_THEEND = -5;
-
+
/** The int value that terminates the pattern <code>int []</code>. */
protected static final int MATCH_END = -3;
@@ -106,7 +106,7 @@
if (slash) {
expr[y++] = buff[x];
slash = false;
- // If the previous char was not '\' we have to do a bunch of
+ // If the previous char was not '\' we have to do a bunch of
// checks
} else {
// If this char is '\' declare that and continue
@@ -145,13 +145,13 @@
public boolean match(Map map, String data, int[] expr) {
if (map == null) {
throw new NullPointerException ("No map provided");
- }
+ }
if (data == null) {
throw new NullPointerException ("No data provided");
- }
+ }
if (expr == null) {
throw new NullPointerException ("No pattern expression provided");
- }
+ }
char buff[] = data.toCharArray();
@@ -182,11 +182,11 @@
exprpos = ++charpos;
}
- // Search the fist expression character (except MATCH_BEGIN - already
+ // Search the fist expression character (except MATCH_BEGIN - already
// skipped)
while (expr[charpos] >= 0) {
charpos++;
- }
+ }
// The expression charater (MATCH_*)
int exprchr = expr[charpos];
@@ -197,21 +197,21 @@
if (matchBegin) {
if (!matchArray(expr, exprpos, charpos, buff, buffpos)) {
return (false);
- }
+ }
matchBegin = false;
} else {
offset = indexOfArray (expr, exprpos, charpos, buff,
buffpos);
if (offset < 0) {
return (false);
- }
+ }
}
// Check for MATCH_BEGIN
if (matchBegin) {
if (offset != 0) {
return (false);
- }
+ }
matchBegin = false;
}
@@ -223,14 +223,14 @@
if (rsltpos > 0) {
map.put(Integer.toString(++mcount),
new String(rslt, 0, rsltpos));
- }
+ }
// Don't care about rest of input buffer
return (true);
} else if (exprchr == MATCH_THEEND) {
if (rsltpos > 0) {
map.put(Integer.toString(++mcount),
new String(rslt, 0, rsltpos));
- }
+ }
// Check that we reach buffer's end
return (buffpos == buff.length);
}
@@ -239,7 +239,7 @@
exprpos = ++charpos;
while (expr[charpos] >= 0) {
charpos++;
- }
+ }
int prevchr = exprchr;
exprchr = expr[charpos];
@@ -251,20 +251,20 @@
if (offset < 0) {
return (false);
- }
+ }
// Copy the data from the source buffer into the result buffer
// to substitute the expression character
if (prevchr == MATCH_PATH) {
while (buffpos < offset) {
rslt[rsltpos++] = buff[buffpos++];
- }
+ }
} else {
// Matching file, don't copy '/'
while (buffpos < offset) {
if (buff[buffpos] == '/') {
return (false);
- }
+ }
rslt[rsltpos++] = buff[buffpos++];
}
}
@@ -291,15 +291,15 @@
*/
protected int indexOfArray (int r[], int rpos, int rend,
char d[], int dpos) {
-
+
// Check if pos and len are legal
if (rend < rpos) {
throw new IllegalArgumentException ("rend < rpos");
- }
+ }
// If we need to match a zero length string return current dpos
if (rend == rpos) {
return (d.length); //?? dpos?
- }
+ }
// If we need to match a 1 char length string do it simply
if ((rend - rpos) == 1) {
// Search for the specified character
@@ -307,7 +307,7 @@
if (r[rpos] == d[x]) {
return (x);
}
- }
+ }
}
// Main string matching loop. It gets executed if the characters to
// match are less then the characters left in the d buffer
@@ -319,10 +319,10 @@
for (int x = rpos; x <= rend; x++) {
if (x == rend) {
return (dpos);
- }
+ }
if (r[x] != d[y++]) {
break;
- }
+ }
}
// Increase dpos to search for the same string at next offset
dpos++;
@@ -344,7 +344,7 @@
* @param rend The index of the last character in r to look for plus 1.
* @param d The array of char that should contain a part of r.
* @param dpos The starting offset in d for the matching.
- * @return The offset in d of the last part of r matched in d or -1 if
+ * @return The offset in d of the last part of r matched in d or -1 if
* that was not found.
*/
protected int lastIndexOfArray (int r[], int rpos, int rend,
@@ -352,11 +352,11 @@
// Check if pos and len are legal
if (rend < rpos) {
throw new IllegalArgumentException ("rend < rpos");
- }
+ }
// If we need to match a zero length string return current dpos
if (rend == rpos) {
return (d.length); //?? dpos?
- }
+ }
// If we need to match a 1 char length string do it simply
if ((rend - rpos) == 1) {
@@ -365,7 +365,7 @@
if (r[rpos] == d[x]) {
return (x);
}
- }
+ }
}
// Main string matching loop. It gets executed if the characters to
@@ -379,10 +379,10 @@
for (int x = rpos; x <= rend; x++) {
if (x == rend) {
return (l);
- }
+ }
if (r[x] != d[y++]) {
break;
- }
+ }
}
// Decrease l to search for the same string at next offset
l--;
@@ -393,7 +393,7 @@
}
/**
- * Matches elements of array r from rpos to rend with array d, starting
+ * Matches elements of array r from rpos to rend with array d, starting
* from dpos.
* <br>
* This method return true if elements of array r from rpos to rend
@@ -410,12 +410,12 @@
char d[], int dpos) {
if (d.length - dpos < rend - rpos) {
return (false);
- }
+ }
for (int i = rpos; i < rend; i++) {
if (r[i] != d[dpos++]) {
return (false);
}
- }
+ }
return (true);
}
}
Modified: struts/core/trunk/src/share/org/apache/struts/validator/BeanValidatorForm.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/validator/BeanValidatorForm.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/validator/BeanValidatorForm.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/validator/BeanValidatorForm.java Sat May 7 09:11:38 2005
@@ -183,7 +183,7 @@
if (logger.isDebugEnabled()) {
logger.debug("Validating ActionForm '" + mapping.getName() +
- "' using key '" + validationKey +
+ "' using key '" + validationKey +
"' for mapping '" + mapping.getPath() + "'");
}
@@ -196,7 +196,7 @@
/**
* Return the <code>DynaClass</code> instance that describes the set of
- * properties available for this DynaBean.
+ * properties available for this DynaBean.
*/
public DynaClass getDynaClass() {
return dynaBean.getDynaClass();
Modified: struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorActionForm.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorActionForm.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorActionForm.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorActionForm.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorForm.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorForm.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorForm.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/validator/DynaValidatorForm.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -146,7 +146,7 @@
if (p == null) {
throw new NullPointerException("Dyna 'page' property must not be null. " +
" Either provide an initial value or set 'convertNull' to false. ");
- }
+ }
this.page = p.intValue();
}
}
Modified: struts/core/trunk/src/share/org/apache/struts/validator/FieldChecks.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/validator/FieldChecks.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/validator/FieldChecks.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/validator/FieldChecks.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org