Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java Sat Nov 20 18:14:00 2010 @@ -13,7 +13,7 @@ * 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.taglibs.standard.lang.jstl.test; @@ -21,257 +21,351 @@ import java.util.List; import java.util.Map; /** - * * <p>This is a test bean with a set of properties - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$ - **/ + */ + +public class Bean1 { + //------------------------------------- + // Properties + //------------------------------------- + // property boolean1 + + boolean mBoolean1; + + public boolean getBoolean1() { + return mBoolean1; + } + + public void setBoolean1(boolean pBoolean1) { + mBoolean1 = pBoolean1; + } + + //------------------------------------- + // property byte1 + + byte mByte1; + + public byte getByte1() { + return mByte1; + } + + public void setByte1(byte pByte1) { + mByte1 = pByte1; + } + + //------------------------------------- + // property char1 + + char mChar1; + + public char getChar1() { + return mChar1; + } + + public void setChar1(char pChar1) { + mChar1 = pChar1; + } + + //------------------------------------- + // property short1 + + short mShort1; + + public short getShort1() { + return mShort1; + } + + public void setShort1(short pShort1) { + mShort1 = pShort1; + } + + //------------------------------------- + // property int1 + + int mInt1; + + public int getInt1() { + return mInt1; + } + + public void setInt1(int pInt1) { + mInt1 = pInt1; + } + + //------------------------------------- + // property long1 + + long mLong1; + + public long getLong1() { + return mLong1; + } + + public void setLong1(long pLong1) { + mLong1 = pLong1; + } + + //------------------------------------- + // property float1 + + float mFloat1; + + public float getFloat1() { + return mFloat1; + } + + public void setFloat1(float pFloat1) { + mFloat1 = pFloat1; + } + + //------------------------------------- + // property double1 + + double mDouble1; + + public double getDouble1() { + return mDouble1; + } + + public void setDouble1(double pDouble1) { + mDouble1 = pDouble1; + } + + //------------------------------------- + // property boolean2 + + Boolean mBoolean2; + + public Boolean getBoolean2() { + return mBoolean2; + } + + public void setBoolean2(Boolean pBoolean2) { + mBoolean2 = pBoolean2; + } + + //------------------------------------- + // property byte2 + + Byte mByte2; + + public Byte getByte2() { + return mByte2; + } + + public void setByte2(Byte pByte2) { + mByte2 = pByte2; + } + + //------------------------------------- + // property char2 + + Character mChar2; + + public Character getChar2() { + return mChar2; + } + + public void setChar2(Character pChar2) { + mChar2 = pChar2; + } + + //------------------------------------- + // property short2 + + Short mShort2; + + public Short getShort2() { + return mShort2; + } + + public void setShort2(Short pShort2) { + mShort2 = pShort2; + } + + //------------------------------------- + // property int2 + + Integer mInt2; + + public Integer getInt2() { + return mInt2; + } + + public void setInt2(Integer pInt2) { + mInt2 = pInt2; + } + + //------------------------------------- + // property long2 + + Long mLong2; + + public Long getLong2() { + return mLong2; + } + + public void setLong2(Long pLong2) { + mLong2 = pLong2; + } + + //------------------------------------- + // property float2 + + Float mFloat2; + + public Float getFloat2() { + return mFloat2; + } + + public void setFloat2(Float pFloat2) { + mFloat2 = pFloat2; + } + + //------------------------------------- + // property double2 + + Double mDouble2; + + public Double getDouble2() { + return mDouble2; + } + + public void setDouble2(Double pDouble2) { + mDouble2 = pDouble2; + } + + //------------------------------------- + // property string1 + + String mString1; + + public String getString1() { + return mString1; + } + + public void setString1(String pString1) { + mString1 = pString1; + } + + //------------------------------------- + // property string2 + + String mString2; + + public String getString2() { + return mString2; + } + + public void setString2(String pString2) { + mString2 = pString2; + } + + //------------------------------------- + // property bean1 + + Bean1 mBean1; + + public Bean1 getBean1() { + return mBean1; + } + + public void setBean1(Bean1 pBean1) { + mBean1 = pBean1; + } + + //------------------------------------- + // property bean2 + + Bean1 mBean2; + + public Bean1 getBean2() { + return mBean2; + } + + public void setBean2(Bean1 pBean2) { + mBean2 = pBean2; + } + + //------------------------------------- + // property noGetter + + String mNoGetter; + + public void setNoGetter(String pNoGetter) { + mNoGetter = pNoGetter; + } + + //------------------------------------- + // property errorInGetter + + String mErrorInGetter; + + public String getErrorInGetter() { + throw new NullPointerException("Error!"); + } + + //------------------------------------- + // property stringArray1 + + String[] mStringArray1; + + public String[] getStringArray1() { + return mStringArray1; + } + + public void setStringArray1(String[] pStringArray1) { + mStringArray1 = pStringArray1; + } + + //------------------------------------- + // property list1 + + List mList1; + + public List getList1() { + return mList1; + } + + public void setList1(List pList1) { + mList1 = pList1; + } + + //------------------------------------- + // property map1 + + Map mMap1; + + public Map getMap1() { + return mMap1; + } + + public void setMap1(Map pMap1) { + mMap1 = pMap1; + } + + //------------------------------------- + // property indexed1 + + public String getIndexed1(int pIndex) { + return mStringArray1[pIndex]; + } + + //------------------------------------- + // Member variables + //------------------------------------- + + //------------------------------------- -public class Bean1 -{ - //------------------------------------- - // Properties - //------------------------------------- - // property boolean1 - - boolean mBoolean1; - public boolean getBoolean1 () - { return mBoolean1; } - public void setBoolean1 (boolean pBoolean1) - { mBoolean1 = pBoolean1; } - - //------------------------------------- - // property byte1 - - byte mByte1; - public byte getByte1 () - { return mByte1; } - public void setByte1 (byte pByte1) - { mByte1 = pByte1; } - - //------------------------------------- - // property char1 - - char mChar1; - public char getChar1 () - { return mChar1; } - public void setChar1 (char pChar1) - { mChar1 = pChar1; } - - //------------------------------------- - // property short1 - - short mShort1; - public short getShort1 () - { return mShort1; } - public void setShort1 (short pShort1) - { mShort1 = pShort1; } - - //------------------------------------- - // property int1 - - int mInt1; - public int getInt1 () - { return mInt1; } - public void setInt1 (int pInt1) - { mInt1 = pInt1; } - - //------------------------------------- - // property long1 - - long mLong1; - public long getLong1 () - { return mLong1; } - public void setLong1 (long pLong1) - { mLong1 = pLong1; } - - //------------------------------------- - // property float1 - - float mFloat1; - public float getFloat1 () - { return mFloat1; } - public void setFloat1 (float pFloat1) - { mFloat1 = pFloat1; } - - //------------------------------------- - // property double1 - - double mDouble1; - public double getDouble1 () - { return mDouble1; } - public void setDouble1 (double pDouble1) - { mDouble1 = pDouble1; } - - //------------------------------------- - // property boolean2 - - Boolean mBoolean2; - public Boolean getBoolean2 () - { return mBoolean2; } - public void setBoolean2 (Boolean pBoolean2) - { mBoolean2 = pBoolean2; } - - //------------------------------------- - // property byte2 - - Byte mByte2; - public Byte getByte2 () - { return mByte2; } - public void setByte2 (Byte pByte2) - { mByte2 = pByte2; } - - //------------------------------------- - // property char2 - - Character mChar2; - public Character getChar2 () - { return mChar2; } - public void setChar2 (Character pChar2) - { mChar2 = pChar2; } - - //------------------------------------- - // property short2 - - Short mShort2; - public Short getShort2 () - { return mShort2; } - public void setShort2 (Short pShort2) - { mShort2 = pShort2; } - - //------------------------------------- - // property int2 - - Integer mInt2; - public Integer getInt2 () - { return mInt2; } - public void setInt2 (Integer pInt2) - { mInt2 = pInt2; } - - //------------------------------------- - // property long2 - - Long mLong2; - public Long getLong2 () - { return mLong2; } - public void setLong2 (Long pLong2) - { mLong2 = pLong2; } - - //------------------------------------- - // property float2 - - Float mFloat2; - public Float getFloat2 () - { return mFloat2; } - public void setFloat2 (Float pFloat2) - { mFloat2 = pFloat2; } - - //------------------------------------- - // property double2 - - Double mDouble2; - public Double getDouble2 () - { return mDouble2; } - public void setDouble2 (Double pDouble2) - { mDouble2 = pDouble2; } - - //------------------------------------- - // property string1 - - String mString1; - public String getString1 () - { return mString1; } - public void setString1 (String pString1) - { mString1 = pString1; } - - //------------------------------------- - // property string2 - - String mString2; - public String getString2 () - { return mString2; } - public void setString2 (String pString2) - { mString2 = pString2; } - - //------------------------------------- - // property bean1 - - Bean1 mBean1; - public Bean1 getBean1 () - { return mBean1; } - public void setBean1 (Bean1 pBean1) - { mBean1 = pBean1; } - - //------------------------------------- - // property bean2 - - Bean1 mBean2; - public Bean1 getBean2 () - { return mBean2; } - public void setBean2 (Bean1 pBean2) - { mBean2 = pBean2; } - - //------------------------------------- - // property noGetter - - String mNoGetter; - public void setNoGetter (String pNoGetter) - { mNoGetter = pNoGetter; } - - //------------------------------------- - // property errorInGetter - - String mErrorInGetter; - public String getErrorInGetter () - { throw new NullPointerException ("Error!"); } - - //------------------------------------- - // property stringArray1 - - String [] mStringArray1; - public String [] getStringArray1 () - { return mStringArray1; } - public void setStringArray1 (String [] pStringArray1) - { mStringArray1 = pStringArray1; } - - //------------------------------------- - // property list1 - - List mList1; - public List getList1 () - { return mList1; } - public void setList1 (List pList1) - { mList1 = pList1; } - - //------------------------------------- - // property map1 - - Map mMap1; - public Map getMap1 () - { return mMap1; } - public void setMap1 (Map pMap1) - { mMap1 = pMap1; } - - //------------------------------------- - // property indexed1 - - public String getIndexed1 (int pIndex) - { return mStringArray1 [pIndex]; } - - //------------------------------------- - // Member variables - //------------------------------------- - - //------------------------------------- - /** - * - * Constructor - **/ - public Bean1 () - { - } + /** + * Constructor + */ + public Bean1() { + } - //------------------------------------- + //------------------------------------- }
Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2.java Sat Nov 20 18:14:00 2010 @@ -13,51 +13,52 @@ * 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.taglibs.standard.lang.jstl.test; /** - * * <p>This is a test bean that holds a single String - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$ - **/ + */ + +public class Bean2 { + //------------------------------------- + // Properties + //------------------------------------- + // property value + + String mValue; + + public String getValue() { + return mValue; + } + + public void setValue(String pValue) { + mValue = pValue; + } + + //------------------------------------- + // Member variables + //------------------------------------- + + //------------------------------------- + + /** + * Constructor + */ + public Bean2(String pValue) { + mValue = pValue; + } + + //------------------------------------- -public class Bean2 -{ - //------------------------------------- - // Properties - //------------------------------------- - // property value - - String mValue; - public String getValue () - { return mValue; } - public void setValue (String pValue) - { mValue = pValue; } - - //------------------------------------- - // Member variables - //------------------------------------- - - //------------------------------------- - /** - * - * Constructor - **/ - public Bean2 (String pValue) - { - mValue = pValue; - } - - //------------------------------------- - public String toString () - { - return ("Bean2[" + mValue + "]"); - } + public String toString() { + return ("Bean2[" + mValue + "]"); + } - //------------------------------------- + //------------------------------------- } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java Sat Nov 20 18:14:00 2010 @@ -13,34 +13,31 @@ * 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.taglibs.standard.lang.jstl.test; import java.beans.PropertyEditorSupport; /** - * * PropertyEditor for parsing Bean2 - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$ - **/ + */ public class Bean2Editor - extends PropertyEditorSupport -{ - //------------------------------------- - public void setAsText (String pText) - throws IllegalArgumentException - { - if ("badvalue".equals (pText)) { - throw new IllegalArgumentException ("Bad value " + pText); - } - else { - setValue (new Bean2 (pText)); + extends PropertyEditorSupport { + //------------------------------------- + + public void setAsText(String pText) + throws IllegalArgumentException { + if ("badvalue".equals(pText)) { + throw new IllegalArgumentException("Bad value " + pText); + } else { + setValue(new Bean2(pText)); + } } - } - //------------------------------------- + //------------------------------------- } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java Sat Nov 20 18:14:00 2010 @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java Sat Nov 20 18:14:00 2010 @@ -13,7 +13,7 @@ * 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.taglibs.standard.lang.jstl.test; @@ -22,6 +22,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; +import javax.el.ELContext; import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -32,273 +33,268 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.el.ExpressionEvaluator; import javax.servlet.jsp.el.VariableResolver; -import javax.el.ELContext; /** - * * <p>This is a "dummy" implementation of PageContext whose only * purpose is to serve the attribute getter/setter API's. - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$ - **/ + */ public class PageContextImpl - extends PageContext -{ - //------------------------------------- - // Properties - //------------------------------------- - - //------------------------------------- - // Member variables - //------------------------------------- - - Map mPage = Collections.synchronizedMap (new HashMap ()); - Map mRequest = Collections.synchronizedMap (new HashMap ()); - Map mSession = Collections.synchronizedMap (new HashMap ()); - Map mApp = Collections.synchronizedMap (new HashMap ()); - - //------------------------------------- - /** - * - * Constructor - **/ - public PageContextImpl () - { - } - - //------------------------------------- - // PageContext methods - //------------------------------------- - public void initialize (Servlet servlet, - ServletRequest request, - ServletResponse response, - String errorPageURL, - boolean needSession, - int bufferSize, - boolean autoFlush) - { - } - - //------------------------------------- - public void release () - { - } - - //------------------------------------- - public void setAttribute (String name, - Object attribute) - { - mPage.put (name, attribute); - } - - //------------------------------------- - public void setAttribute (String name, - Object attribute, - int scope) - { - switch (scope) { - case PAGE_SCOPE: - mPage.put (name, attribute); - break; - case REQUEST_SCOPE: - mRequest.put (name, attribute); - break; - case SESSION_SCOPE: - mSession.put (name, attribute); - break; - case APPLICATION_SCOPE: - mApp.put (name, attribute); - break; - default: - throw new IllegalArgumentException ("Bad scope " + scope); - } - } - - //------------------------------------- - public Object getAttribute (String name) - { - return mPage.get (name); - } - - //------------------------------------- - public Object getAttribute (String name, - int scope) - { - switch (scope) { - case PAGE_SCOPE: - return mPage.get (name); - case REQUEST_SCOPE: - return mRequest.get (name); - case SESSION_SCOPE: - return mSession.get (name); - case APPLICATION_SCOPE: - return mApp.get (name); - default: - throw new IllegalArgumentException ("Bad scope " + scope); - } - } - - //------------------------------------- - public Object findAttribute (String name) - { - if (mPage.containsKey (name)) { - return mPage.get (name); - } - else if (mRequest.containsKey (name)) { - return mRequest.get (name); - } - else if (mSession.containsKey (name)) { - return mSession.get (name); - } - else if (mApp.containsKey (name)) { - return mApp.get (name); - } - else { - return null; - } - } - - //------------------------------------- - public void removeAttribute (String name) - { - if (mPage.containsKey (name)) { - mPage.remove (name); - } - else if (mRequest.containsKey (name)) { - mRequest.remove (name); - } - else if (mSession.containsKey (name)) { - mSession.remove (name); - } - else if (mApp.containsKey (name)) { - mApp.remove (name); - } - } - - //------------------------------------- - public void removeAttribute (String name, - int scope) - { - switch (scope) { - case PAGE_SCOPE: - mPage.remove (name); - break; - case REQUEST_SCOPE: - mRequest.remove (name); - break; - case SESSION_SCOPE: - mSession.remove (name); - break; - case APPLICATION_SCOPE: - mApp.remove (name); - break; - default: - throw new IllegalArgumentException ("Bad scope " + scope); - } - } - - //------------------------------------- - public int getAttributesScope (String name) - { - if (mPage.containsKey (name)) { - return PAGE_SCOPE; - } - else if (mRequest.containsKey (name)) { - return REQUEST_SCOPE; - } - else if (mSession.containsKey (name)) { - return SESSION_SCOPE; - } - else if (mApp.containsKey (name)) { - return APPLICATION_SCOPE; - } - else { - return 0; - } - } - - //------------------------------------- - public Enumeration getAttributeNamesInScope (int scope) - { - return null; - } - - //------------------------------------- - public JspWriter getOut () - { - return null; - } - - //------------------------------------- - public HttpSession getSession () - { - return null; - } - - //------------------------------------- - public Object getPage () - { - return null; - } - - //------------------------------------- - public ServletRequest getRequest () - { - return null; - } - - //------------------------------------- - public ServletResponse getResponse () - { - return null; - } - - //------------------------------------- - public Exception getException () - { - return null; - } - - //------------------------------------- - public ServletConfig getServletConfig () - { - return null; - } - - //------------------------------------- - public ServletContext getServletContext () - { - return null; - } - - //------------------------------------- - public void forward (String path) - { - } - - //------------------------------------- - public void include (String path) - { - } - - //------------------------------------- - public void handlePageException (Exception exc) - { - } - - //------------------------------------- - public void handlePageException (Throwable exc) - { - } - - //------------------------------------- - - // Since JSP 2.0 - public void include(java.lang.String relativeUrlPath, boolean flush) {} - public ExpressionEvaluator getExpressionEvaluator() { return null; } - public VariableResolver getVariableResolver() { return null; } - - public ELContext getELContext() { return null; } + extends PageContext { + //------------------------------------- + // Properties + //------------------------------------- + + //------------------------------------- + // Member variables + //------------------------------------- + + Map mPage = Collections.synchronizedMap(new HashMap()); + Map mRequest = Collections.synchronizedMap(new HashMap()); + Map mSession = Collections.synchronizedMap(new HashMap()); + Map mApp = Collections.synchronizedMap(new HashMap()); + + //------------------------------------- + + /** + * Constructor + */ + public PageContextImpl() { + } + + //------------------------------------- + // PageContext methods + //------------------------------------- + + public void initialize(Servlet servlet, + ServletRequest request, + ServletResponse response, + String errorPageURL, + boolean needSession, + int bufferSize, + boolean autoFlush) { + } + + //------------------------------------- + + public void release() { + } + + //------------------------------------- + + public void setAttribute(String name, + Object attribute) { + mPage.put(name, attribute); + } + + //------------------------------------- + + public void setAttribute(String name, + Object attribute, + int scope) { + switch (scope) { + case PAGE_SCOPE: + mPage.put(name, attribute); + break; + case REQUEST_SCOPE: + mRequest.put(name, attribute); + break; + case SESSION_SCOPE: + mSession.put(name, attribute); + break; + case APPLICATION_SCOPE: + mApp.put(name, attribute); + break; + default: + throw new IllegalArgumentException("Bad scope " + scope); + } + } + + //------------------------------------- + + public Object getAttribute(String name) { + return mPage.get(name); + } + + //------------------------------------- + + public Object getAttribute(String name, + int scope) { + switch (scope) { + case PAGE_SCOPE: + return mPage.get(name); + case REQUEST_SCOPE: + return mRequest.get(name); + case SESSION_SCOPE: + return mSession.get(name); + case APPLICATION_SCOPE: + return mApp.get(name); + default: + throw new IllegalArgumentException("Bad scope " + scope); + } + } + + //------------------------------------- + + public Object findAttribute(String name) { + if (mPage.containsKey(name)) { + return mPage.get(name); + } else if (mRequest.containsKey(name)) { + return mRequest.get(name); + } else if (mSession.containsKey(name)) { + return mSession.get(name); + } else if (mApp.containsKey(name)) { + return mApp.get(name); + } else { + return null; + } + } + + //------------------------------------- + + public void removeAttribute(String name) { + if (mPage.containsKey(name)) { + mPage.remove(name); + } else if (mRequest.containsKey(name)) { + mRequest.remove(name); + } else if (mSession.containsKey(name)) { + mSession.remove(name); + } else if (mApp.containsKey(name)) { + mApp.remove(name); + } + } + + //------------------------------------- + + public void removeAttribute(String name, + int scope) { + switch (scope) { + case PAGE_SCOPE: + mPage.remove(name); + break; + case REQUEST_SCOPE: + mRequest.remove(name); + break; + case SESSION_SCOPE: + mSession.remove(name); + break; + case APPLICATION_SCOPE: + mApp.remove(name); + break; + default: + throw new IllegalArgumentException("Bad scope " + scope); + } + } + + //------------------------------------- + + public int getAttributesScope(String name) { + if (mPage.containsKey(name)) { + return PAGE_SCOPE; + } else if (mRequest.containsKey(name)) { + return REQUEST_SCOPE; + } else if (mSession.containsKey(name)) { + return SESSION_SCOPE; + } else if (mApp.containsKey(name)) { + return APPLICATION_SCOPE; + } else { + return 0; + } + } + + //------------------------------------- + + public Enumeration getAttributeNamesInScope(int scope) { + return null; + } + + //------------------------------------- + + public JspWriter getOut() { + return null; + } + + //------------------------------------- + + public HttpSession getSession() { + return null; + } + + //------------------------------------- + + public Object getPage() { + return null; + } + + //------------------------------------- + + public ServletRequest getRequest() { + return null; + } + + //------------------------------------- + + public ServletResponse getResponse() { + return null; + } + + //------------------------------------- + + public Exception getException() { + return null; + } + + //------------------------------------- + + public ServletConfig getServletConfig() { + return null; + } + + //------------------------------------- + + public ServletContext getServletContext() { + return null; + } + + //------------------------------------- + + public void forward(String path) { + } + + //------------------------------------- + + public void include(String path) { + } + + //------------------------------------- + + public void handlePageException(Exception exc) { + } + + //------------------------------------- + + public void handlePageException(Throwable exc) { + } + + //------------------------------------- + + // Since JSP 2.0 + + public void include(java.lang.String relativeUrlPath, boolean flush) { + } + + public ExpressionEvaluator getExpressionEvaluator() { + return null; + } + + public VariableResolver getVariableResolver() { + return null; + } + + public ELContext getELContext() { + return null; + } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java Sat Nov 20 18:14:00 2010 @@ -25,6 +25,7 @@ import java.io.InputStreamReader; import java.io.LineNumberReader; import java.io.PrintWriter; import java.nio.charset.Charset; + import javax.servlet.jsp.JspException; import junit.framework.TestCase; @@ -82,7 +83,9 @@ public class ParserTest extends TestCase throws IOException { while (true) { String str = pIn.readLine(); - if (str == null) break; + if (str == null) { + break; + } if (str.startsWith("#") || "".equals(str.trim())) { pOut.println(str); Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java Sat Nov 20 18:14:00 2010 @@ -13,85 +13,84 @@ * 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.taglibs.standard.lang.jstl.test; import java.util.HashMap; import java.util.Map; -import org.apache.taglibs.standard.lang.jstl.Evaluator; - import junit.framework.TestCase; +import org.apache.taglibs.standard.lang.jstl.Evaluator; /** * <p>This class contains some test functions.</p> - * + * * @author Shawn Bayern */ public class StaticFunctionTest extends TestCase { - public void testFunctions() throws Exception { + public void testFunctions() throws Exception { - System.setProperty("javax.servlet.jsp.functions.allowed", "true"); - Map m = getSampleMethodMap(); - Evaluator e = new Evaluator(); - Object o; - - o = e.evaluate("", "4", Integer.class, null, null, m, "foo"); - assertEquals("4", o.toString()); - o = e.evaluate("", "${4}", Integer.class, null, null, m, "foo"); - assertEquals("4", o.toString()); - o = e.evaluate("", "${2+2}", Integer.class, null, null, m, "foo"); - assertEquals("4", o.toString()); - o = e.evaluate("", "${foo:add(2, 3)}", Integer.class, null, null, m, "foo"); - assertEquals("5", o.toString()); - o = e.evaluate("", "${foo:multiply(2, 3)}", Integer.class, null, null, m, "foo"); - assertEquals("6", o.toString()); - o = e.evaluate("", "${add(2, 3)}", Integer.class, null, null, m, "foo"); - assertEquals("5", o.toString()); - o = e.evaluate("", "${multiply(2, 3)}", Integer.class, null, null, m, "foo"); - assertEquals("6", o.toString()); - o = e.evaluate("", "${add(2, 3) + 5}", Integer.class, null, null, m, "foo"); - assertEquals("10", o.toString()); - - - o = e.evaluate("", "${getInt(getInteger(getInt(5)))}", Integer.class, null, null, m, "foo"); - assertEquals("5", o.toString()); - - o = e.evaluate("", "${getInteger(getInt(getInteger(5)))}", Integer.class, null, null, m, "foo"); - assertEquals("5", o.toString()); - - o = e.evaluate("", "${getInt(getInt(getInt(5)))}", Integer.class, null, null, m, "foo"); - assertEquals("5", o.toString()); - - o = e.evaluate("", "${getInteger(getInteger(getInteger(5)))}", Integer.class, null, null, m, "foo"); - assertEquals("5", o.toString()); - } - - public static int add(int a, int b) { - return a + b; - } - - public static int multiply(int a, int b) { - return a * b; - } - - public static int getInt(Integer i) { - return i.intValue(); - } - - public static Integer getInteger(int i) { - return new Integer(i); - } - - public static Map getSampleMethodMap() throws Exception { - Map m = new HashMap(); - Class c = StaticFunctionTest.class; - m.put("foo:add", c.getMethod("add", new Class[] { Integer.TYPE, Integer.TYPE })); - m.put("foo:multiply", c.getMethod("multiply", new Class[] { Integer.TYPE, Integer.TYPE })); - m.put("foo:getInt", c.getMethod("getInt", new Class[] { Integer.class })); - m.put("foo:getInteger", c.getMethod("getInteger", new Class[] { Integer.TYPE })); - return m; - } + System.setProperty("javax.servlet.jsp.functions.allowed", "true"); + Map m = getSampleMethodMap(); + Evaluator e = new Evaluator(); + Object o; + + o = e.evaluate("", "4", Integer.class, null, null, m, "foo"); + assertEquals("4", o.toString()); + o = e.evaluate("", "${4}", Integer.class, null, null, m, "foo"); + assertEquals("4", o.toString()); + o = e.evaluate("", "${2+2}", Integer.class, null, null, m, "foo"); + assertEquals("4", o.toString()); + o = e.evaluate("", "${foo:add(2, 3)}", Integer.class, null, null, m, "foo"); + assertEquals("5", o.toString()); + o = e.evaluate("", "${foo:multiply(2, 3)}", Integer.class, null, null, m, "foo"); + assertEquals("6", o.toString()); + o = e.evaluate("", "${add(2, 3)}", Integer.class, null, null, m, "foo"); + assertEquals("5", o.toString()); + o = e.evaluate("", "${multiply(2, 3)}", Integer.class, null, null, m, "foo"); + assertEquals("6", o.toString()); + o = e.evaluate("", "${add(2, 3) + 5}", Integer.class, null, null, m, "foo"); + assertEquals("10", o.toString()); + + + o = e.evaluate("", "${getInt(getInteger(getInt(5)))}", Integer.class, null, null, m, "foo"); + assertEquals("5", o.toString()); + + o = e.evaluate("", "${getInteger(getInt(getInteger(5)))}", Integer.class, null, null, m, "foo"); + assertEquals("5", o.toString()); + + o = e.evaluate("", "${getInt(getInt(getInt(5)))}", Integer.class, null, null, m, "foo"); + assertEquals("5", o.toString()); + + o = e.evaluate("", "${getInteger(getInteger(getInteger(5)))}", Integer.class, null, null, m, "foo"); + assertEquals("5", o.toString()); + } + + public static int add(int a, int b) { + return a + b; + } + + public static int multiply(int a, int b) { + return a * b; + } + + public static int getInt(Integer i) { + return i.intValue(); + } + + public static Integer getInteger(int i) { + return new Integer(i); + } + + public static Map getSampleMethodMap() throws Exception { + Map m = new HashMap(); + Class c = StaticFunctionTest.class; + m.put("foo:add", c.getMethod("add", new Class[]{Integer.TYPE, Integer.TYPE})); + m.put("foo:multiply", c.getMethod("multiply", new Class[]{Integer.TYPE, Integer.TYPE})); + m.put("foo:getInt", c.getMethod("getInt", new Class[]{Integer.class})); + m.put("foo:getInteger", c.getMethod("getInteger", new Class[]{Integer.TYPE})); + return m; + } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java Sat Nov 20 18:14:00 2010 @@ -13,52 +13,43 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A factory for generating the various beans - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ -public class Factory -{ - public static PublicBean1 createBean1 () - { - return new PublicBean1 (); - } - - public static PublicBean1 createBean2 () - { - return new PrivateBean1a (); - } - - public static PublicBean1 createBean3 () - { - return new PublicBean1b (); - } - - public static PublicInterface2 createBean4 () - { - return new PublicBean2a (); - } - - public static PublicInterface2 createBean5 () - { - return new PrivateBean2b (); - } - - public static PublicInterface2 createBean6 () - { - return new PrivateBean2c (); - } - - public static PublicInterface2 createBean7 () - { - return new PrivateBean2d (); - } +public class Factory { + public static PublicBean1 createBean1() { + return new PublicBean1(); + } + + public static PublicBean1 createBean2() { + return new PrivateBean1a(); + } + + public static PublicBean1 createBean3() { + return new PublicBean1b(); + } + + public static PublicInterface2 createBean4() { + return new PublicBean2a(); + } + + public static PublicInterface2 createBean5() { + return new PrivateBean2b(); + } + + public static PublicInterface2 createBean6() { + return new PrivateBean2c(); + } + + public static PublicInterface2 createBean7() { + return new PrivateBean2d(); + } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java Sat Nov 20 18:14:00 2010 @@ -13,19 +13,17 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A private bean subclassing a public bean - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ class PrivateBean1a - extends PublicBean1 -{ + extends PublicBean1 { } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java Sat Nov 20 18:14:00 2010 @@ -13,20 +13,20 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A private implementation of a public interface - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ class PrivateBean2b - implements PublicInterface2 -{ - public Object getValue () { return "got the value"; } + implements PublicInterface2 { + public Object getValue() { + return "got the value"; + } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java Sat Nov 20 18:14:00 2010 @@ -13,20 +13,18 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A private subclass of a public class impelementing a public * interface - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ class PrivateBean2c - extends PublicBean2a -{ + extends PublicBean2a { } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java Sat Nov 20 18:14:00 2010 @@ -13,20 +13,18 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A private subclass of a private class impelementing a public * interface - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ class PrivateBean2d - extends PrivateBean2b -{ + extends PrivateBean2b { } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java Sat Nov 20 18:14:00 2010 @@ -13,19 +13,19 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A publicly-accessible bean - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ -public class PublicBean1 -{ - public Object getValue () { return "got the value"; } +public class PublicBean1 { + public Object getValue() { + return "got the value"; + } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java Sat Nov 20 18:14:00 2010 @@ -13,20 +13,18 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A public bean subclassing a private bean subclassing a public * bean - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ public class PublicBean1b - extends PrivateBean1a -{ + extends PrivateBean1a { } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java Sat Nov 20 18:14:00 2010 @@ -13,20 +13,20 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A publicly-accessible implementation of a public interface - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ public class PublicBean2a - implements PublicInterface2 -{ - public Object getValue () { return "got the value"; } + implements PublicInterface2 { + public Object getValue() { + return "got the value"; + } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java?rev=1037284&r1=1037283&r2=1037284&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java Sat Nov 20 18:14:00 2010 @@ -13,19 +13,17 @@ * 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.taglibs.standard.lang.jstl.test.beans; /** - * * <p>A publicly-accessible interface - * + * * @author Nathan Abramson - Art Technology Group * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$ - **/ + */ -public interface PublicInterface2 -{ - public Object getValue (); +public interface PublicInterface2 { + public Object getValue(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
