You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2005/09/01 03:05:37 UTC
svn commit: r265611 - in /myfaces/api/trunk/src/java/javax/faces: ./
component/ component/html/ convert/ event/ model/ webapp/
Author: oros
Date: Wed Aug 31 18:05:16 2005
New Revision: 265611
URL: http://svn.apache.org/viewcvs?rev=265611&view=rev
Log:
fixed all signature issues so now all API classes/interfaces comply with the spec
Modified:
myfaces/api/trunk/src/java/javax/faces/FactoryFinder.java
myfaces/api/trunk/src/java/javax/faces/component/UIComponentBase.java
myfaces/api/trunk/src/java/javax/faces/component/UIViewRoot.java
myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyListbox.java
myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyMenu.java
myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneListbox.java
myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneMenu.java
myfaces/api/trunk/src/java/javax/faces/convert/DateTimeConverter.java
myfaces/api/trunk/src/java/javax/faces/convert/DoubleConverter.java
myfaces/api/trunk/src/java/javax/faces/convert/NumberConverter.java
myfaces/api/trunk/src/java/javax/faces/event/FacesEvent.java
myfaces/api/trunk/src/java/javax/faces/event/PhaseId.java
myfaces/api/trunk/src/java/javax/faces/event/PhaseListener.java
myfaces/api/trunk/src/java/javax/faces/model/DataModelEvent.java
myfaces/api/trunk/src/java/javax/faces/model/DataModelListener.java
myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java
myfaces/api/trunk/src/java/javax/faces/webapp/ConverterTag.java
myfaces/api/trunk/src/java/javax/faces/webapp/FacesServlet.java
myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentBodyTag.java
myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentTag.java
myfaces/api/trunk/src/java/javax/faces/webapp/_PageContextOutWriter.java
Modified: myfaces/api/trunk/src/java/javax/faces/FactoryFinder.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/FactoryFinder.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/FactoryFinder.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/FactoryFinder.java Wed Aug 31 18:05:16 2005
@@ -60,7 +60,12 @@
ABSTRACT_FACTORY_CLASSES.put(RENDER_KIT_FACTORY, RenderKitFactory.class);
}
- public static Object getFactory(String factoryName)
+
+ // avoid instantiation
+ FactoryFinder() {
+ }
+
+ public static Object getFactory(String factoryName)
throws FacesException
{
ClassLoader classLoader = getClassLoader();
Modified: myfaces/api/trunk/src/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/UIComponentBase.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/UIComponentBase.java Wed Aug 31 18:05:16 2005
@@ -533,7 +533,7 @@
return renderer;
}
- public static String getPathToComponent(UIComponent component)
+ private String getPathToComponent(UIComponent component)
{
StringBuffer buf = new StringBuffer();
Modified: myfaces/api/trunk/src/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/UIViewRoot.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/UIViewRoot.java Wed Aug 31 18:05:16 2005
@@ -39,7 +39,8 @@
extends UIComponentBase
{
public static final String UNIQUE_ID_PREFIX = "_id";
- public static final int ANY_PHASE_ORDINAL = PhaseId.ANY_PHASE.getOrdinal();
+
+ private static final int ANY_PHASE_ORDINAL = PhaseId.ANY_PHASE.getOrdinal();
private int _uniqueIdCounter = 0;
Modified: myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyListbox.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyListbox.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyListbox.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyListbox.java Wed Aug 31 18:05:16 2005
@@ -57,12 +57,39 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
+ private String _disabledClass = null;
+ private String _enabledClass = null;
+
public HtmlSelectManyListbox()
{
setRendererType(DEFAULT_RENDERER_TYPE);
}
+
+ public void setEnabledClass(String value)
+ {
+ _enabledClass = value;
+ }
+
+ public String getEnabledClass()
+ {
+ if (_enabledClass != null) return _enabledClass;
+ ValueBinding vb = getValueBinding("enabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDisabledClass(String value)
+ {
+ _disabledClass = value;
+ }
+
+ public String getDisabledClass()
+ {
+ if (_disabledClass != null) return _disabledClass;
+ ValueBinding vb = getValueBinding("disabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
public void setAccesskey(String accesskey)
{
Modified: myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyMenu.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyMenu.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectManyMenu.java Wed Aug 31 18:05:16 2005
@@ -55,12 +55,38 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
+ private String _enabledClass;
+ private String _disabledClass;
+
public HtmlSelectManyMenu()
{
setRendererType(DEFAULT_RENDERER_TYPE);
}
+ public void setEnabledClass(String value)
+ {
+ _enabledClass = value;
+ }
+
+ public String getEnabledClass()
+ {
+ if (_enabledClass != null) return _enabledClass;
+ ValueBinding vb = getValueBinding("enabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDisabledClass(String value)
+ {
+ _disabledClass = value;
+ }
+
+ public String getDisabledClass()
+ {
+ if (_disabledClass != null) return _disabledClass;
+ ValueBinding vb = getValueBinding("disabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
public void setAccesskey(String accesskey)
{
Modified: myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneListbox.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneListbox.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneListbox.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneListbox.java Wed Aug 31 18:05:16 2005
@@ -57,11 +57,39 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
+ private String _disabledClass = null;
+ private String _enabledClass = null;
+
public HtmlSelectOneListbox()
{
setRendererType(DEFAULT_RENDERER_TYPE);
}
+
+ public void setEnabledClass(String value)
+ {
+ _enabledClass = value;
+ }
+
+ public String getEnabledClass()
+ {
+ if (_enabledClass != null) return _enabledClass;
+ ValueBinding vb = getValueBinding("enabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDisabledClass(String value)
+ {
+ _disabledClass = value;
+ }
+
+ public String getDisabledClass()
+ {
+ if (_disabledClass != null) return _disabledClass;
+ ValueBinding vb = getValueBinding("disabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
+
public void setAccesskey(String accesskey)
Modified: myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneMenu.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneMenu.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneMenu.java Wed Aug 31 18:05:16 2005
@@ -55,10 +55,37 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
+ private String _enabledClass;
+ private String _disabledClass;
+
public HtmlSelectOneMenu()
{
setRendererType(DEFAULT_RENDERER_TYPE);
+ }
+
+ public void setEnabledClass(String value)
+ {
+ _enabledClass = value;
+ }
+
+ public String getEnabledClass()
+ {
+ if (_enabledClass != null) return _enabledClass;
+ ValueBinding vb = getValueBinding("enabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDisabledClass(String value)
+ {
+ _disabledClass = value;
+ }
+
+ public String getDisabledClass()
+ {
+ if (_disabledClass != null) return _disabledClass;
+ ValueBinding vb = getValueBinding("disabledClass");
+ return vb != null ? (String)vb.getValue(getFacesContext()) : null;
}
Modified: myfaces/api/trunk/src/java/javax/faces/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/convert/DateTimeConverter.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/convert/DateTimeConverter.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/convert/DateTimeConverter.java Wed Aug 31 18:05:16 2005
@@ -31,26 +31,28 @@
public class DateTimeConverter
implements Converter, StateHolder
{
- protected static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.DateTimeConverter.CONVERSION";
- // FIELDS
+ // API field
public static final String CONVERTER_ID = "javax.faces.DateTime";
- protected static final String TYPE_DATE = "date";
- protected static final String TYPE_TIME = "time";
- protected static final String TYPE_BOTH = "both";
- protected static final String STYLE_DEFAULT = "default";
- protected static final String STYLE_MEDIUM = "medium";
- protected static final String STYLE_SHORT = "short";
- protected static final String STYLE_LONG = "long";
- protected static final String STYLE_FULL = "full";
-
- protected String _dateStyle;
- protected Locale _locale;
- protected String _pattern;
- protected String _timeStyle;
- protected TimeZone _timeZone;
- protected String _type;
- protected boolean _transient;
+
+ // internal constants
+ private static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.DateTimeConverter.CONVERSION";
+ private static final String TYPE_DATE = "date";
+ private static final String TYPE_TIME = "time";
+ private static final String TYPE_BOTH = "both";
+ private static final String STYLE_DEFAULT = "default";
+ private static final String STYLE_MEDIUM = "medium";
+ private static final String STYLE_SHORT = "short";
+ private static final String STYLE_LONG = "long";
+ private static final String STYLE_FULL = "full";
+
+ private String _dateStyle;
+ private Locale _locale;
+ private String _pattern;
+ private String _timeStyle;
+ private TimeZone _timeZone;
+ private String _type;
+ private boolean _transient;
// CONSTRUCTORS
public DateTimeConverter()
@@ -116,7 +118,7 @@
}
}
- protected DateFormat getDateFormat()
+ private DateFormat getDateFormat()
{
String type = getType();
DateFormat format = null;
@@ -148,7 +150,7 @@
return format;
}
- protected int calcStyle(String name)
+ private int calcStyle(String name)
{
if (name.equals(STYLE_DEFAULT))
{
Modified: myfaces/api/trunk/src/java/javax/faces/convert/DoubleConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/convert/DoubleConverter.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/convert/DoubleConverter.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/convert/DoubleConverter.java Wed Aug 31 18:05:16 2005
@@ -25,10 +25,12 @@
public class DoubleConverter
implements Converter
{
+ // API FIELDS
+ public static final String CONVERTER_ID = "javax.faces.DoubleTime";
+
+
private static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.DoubleConverter.CONVERSION";
- // FIELDS
- public static final String CONVERTER_ID = "javax.faces.Double";
// CONSTRUCTORS
public DoubleConverter()
Modified: myfaces/api/trunk/src/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/convert/NumberConverter.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/convert/NumberConverter.java Wed Aug 31 18:05:16 2005
@@ -32,35 +32,37 @@
public class NumberConverter
implements Converter, StateHolder
{
- protected static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.NumberConverter.CONVERSION";
-
- // FIELDS
+ // API FIELDS
public static final String CONVERTER_ID = "javax.faces.Number";
- protected static final boolean JAVA_VERSION_14;
+ // internal constants
+ private static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.NumberConverter.CONVERSION";
+
+
+ private static final boolean JAVA_VERSION_14;
static
{
JAVA_VERSION_14 = checkJavaVersion14();
}
- protected String _currencyCode;
- protected String _currencySymbol;
- protected Locale _locale;
- protected int _maxFractionDigits;
- protected int _maxIntegerDigits;
- protected int _minFractionDigits;
- protected int _minIntegerDigits;
- protected String _pattern;
- protected String _type;
- protected boolean _groupingUsed = true;
- protected boolean _integerOnly = false;
- protected boolean _transient;
-
- protected boolean _maxFractionDigitsSet;
- protected boolean _maxIntegerDigitsSet;
- protected boolean _minFractionDigitsSet;
- protected boolean _minIntegerDigitsSet;
+ private String _currencyCode;
+ private String _currencySymbol;
+ private Locale _locale;
+ private int _maxFractionDigits;
+ private int _maxIntegerDigits;
+ private int _minFractionDigits;
+ private int _minIntegerDigits;
+ private String _pattern;
+ private String _type;
+ private boolean _groupingUsed = true;
+ private boolean _integerOnly = false;
+ private boolean _transient;
+
+ private boolean _maxFractionDigitsSet;
+ private boolean _maxIntegerDigitsSet;
+ private boolean _minFractionDigitsSet;
+ private boolean _minIntegerDigitsSet;
// CONSTRUCTORS
@@ -127,7 +129,7 @@
}
}
- protected NumberFormat getNumberFormat(FacesContext facesContext)
+ private NumberFormat getNumberFormat(FacesContext facesContext)
{
Locale lokale = _locale != null ? _locale : facesContext.getViewRoot().getLocale();
@@ -158,7 +160,7 @@
throw new ConverterException("Cannot get NumberFormat, illegal type " + _type);
}
- protected void formatCurrency(NumberFormat format)
+ private void formatCurrency(NumberFormat format)
{
if (_currencyCode == null && _currencySymbol == null)
{
@@ -376,7 +378,7 @@
_type = type;
}
- protected static boolean checkJavaVersion14()
+ private static boolean checkJavaVersion14()
{
String version = System.getProperty("java.version");
if (version == null)
@@ -429,7 +431,7 @@
}
- public DecimalFormatSymbols getDecimalFormatSymbols()
+ private DecimalFormatSymbols getDecimalFormatSymbols()
{
return new DecimalFormatSymbols(getLocale());
}
Modified: myfaces/api/trunk/src/java/javax/faces/event/FacesEvent.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/event/FacesEvent.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/event/FacesEvent.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/event/FacesEvent.java Wed Aug 31 18:05:16 2005
@@ -25,7 +25,6 @@
* @version $Revision$ $Date$
*/
public abstract class FacesEvent extends EventObject
- implements Serializable
{
// FIELDS
private PhaseId _phaseId;
Modified: myfaces/api/trunk/src/java/javax/faces/event/PhaseId.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/event/PhaseId.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/event/PhaseId.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/event/PhaseId.java Wed Aug 31 18:05:16 2005
@@ -61,7 +61,7 @@
private final int _ordinal;
// CONSTRUCTORS
- public PhaseId(String name, int ordinal)
+ private PhaseId(String name, int ordinal)
{
this._name = name;
this._ordinal = ordinal;
Modified: myfaces/api/trunk/src/java/javax/faces/event/PhaseListener.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/event/PhaseListener.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/event/PhaseListener.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/event/PhaseListener.java Wed Aug 31 18:05:16 2005
@@ -19,7 +19,7 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public interface PhaseListener
+public interface PhaseListener extends java.util.EventListener, java.io.Serializable
{
void afterPhase(PhaseEvent event);
Modified: myfaces/api/trunk/src/java/javax/faces/model/DataModelEvent.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/model/DataModelEvent.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/model/DataModelEvent.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/model/DataModelEvent.java Wed Aug 31 18:05:16 2005
@@ -19,26 +19,26 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class DataModelEvent
+public class DataModelEvent extends java.util.EventObject
{
// FIELDS
- private DataModel _model;
private int _index;
private Object _data;
- // CONSTRUCTORS
- public DataModelEvent(DataModel model, int index, Object data)
- {
- _model = model;
- _index = index;
- _data = data;
- }
+
+ public DataModelEvent(DataModel _model, int _index, Object _data)
+ {
+ super(_model);
+ this._index = _index;
+ this._data = _data;
+ }
+
// METHODS
public DataModel getDataModel()
{
- return _model;
+ return (DataModel) getSource();
}
public Object getRowData()
Modified: myfaces/api/trunk/src/java/javax/faces/model/DataModelListener.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/model/DataModelListener.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/model/DataModelListener.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/model/DataModelListener.java Wed Aug 31 18:05:16 2005
@@ -19,7 +19,7 @@
* @author Thomas Spiegl (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public interface DataModelListener
+public interface DataModelListener extends java.util.EventListener
{
void rowSelected(DataModelEvent event);
}
Modified: myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/model/ResultSetDataModel.java Wed Aug 31 18:05:16 2005
@@ -222,7 +222,7 @@
return _resultSetMetadata;
}
- public void setCurrentRowUpdated(boolean currentRowUpdated)
+ private void setCurrentRowUpdated(boolean currentRowUpdated)
{
_currentRowUpdated = currentRowUpdated;
}
Modified: myfaces/api/trunk/src/java/javax/faces/webapp/ConverterTag.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/webapp/ConverterTag.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/webapp/ConverterTag.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/webapp/ConverterTag.java Wed Aug 31 18:05:16 2005
@@ -99,29 +99,4 @@
}
}
- protected static Locale localeFromString(String name)
- {
- try
- {
- Locale locale;
- StringTokenizer st = new StringTokenizer(name, "_");
- String language = st.nextToken();
- String country = st.nextToken();
- if(st.hasMoreTokens())
- {
- String variant = st.nextToken();
- locale = new Locale(language, country, variant);
- }
- else
- {
- locale = new Locale(language, country);
- }
- return locale;
- }
- catch(Exception e)
- {
- throw new IllegalArgumentException("Locale parsing exception - " +
- "invalid string representation '" + name + "'");
- }
- }
}
Modified: myfaces/api/trunk/src/java/javax/faces/webapp/FacesServlet.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/webapp/FacesServlet.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/webapp/FacesServlet.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/webapp/FacesServlet.java Wed Aug 31 18:05:16 2005
@@ -27,7 +27,7 @@
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class FacesServlet
+public final class FacesServlet
implements Servlet
{
public static final String CONFIG_FILES_ATTR = "javax.faces.CONFIG_FILES";
Modified: myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentBodyTag.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentBodyTag.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentBodyTag.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentBodyTag.java Wed Aug 31 18:05:16 2005
@@ -28,8 +28,10 @@
extends UIComponentTag
implements BodyTag
{
- private BodyContent _bodyContent;
+ // API field
+ protected BodyContent bodyContent;
+
public int doAfterBody()
throws JspException
{
@@ -44,22 +46,22 @@
public void release()
{
super.release();
- _bodyContent = null;
+ bodyContent = null;
}
public BodyContent getBodyContent()
{
- return _bodyContent;
+ return bodyContent;
}
public void setBodyContent(BodyContent bodyContent)
{
- _bodyContent = bodyContent;
+ this.bodyContent = bodyContent;
}
public JspWriter getPreviousOut()
{
- return _bodyContent.getEnclosingWriter();
+ return bodyContent.getEnclosingWriter();
}
protected int getDoStartValue()
Modified: myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentTag.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentTag.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentTag.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/webapp/UIComponentTag.java Wed Aug 31 18:05:16 2005
@@ -119,7 +119,7 @@
_id = id;
}
- public String getId()
+ protected String getId()
{
return _id;
}
@@ -626,7 +626,7 @@
}
}
- public static String getPathToComponent(UIComponent component)
+ private String getPathToComponent(UIComponent component)
{
StringBuffer buf = new StringBuffer();
Modified: myfaces/api/trunk/src/java/javax/faces/webapp/_PageContextOutWriter.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/webapp/_PageContextOutWriter.java?rev=265611&r1=265610&r2=265611&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/webapp/_PageContextOutWriter.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/webapp/_PageContextOutWriter.java Wed Aug 31 18:05:16 2005
@@ -25,7 +25,7 @@
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class _PageContextOutWriter
+class _PageContextOutWriter
extends Writer
{
private PageContext _pageContext;