You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/25 10:38:54 UTC
svn commit: r1188565 - in /myfaces/core/trunk/api/src/main/java/javax/faces:
./ component/ context/ convert/ el/ event/ render/ validator/ view/
view/facelets/ webapp/
Author: struberg
Date: Tue Oct 25 08:38:53 2011
New Revision: 1188565
URL: http://svn.apache.org/viewvc?rev=1188565&view=rev
Log:
MYFACES-3368 fix linebreaks and likes
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContext.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/el/CompositeComponentExpressionHolder.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/BehaviorEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PreDestroyCustomScopeEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKit.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/_MessageUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/view/ViewMetadata.java
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/BehaviorHandler.java
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FaceletHandler.java
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java Tue Oct 25 08:38:53 2011
@@ -65,7 +65,8 @@ public final class FactoryFinder
* used as a monitor for itself and _factories. Maps in this map are used as monitors for themselves and the
* corresponding maps in _factories.
*/
- private static Map<ClassLoader, Map<String, List<String>>> _registeredFactoryNames = new HashMap<ClassLoader, Map<String, List<String>>>();
+ private static Map<ClassLoader, Map<String, List<String>>> registeredFactoryNames
+ = new HashMap<ClassLoader, Map<String, List<String>>>();
/**
* Maps from classLoader to another map, the container (i.e. Tomcat) will create a class loader for each web app
@@ -75,7 +76,8 @@ public final class FactoryFinder
* created via getFactory. The instances will be of the class specified in the setFactory method for the factory
* name, i.e. FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, MyFactory.class).
*/
- private static Map<ClassLoader, Map<String, Object>> _factories = new HashMap<ClassLoader, Map<String, Object>>();
+ private static Map<ClassLoader, Map<String, Object>> _factories
+ = new HashMap<ClassLoader, Map<String, Object>>();
private static final Set<String> VALID_FACTORY_NAMES = new HashSet<String>();
private static final Map<String, Class<?>> ABSTRACT_FACTORY_CLASSES = new HashMap<String, Class<?>>();
@@ -138,16 +140,16 @@ public final class FactoryFinder
// ~ Start FactoryFinderProvider Support
- private static Object _factoryFinderProviderFactoryInstance;
+ private static Object factoryFinderProviderFactoryInstance;
- private static volatile boolean _initialized = false;
+ private static volatile boolean initialized = false;
private static void initializeFactoryFinderProviderFactory()
{
- if (!_initialized)
+ if (!initialized)
{
- _factoryFinderProviderFactoryInstance = _FactoryFinderProviderFactory.getInstance();
- _initialized = true;
+ factoryFinderProviderFactoryInstance = _FactoryFinderProviderFactory.getInstance();
+ initialized = true;
}
}
@@ -198,7 +200,7 @@ public final class FactoryFinder
initializeFactoryFinderProviderFactory();
- if (_factoryFinderProviderFactoryInstance == null)
+ if (factoryFinderProviderFactoryInstance == null)
{
// Do the typical stuff
return _getFactory(factoryName);
@@ -210,12 +212,13 @@ public final class FactoryFinder
//Obtain the FactoryFinderProvider instance for this context.
Object ffp = _FactoryFinderProviderFactory
.FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD
- .invoke(_factoryFinderProviderFactoryInstance, null);
+ .invoke(factoryFinderProviderFactoryInstance, null);
//Call getFactory method and pass the params
return _FactoryFinderProviderFactory
.FACTORY_FINDER_PROVIDER_GET_FACTORY_METHOD.invoke(ffp, factoryName);
- } catch (InvocationTargetException e)
+ }
+ catch (InvocationTargetException e)
{
Throwable targetException = e.getCause();
if (targetException instanceof NullPointerException)
@@ -261,9 +264,9 @@ public final class FactoryFinder
Map<String, List<String>> factoryClassNames = null;
Map<String, Object> factoryMap = null;
- synchronized (_registeredFactoryNames)
+ synchronized (registeredFactoryNames)
{
- factoryClassNames = _registeredFactoryNames.get(classLoader);
+ factoryClassNames = registeredFactoryNames.get(classLoader);
if (factoryClassNames == null)
{
@@ -336,9 +339,12 @@ public final class FactoryFinder
{
String implClassName = classNamesIterator.next();
Class<?> implClass = null;
- try {
+ try
+ {
implClass = classLoader.loadClass(implClassName);
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e)
+ {
implClass = myFacesClassLoader.loadClass(implClassName);
}
@@ -411,7 +417,7 @@ public final class FactoryFinder
initializeFactoryFinderProviderFactory();
- if (_factoryFinderProviderFactoryInstance == null)
+ if (factoryFinderProviderFactoryInstance == null)
{
// Do the typical stuff
_setFactory(factoryName, implName);
@@ -423,7 +429,7 @@ public final class FactoryFinder
//Obtain the FactoryFinderProvider instance for this context.
Object ffp = _FactoryFinderProviderFactory
.FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD
- .invoke(_factoryFinderProviderFactoryInstance,null);
+ .invoke(factoryFinderProviderFactoryInstance, null);
//Call getFactory method and pass the params
_FactoryFinderProviderFactory
@@ -468,7 +474,7 @@ public final class FactoryFinder
ClassLoader classLoader = getClassLoader();
Map<String, List<String>> factoryClassNames = null;
- synchronized (_registeredFactoryNames)
+ synchronized (registeredFactoryNames)
{
Map<String, Object> factories = _factories.get(classLoader);
@@ -479,12 +485,12 @@ public final class FactoryFinder
return;
}
- factoryClassNames = _registeredFactoryNames.get(classLoader);
+ factoryClassNames = registeredFactoryNames.get(classLoader);
if (factoryClassNames == null)
{
factoryClassNames = new HashMap<String, List<String>>();
- _registeredFactoryNames.put(classLoader, factoryClassNames);
+ registeredFactoryNames.put(classLoader, factoryClassNames);
}
}
@@ -506,7 +512,7 @@ public final class FactoryFinder
{
initializeFactoryFinderProviderFactory();
- if (_factoryFinderProviderFactoryInstance == null)
+ if (factoryFinderProviderFactoryInstance == null)
{
// Do the typical stuff
_releaseFactories();
@@ -518,20 +524,29 @@ public final class FactoryFinder
//Obtain the FactoryFinderProvider instance for this context.
Object ffp = _FactoryFinderProviderFactory
.FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD
- .invoke(_factoryFinderProviderFactoryInstance, null);
+ .invoke(factoryFinderProviderFactoryInstance, null);
//Call getFactory method and pass the params
_FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_RELEASE_FACTORIES_METHOD.invoke(ffp, null);
- } catch (InvocationTargetException e) {
+ }
+ catch (InvocationTargetException e)
+ {
Throwable targetException = e.getCause();
- if (targetException instanceof FacesException) {
+ if (targetException instanceof FacesException)
+ {
throw (FacesException) targetException;
- } else if (targetException == null) {
+ }
+ else if (targetException == null)
+ {
throw new FacesException(e);
- } else {
+ }
+ else
+ {
throw new FacesException(targetException);
}
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
//No Op
throw new FacesException(e);
}
@@ -544,19 +559,19 @@ public final class FactoryFinder
ClassLoader classLoader = getClassLoader();
// This code must be synchronized
- synchronized (_registeredFactoryNames)
+ synchronized (registeredFactoryNames)
{
_factories.remove(classLoader);
// _registeredFactoryNames has as value type Map<String,List> and this must
// be cleaned before release (for gc).
- Map<String, List<String>> factoryClassNames = _registeredFactoryNames.get(classLoader);
+ Map<String, List<String>> factoryClassNames = registeredFactoryNames.get(classLoader);
if (factoryClassNames != null)
{
factoryClassNames.clear();
}
- _registeredFactoryNames.remove(classLoader);
+ registeredFactoryNames.remove(classLoader);
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java Tue Oct 25 08:38:53 2011
@@ -302,7 +302,8 @@ public class UIForm extends UIComponentB
if (subtreeIdsToVisit != null && !subtreeIdsToVisit.isEmpty())
{
- if (getFacetCount() > 0) {
+ if (getFacetCount() > 0)
+ {
for (UIComponent facet : getFacets().values())
{
if (facet.visitTree(context, callback))
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContext.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContext.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContext.java Tue Oct 25 08:38:53 2011
@@ -38,9 +38,9 @@ import javax.faces.render.RenderKit;
*/
public abstract class FacesContext
{
- private static ThreadLocal<FacesContext> _currentInstance = new ThreadLocal<FacesContext>();
+ private static ThreadLocal<FacesContext> currentInstance = new ThreadLocal<FacesContext>();
- private static ThreadLocal<FacesContext> _firstInstance = new ThreadLocal<FacesContext>();
+ private static ThreadLocal<FacesContext> firstInstance = new ThreadLocal<FacesContext>();
public abstract void addMessage(String clientId, FacesMessage message);
@@ -54,7 +54,7 @@ public abstract class FacesContext
*/
public Map<Object, Object> getAttributes()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -68,7 +68,7 @@ public abstract class FacesContext
public static FacesContext getCurrentInstance()
{
- return _currentInstance.get();
+ return currentInstance.get();
}
/**
@@ -79,7 +79,7 @@ public abstract class FacesContext
*/
public PhaseId getCurrentPhaseId()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -129,7 +129,7 @@ public abstract class FacesContext
// method call on to the first-registered FacesContext instance. That
// instance will never be "this", as the real original FacesContext
// object will provide a proper implementation of this method.
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -153,7 +153,7 @@ public abstract class FacesContext
*/
public ExceptionHandler getExceptionHandler()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -175,7 +175,7 @@ public abstract class FacesContext
*/
public List<FacesMessage> getMessageList()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -194,7 +194,7 @@ public abstract class FacesContext
*/
public List<FacesMessage> getMessageList(String clientId)
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -224,7 +224,7 @@ public abstract class FacesContext
*/
public PartialViewContext getPartialViewContext()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -252,7 +252,7 @@ public abstract class FacesContext
*/
public boolean isValidationFailed()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -272,7 +272,7 @@ public abstract class FacesContext
*/
public boolean isPostback()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -290,7 +290,7 @@ public abstract class FacesContext
*/
public boolean isProcessingEvents()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -310,16 +310,16 @@ public abstract class FacesContext
{
if (context == null)
{
- _currentInstance.remove();
- _firstInstance.remove();
+ currentInstance.remove();
+ firstInstance.remove();
}
else
{
- _currentInstance.set(context);
+ currentInstance.set(context);
- if (_firstInstance.get() == null)
+ if (firstInstance.get() == null)
{
- _firstInstance.set(context);
+ firstInstance.set(context);
}
}
}
@@ -332,7 +332,7 @@ public abstract class FacesContext
*/
public void setCurrentPhaseId(PhaseId currentPhaseId)
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -350,7 +350,7 @@ public abstract class FacesContext
*/
public void setExceptionHandler(ExceptionHandler exceptionHandler)
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -368,7 +368,7 @@ public abstract class FacesContext
*/
public void setProcessingEvents(boolean processingEvents)
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -391,7 +391,7 @@ public abstract class FacesContext
*/
public void validationFailed()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
@@ -422,7 +422,7 @@ public abstract class FacesContext
*/
public boolean isReleased()
{
- FacesContext ctx = _firstInstance.get();
+ FacesContext ctx = firstInstance.get();
if (ctx == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java Tue Oct 25 08:38:53 2011
@@ -100,7 +100,8 @@ public class CharacterConverter
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java Tue Oct 25 08:38:53 2011
@@ -23,10 +23,7 @@ import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
-import java.text.ParseException;
import java.util.Locale;
/**
@@ -74,8 +71,8 @@ public class DoubleConverter
catch (NumberFormatException e)
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- DOUBLE_ID,
- new Object[]{value,"4214",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ DOUBLE_ID,
+ new Object[]{value,"4214",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java Tue Oct 25 08:38:53 2011
@@ -44,7 +44,8 @@ public class EnumConverter implements Co
*
* See MYFACES-2739 for details.
*/
- @JSFWebConfigParam(name="org.apache.myfaces.ENUM_CONVERTER_ALLOW_STRING_PASSTROUGH", since="2.0.1", expectedValues="true,false",defaultValue="false", group="validation")
+ @JSFWebConfigParam(name="org.apache.myfaces.ENUM_CONVERTER_ALLOW_STRING_PASSTROUGH", since="2.0.1",
+ expectedValues="true,false",defaultValue="false", group="validation")
private static final String ALLOW_STRING_PASSTROUGH = "org.apache.myfaces.ENUM_CONVERTER_ALLOW_STRING_PASSTROUGH";
// TODO: Find a valid generic usage -= Simon Lessard =-
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java Tue Oct 25 08:38:53 2011
@@ -67,8 +67,8 @@ public class FloatConverter
catch (NumberFormatException e)
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- FLOAT_ID,
- new Object[]{value,"50000",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ FLOAT_ID,
+ new Object[]{value,"50000",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
}
@@ -100,7 +100,8 @@ public class FloatConverter
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java Tue Oct 25 08:38:53 2011
@@ -67,8 +67,8 @@ public class IntegerConverter
catch (NumberFormatException e)
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- INTEGER_ID,
- new Object[]{value,"21",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ INTEGER_ID,
+ new Object[]{value,"21",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
}
@@ -100,7 +100,8 @@ public class IntegerConverter
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java Tue Oct 25 08:38:53 2011
@@ -67,8 +67,8 @@ public class LongConverter
catch (NumberFormatException e)
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- LONG_ID,
- new Object[]{value,"9392218515",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ LONG_ID,
+ new Object[]{value,"9392218515",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
}
@@ -100,7 +100,8 @@ public class LongConverter
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java Tue Oct 25 08:38:53 2011
@@ -172,19 +172,22 @@ public class NumberConverter
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
NUMBER_ID,
- new Object[]{value, format.format(21), _MessageUtils.getLabel(facesContext, uiComponent)}));
+ new Object[]{value, format.format(21),
+ _MessageUtils.getLabel(facesContext, uiComponent)}));
}
else if(getType().equals("currency"))
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
CURRENCY_ID,
- new Object[]{value, format.format(42.25), _MessageUtils.getLabel(facesContext, uiComponent)}));
+ new Object[]{value, format.format(42.25),
+ _MessageUtils.getLabel(facesContext, uiComponent)}));
}
else if(getType().equals("percent"))
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
PERCENT_ID,
- new Object[]{value, format.format(.90), _MessageUtils.getLabel(facesContext, uiComponent)}));
+ new Object[]{value, format.format(.90),
+ _MessageUtils.getLabel(facesContext, uiComponent)}));
}
}
}
@@ -238,7 +241,8 @@ public class NumberConverter
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java Tue Oct 25 08:38:53 2011
@@ -67,8 +67,8 @@ public class ShortConverter
catch (NumberFormatException e)
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- SHORT_ID,
- new Object[]{value,"21",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ SHORT_ID,
+ new Object[]{value,"21",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/CompositeComponentExpressionHolder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/CompositeComponentExpressionHolder.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/CompositeComponentExpressionHolder.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/CompositeComponentExpressionHolder.java Tue Oct 25 08:38:53 2011
@@ -24,6 +24,7 @@ import javax.el.ValueExpression;
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*/
-public interface CompositeComponentExpressionHolder {
+public interface CompositeComponentExpressionHolder
+{
public ValueExpression getExpression (String name);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/BehaviorEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/BehaviorEvent.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/BehaviorEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/BehaviorEvent.java Tue Oct 25 08:38:53 2011
@@ -20,7 +20,6 @@ package javax.faces.event;
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.Behavior;
-import javax.faces.component.behavior.ClientBehavior;
/**
* @author Simon Lessard (latest modification by $Author$)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java Tue Oct 25 08:38:53 2011
@@ -27,7 +27,8 @@ import javax.faces.component.StateHolder
import javax.faces.context.FacesContext;
/**
- * See Javadoc of <a href="https://javaserverfaces.dev.java.net/nonav/docs/2.0/javadocs/javax/faces/event/MethodExpressionValueChangeListener.html">JSF Specification</a>
+ * See Javadoc of <a href="https://javaserverfaces.dev.java.net/nonav/docs/2.0/javadocs/javax/faces/event/
+ * MethodExpressionValueChangeListener.html">JSF Specification</a>
*
* @author Stan Silvert
* @author Jakob Korherr
@@ -55,7 +56,8 @@ public class MethodExpressionValueChange
_createZeroArgsMethodExpression(methodExpressionOneArg);
}
- public MethodExpressionValueChangeListener(MethodExpression methodExpressionOneArg, MethodExpression methodExpressionZeroArg)
+ public MethodExpressionValueChangeListener(MethodExpression methodExpressionOneArg,
+ MethodExpression methodExpressionZeroArg)
{
this.methodExpressionOneArg = methodExpressionOneArg;
if (methodExpressionZeroArg != null)
@@ -86,10 +88,12 @@ public class MethodExpressionValueChange
}
catch (ELException e)
{
- // "... If that fails for any reason, throw an AbortProcessingException, including the cause of the failure ..."
+ // "... If that fails for any reason, throw an AbortProcessingException,
+ // including the cause of the failure ..."
// -= Leonardo Uribe =- after discussing this topic on MYFACES-3199, the conclusion is the part is an advice
// for the developer implementing a listener in a method expressions that could be wrapped by this class.
- // The spec wording is poor but, to keep this coherently with ExceptionHandler API, the spec and code on UIViewRoot we need:
+ // The spec wording is poor but, to keep this coherently with ExceptionHandler API,
+ // the spec and code on UIViewRoot we need:
// 2a) "exception is instance of APE or any of the causes of the exception are an APE,
// DON'T publish ExceptionQueuedEvent and terminate processing for current event".
// 2b) for any other exception publish ExceptionQueuedEvent and continue broadcast processing.
@@ -170,7 +174,8 @@ public class MethodExpressionValueChange
* Creates a {@link MethodExpression} with no params and with the same Expression as
* param <code>methodExpression</code>
* <b>WARNING!</b> This method creates new {@link MethodExpression} with expressionFactory.createMethodExpression.
- * That means is not decorating MethodExpression passed as parameter - support for EL VariableMapper will not be available!
+ * That means is not decorating MethodExpression passed as parameter -
+ * support for EL VariableMapper will not be available!
* This is a problem when using facelets and <ui:decorate/> with EL params (see MYFACES-2541 for details).
*/
private void _createZeroArgsMethodExpression(MethodExpression methodExpression)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java Tue Oct 25 08:38:53 2011
@@ -70,11 +70,11 @@ public class PhaseEvent extends EventObj
@Override
public int hashCode()
{
- int PRIME = 31;
+ int prime = 31;
int result = 1;
- result = PRIME * result + ((source == null) ? 0 : source.hashCode());
- result = PRIME * result + ((_facesContext == null) ? 0 : _facesContext.hashCode());
- result = PRIME * result + ((_phaseId == null) ? 0 : _phaseId.hashCode());
+ result = prime * result + ((source == null) ? 0 : source.hashCode());
+ result = prime * result + ((_facesContext == null) ? 0 : _facesContext.hashCode());
+ result = prime * result + ((_phaseId == null) ? 0 : _phaseId.hashCode());
return result;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/PreDestroyCustomScopeEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/PreDestroyCustomScopeEvent.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/PreDestroyCustomScopeEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/PreDestroyCustomScopeEvent.java Tue Oct 25 08:38:53 2011
@@ -25,16 +25,19 @@ package javax.faces.event;
* @version $Revision$ $Date$
*/
-public class PreDestroyCustomScopeEvent extends SystemEvent {
+public class PreDestroyCustomScopeEvent extends SystemEvent
+{
- public PreDestroyCustomScopeEvent(ScopeContext source) {
+ public PreDestroyCustomScopeEvent(ScopeContext source)
+ {
super(source);
}
/**
* @return the source as scope context representation for this event
*/
- public ScopeContext getContext() {
+ public ScopeContext getContext()
+ {
return (ScopeContext) source;
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKit.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKit.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKit.java Tue Oct 25 08:38:53 2011
@@ -45,11 +45,13 @@ public abstract class RenderKit
public void addClientBehaviorRenderer(String type, ClientBehaviorRenderer renderer)
{
- if (type == null) {
+ if (type == null)
+ {
throw new NullPointerException ("type is null");
}
- if (renderer == null) {
+ if (renderer == null)
+ {
throw new NullPointerException ("renderer is null");
}
@@ -60,11 +62,13 @@ public abstract class RenderKit
public abstract ResponseStream createResponseStream(OutputStream out);
- public abstract ResponseWriter createResponseWriter(Writer writer, String contentTypeList, String characterEncoding);
+ public abstract ResponseWriter createResponseWriter(Writer writer, String contentTypeList,
+ String characterEncoding);
public ClientBehaviorRenderer getClientBehaviorRenderer(String type)
{
- if (type == null) {
+ if (type == null)
+ {
throw new NullPointerException ("type is null");
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java Tue Oct 25 08:38:53 2011
@@ -94,7 +94,8 @@ public class BeanValidator implements Va
* Explicitly adding a BeanValidator to an UIInput is possible though.
*/
@JSFWebConfigParam(defaultValue="true", expectedValues="true, false", since="2.0", group="validation")
- public static final String DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME = "javax.faces.validator.DISABLE_DEFAULT_BEAN_VALIDATOR";
+ public static final String DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME
+ = "javax.faces.validator.DISABLE_DEFAULT_BEAN_VALIDATOR";
/**
* The key in the ServletContext where the Bean Validation Factory can be found.
@@ -127,7 +128,8 @@ public class BeanValidator implements Va
/**
* {@inheritDoc}
*/
- public void validate(final FacesContext context, final UIComponent component, final Object value) throws ValidatorException
+ public void validate(final FacesContext context, final UIComponent component, final Object value)
+ throws ValidatorException
{
if (context == null)
{
@@ -618,11 +620,30 @@ final class _ValueReferenceResolver exte
}
// ############################ Standard delegating implementations ############################
- public final Class<?> getType(final ELContext ctx, final Object base, final Object property){return resolver.getType(ctx, base, property);}
- public final void setValue(final ELContext ctx, final Object base, final Object property, final Object value){resolver.setValue(ctx, base, property, value);}
- public final boolean isReadOnly(final ELContext ctx, final Object base, final Object property){return resolver.isReadOnly(ctx, base, property);}
- public final Iterator<FeatureDescriptor> getFeatureDescriptors(final ELContext ctx, final Object base){return resolver.getFeatureDescriptors(ctx, base);}
- public final Class<?> getCommonPropertyType(final ELContext ctx, final Object base){return resolver.getCommonPropertyType(ctx, base);}
+ public final Class<?> getType(final ELContext ctx, final Object base, final Object property)
+ {
+ return resolver.getType(ctx, base, property);
+ }
+
+ public final void setValue(final ELContext ctx, final Object base, final Object property, final Object value)
+ {
+ resolver.setValue(ctx, base, property, value);
+ }
+
+ public final boolean isReadOnly(final ELContext ctx, final Object base, final Object property)
+ {
+ return resolver.isReadOnly(ctx, base, property);
+ }
+
+ public final Iterator<FeatureDescriptor> getFeatureDescriptors(final ELContext ctx, final Object base)
+ {
+ return resolver.getFeatureDescriptors(ctx, base);
+ }
+
+ public final Class<?> getCommonPropertyType(final ELContext ctx, final Object base)
+ {
+ return resolver.getCommonPropertyType(ctx, base);
+ }
}
/**
@@ -657,12 +678,43 @@ final class _ELContextDecorator extends
}
// ############################ Standard delegating implementations ############################
- public final FunctionMapper getFunctionMapper(){return ctx.getFunctionMapper();}
- public final VariableMapper getVariableMapper(){return ctx.getVariableMapper();}
- public final void setPropertyResolved(final boolean resolved){ctx.setPropertyResolved(resolved);}
- public final boolean isPropertyResolved(){return ctx.isPropertyResolved();}
- public final void putContext(final Class key, Object contextObject){ctx.putContext(key, contextObject);}
- public final Object getContext(final Class key){return ctx.getContext(key);}
- public final Locale getLocale(){return ctx.getLocale();}
- public final void setLocale(final Locale locale){ctx.setLocale(locale);}
+ public final FunctionMapper getFunctionMapper()
+ {
+ return ctx.getFunctionMapper();
+ }
+
+ public final VariableMapper getVariableMapper()
+ {
+ return ctx.getVariableMapper();
+ }
+
+ public final void setPropertyResolved(final boolean resolved)
+ {
+ ctx.setPropertyResolved(resolved);
+ }
+
+ public final boolean isPropertyResolved()
+ {
+ return ctx.isPropertyResolved();
+ }
+
+ public final void putContext(final Class key, Object contextObject)
+ {
+ ctx.putContext(key, contextObject);
+ }
+
+ public final Object getContext(final Class key)
+ {
+ return ctx.getContext(key);
+ }
+
+ public final Locale getLocale()
+ {
+ return ctx.getLocale();
+ }
+
+ public final void setLocale(final Locale locale)
+ {
+ ctx.setLocale(locale);
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/_MessageUtils.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/_MessageUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/_MessageUtils.java Tue Oct 25 08:38:53 2011
@@ -21,7 +21,6 @@ package javax.faces.validator;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -99,7 +98,8 @@ class _MessageUtils
else
{
//Neither detail nor summary found
- facesContext.getExternalContext().log("No message with id " + messageId + " found in any bundle");
+ facesContext.getExternalContext().log("No message with id " + messageId
+ + " found in any bundle");
return new FacesMessage(severity, messageId, null);
}
}
@@ -167,19 +167,26 @@ class _MessageUtils
{
//Last resort is the context class loader
if (System.getSecurityManager() != null) {
- Object cl = AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ Object cl = AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
public Object run() throws PrivilegedActionException {
return Thread.currentThread().getContextClassLoader();
}
});
return ResourceBundle.getBundle(bundleName,locale,(ClassLoader)cl);
- }else{
+ }
+ else
+ {
return ResourceBundle.getBundle(bundleName,locale, Thread.currentThread().getContextClassLoader());
}
- }catch(PrivilegedActionException pae){
+ }
+ catch(PrivilegedActionException pae)
+ {
throw new FacesException(pae);
- }catch (MissingResourceException damned){
+ }
+ catch (MissingResourceException damned)
+ {
facesContext.getExternalContext().log("resource bundle " + bundleName + " could not be found");
return null;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/ViewMetadata.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/ViewMetadata.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/ViewMetadata.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/ViewMetadata.java Tue Oct 25 08:38:53 2011
@@ -46,7 +46,8 @@ public abstract class ViewMetadata
UIComponent metadataFacet = root.getFacet (UIViewRoot.METADATA_FACET_NAME);
Iterator<UIComponent> children;
- if (metadataFacet == null) {
+ if (metadataFacet == null)
+ {
// No metadata, so return an empty collection.
return Collections.emptyList();
@@ -58,7 +59,8 @@ public abstract class ViewMetadata
{
children = metadataFacet.getChildren().iterator();
- while (children.hasNext()) {
+ while (children.hasNext())
+ {
UIComponent component = children.next();
if (result == null)
@@ -66,7 +68,8 @@ public abstract class ViewMetadata
result = new LinkedList<UIViewParameter>();
}
- if (component instanceof UIViewParameter) {
+ if (component instanceof UIViewParameter)
+ {
result.add ((UIViewParameter) component);
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/BehaviorHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/BehaviorHandler.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/BehaviorHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/BehaviorHandler.java Tue Oct 25 08:38:53 2011
@@ -57,7 +57,8 @@ public class BehaviorHandler extends Fac
public String getEventName ()
{
- if (event == null) {
+ if (event == null)
+ {
return null;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FaceletHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FaceletHandler.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FaceletHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FaceletHandler.java Tue Oct 25 08:38:53 2011
@@ -20,8 +20,6 @@ package javax.faces.view.facelets;
import java.io.IOException;
-import javax.el.ELException;
-import javax.faces.FacesException;
import javax.faces.component.UIComponent;
/**
@@ -40,9 +38,9 @@ public interface FaceletHandler
* @param ctx the current FaceletContext instance for this execution
* @param parent the parent UIComponent to operate upon
* @throws IOException
- * @throws FacesException
+ * @throws javax.faces.FacesException
* @throws FaceletException
- * @throws ELException
+ * @throws javax.el.ELException
*/
public void apply(FaceletContext ctx, UIComponent parent)throws IOException;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java Tue Oct 25 08:38:53 2011
@@ -18,7 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
import javax.faces.view.Location;
@@ -77,7 +76,7 @@ public abstract class TagAttribute
/**
* Create a MethodExpression, using this attribute's value as the expression String.
*
- * @see ExpressionFactory#createMethodExpression(javax.el.ELContext, java.lang.String, java.lang.Class,
+ * @see javax.el.ExpressionFactory#createMethodExpression(javax.el.ELContext, java.lang.String, java.lang.Class,
* java.lang.Class[])
* @see MethodExpression
* @param ctx
@@ -111,8 +110,8 @@ public abstract class TagAttribute
* If literal, simply coerce our String literal value using an ExpressionFactory, otherwise create a ValueExpression
* and evaluate it.
*
- * @see ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
- * @see ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ * @see javax.el.ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
+ * @see javax.el.ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
* @see ValueExpression
* @param ctx
* FaceletContext to use
@@ -149,7 +148,7 @@ public abstract class TagAttribute
/**
* Create a ValueExpression, using this attribute's literal value and the passed expected type.
*
- * @see ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ * @see javax.el.ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
* @see ValueExpression
* @param ctx
* FaceletContext to use
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java?rev=1188565&r1=1188564&r2=1188565&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java Tue Oct 25 08:38:53 2011
@@ -163,8 +163,10 @@ public class PreJsf2ExceptionHandlerFact
*
* Differs from ExceptionHandlerImpl.handle() in three points:
* - Any exceptions thrown before or after phase execution will be logged and swallowed.
- * - If the Exception is an instance of UpdateModelException, extract the FacesMessage from the UpdateModelException.
- * Log a SEVERE message to the log and queue the FacesMessage on the FacesContext, using the clientId of the source
+ * - If the Exception is an instance of UpdateModelException, extract the
+ * FacesMessage from the UpdateModelException.
+ * Log a SEVERE message to the log and queue the FacesMessage on the
+ * FacesContext, using the clientId of the source
* component in a call to FacesContext.addMessage(java.lang.String, javax.faces.application.FacesMessage).
* - Checks org.apache.myfaces.ERROR_HANDLER for backwards compatibility to myfaces-1.2's error handling
*/
@@ -208,13 +210,15 @@ public class PreJsf2ExceptionHandlerFact
Object errorHandler = clazz.newInstance();
- Method m = clazz.getMethod("handleException", new Class[] { FacesContext.class, Exception.class });
+ Method m = clazz.getMethod("handleException",
+ new Class[] { FacesContext.class, Exception.class });
m.invoke(errorHandler, new Object[] { context.getContext(), exception });
}
catch (ClassNotFoundException ex)
{
throw new FacesException("Error-Handler : " + errorHandlerClass
- + " was not found. Fix your web.xml-parameter : " + ERROR_HANDLER_PARAMETER, ex);
+ + " was not found. Fix your web.xml-parameter : "
+ + ERROR_HANDLER_PARAMETER, ex);
}
catch (IllegalAccessException ex)
{
@@ -225,8 +229,8 @@ public class PreJsf2ExceptionHandlerFact
catch (InstantiationException ex)
{
throw new FacesException("Error-Handler : " + errorHandlerClass
- + " could not be instantiated. Error-Handler is specified in web.xml-parameter : "
- + ERROR_HANDLER_PARAMETER, ex);
+ + " could not be instantiated. Error-Handler is specified in web.xml-parameter : "
+ + ERROR_HANDLER_PARAMETER, ex);
}
catch (NoSuchMethodException ex)
{
@@ -267,9 +271,11 @@ public class PreJsf2ExceptionHandlerFact
// set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
handledAndThrown = event;
- // Re-wrap toThrow in a ServletException or (PortletException, if in a portlet environment)
+ // Re-wrap toThrow in a ServletException or
+ // (PortletException, if in a portlet environment)
// and throw it
- // FIXME: The spec says to NOT use a FacesException to propagate the exception, but I see
+ // FIXME: The spec says to NOT use a FacesException
+ // to propagate the exception, but I see
// no other way as ServletException is not a RuntimeException
toThrow = wrap(getRethrownException(exception));
break;