Skip to content

Commit

Permalink
MYFACES-4621 Improve spelling (#606)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkomko authored Aug 1, 2023
1 parent cdd3727 commit 0168160
Show file tree
Hide file tree
Showing 21 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/faces/component/UIData.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
* currently being decoded. Exactly the same process applies for the later validation and updateModel phases.
* </p>
* <p>
* When the data model for the table is bound to a backing bean property, and no validation errors have occured during
* When the data model for the table is bound to a backing bean property, and no validation errors have occurred during
* processing of a postback, the data model is refetched at the start of the rendering phase (ie after the update model
* phase) so that the contents of the data model can be changed as a result of the latest form submission. Because the
* saved row state must correspond to the elements within the data model, the row state must be discarded whenever a new
Expand Down
8 changes: 4 additions & 4 deletions api/src/main/java/jakarta/faces/component/UIViewRoot.java
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ public void broadcastEvents(FacesContext context, PhaseId phaseId)
name.add(clientId);
}
_getLogger().log(level,
"Event broadcating for PhaseId {0} at UIViewRoot {1} reaches maximal limit, please check " +
"Event broadcasting for PhaseId {0} at UIViewRoot {1} reaches maximum limit, please check " +
"listeners for infinite recursion. Component id: {2}",
new Object [] {phaseId, getViewId(), name});
}
Expand Down Expand Up @@ -1033,7 +1033,7 @@ private boolean notifyListeners(FacesContext context, PhaseId phaseId, MethodExp
catch (Throwable t)
{
beforePhaseSuccess[0] = false; // redundant - for clarity
_getLogger().log(Level.SEVERE, "An Exception occured while processing " +
_getLogger().log(Level.SEVERE, "An Exception occurred while processing " +
listener.getExpressionString() +
" in Phase " + phaseId, t);
if (beforePhase)
Expand Down Expand Up @@ -1080,7 +1080,7 @@ else if (beforePhase)
catch (Throwable t)
{
beforePhaseSuccess[i + 1] = false; // redundant - for clarity
_getLogger().log(Level.SEVERE, "An Exception occured while processing the " +
_getLogger().log(Level.SEVERE, "An Exception occurred while processing the " +
"beforePhase method of PhaseListener " + phaseListener +
" in Phase " + phaseId, t);
if (shouldViewRootPhaseListenerQueuesExceptions(context))
Expand Down Expand Up @@ -1123,7 +1123,7 @@ else if (beforePhase)
}
catch (Throwable t)
{
logger.log(Level.SEVERE, "An Exception occured while processing the " +
logger.log(Level.SEVERE, "An Exception occurred while processing the " +
"afterPhase method of PhaseListener " + phaseListener +
" in Phase " + phaseId, t);
if (shouldViewRootPhaseListenerQueuesExceptions(context))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public static Cipher createCipher(ExternalContext externalContext, int mode) thr

if (log.isLoggable(Level.FINE))
{
log.fine("de/encrypting with " + algorithm + '/' + algorithmParams);
log.fine("De/encrypting with " + algorithm + '/' + algorithmParams);
}

return cipher;
Expand Down Expand Up @@ -672,7 +672,7 @@ private static byte[] findSecret(String secret, String algorithm)

if (log.isLoggable(Level.FINE))
{
log.fine("generated random password of length " + bytes.length);
log.fine("Generated random password of length " + bytes.length);
}
}
catch (NoSuchAlgorithmException e)
Expand All @@ -684,7 +684,7 @@ private static byte[] findSecret(String secret, String algorithm)

if (log.isLoggable(Level.FINE))
{
log.fine("generated random password of length " + length);
log.fine("Generated random password of length " + length);
}
}
}
Expand Down Expand Up @@ -788,7 +788,7 @@ private static byte[] findMacSecret(String secret, String algorithm)

if (log.isLoggable(Level.FINE))
{
log.fine("generated random mac password of length " + bytes.length);
log.fine("Generated random mac password of length " + bytes.length);
}
}
catch (NoSuchAlgorithmException e)
Expand All @@ -800,7 +800,7 @@ private static byte[] findMacSecret(String secret, String algorithm)

if(log.isLoggable(Level.FINE))
{
log.fine("generated random mac password of length " + length);
log.fine("Generated random mac password of length " + length);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void validate(FacesContext context, UIComponent component, Object value)
ValueExpression valueExpression = component.getValueExpression("value");
if (valueExpression == null)
{
log.warning("cannot validate component with empty value: "
log.warning("Cannot validate component with empty value: "
+ component.getClientId(context));
return;
}
Expand Down Expand Up @@ -376,7 +376,7 @@ public VisitResult visit(VisitContext context, UIComponent target)
ValueExpression valueExpression = target.getValueExpression("value");
if (valueExpression == null)
{
log.warning("cannot validate component with empty value: "
log.warning("Cannot validate component with empty value: "
+ target.getClientId(context.getFacesContext()));
return VisitResult.ACCEPT;
}
Expand Down Expand Up @@ -419,4 +419,4 @@ public VisitResult visit(VisitContext context, UIComponent target)
return VisitResult.ACCEPT;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ public List<FacesConfig> getFaceletTaglibFacesConfig(ExternalContext externalCon
}
catch (IOException e)
{
log.log(Level.SEVERE, "Error Loading library: " + library, e);
log.log(Level.SEVERE, "Error loading library: " + library, e);
}
}
}
Expand All @@ -795,19 +795,19 @@ public List<FacesConfig> getFaceletTaglibFacesConfig(ExternalContext externalCon
}
if (log.isLoggable(Level.FINE))
{
log.fine("Added Library from: " + url);
log.fine("Added library from: " + url);
}
}
catch (Exception e)
{
log.log(Level.SEVERE, "Error Loading Library: " + url, e);
log.log(Level.SEVERE, "Error loading library: " + url, e);
}
}
}
catch (IOException e)
{
log.log(Level.SEVERE, "Compiler Initialization Error", e);
log.log(Level.SEVERE, "Compiler initialization error", e);
}
return facesConfigFilesList;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ private void _callInjectAndPostConstruct(Object instance)
}
catch (InjectionProviderException ex)
{
log.log(Level.INFO, "Exception on Injection or PostConstruct", ex);
log.log(Level.INFO, "Exception on Inject or PostConstruct", ex);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static void logException(ExceptionQueuedEventContext event, Logger logger
exception = (Throwable) ((FacesWrapper) exception).getWrapped();
}

String msg = exception.getClass().getName() + " occured while processing " + event.getPhaseId().getName();
String msg = exception.getClass().getName() + " occurred while processing " + event.getPhaseId().getName();
String location = buildLocation(event.getException(), event.getComponent());
if (location != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private boolean executePhase(FacesContext context, PhaseExecutor executor, Phase

if (log.isLoggable(Level.FINEST))
{
log.finest("entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
log.finest("Entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
}

PhaseId currentPhaseId = executor.getPhase();
Expand Down Expand Up @@ -200,7 +200,7 @@ private boolean executePhase(FacesContext context, PhaseExecutor executor, Phase

if (!skipFurtherProcessing && log.isLoggable(Level.FINEST))
{
log.finest("exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
log.finest("Exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
}

return skipFurtherProcessing;
Expand All @@ -216,7 +216,7 @@ public void render(FacesContext facesContext) throws FacesException
}
if (log.isLoggable(Level.FINEST))
{
log.finest("entering " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
log.finest("Entering " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
}

PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
Expand Down Expand Up @@ -268,7 +268,7 @@ public void render(FacesContext facesContext) throws FacesException

if (log.isLoggable(Level.FINEST))
{
log.finest("exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
log.finest("Exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
}
}

Expand All @@ -279,7 +279,7 @@ private boolean isResponseComplete(FacesContext facesContext, PhaseId phase, boo
{
if (log.isLoggable(Level.FINE))
{
log.fine("exiting from lifecycle.execute in " + phase
log.fine("Exiting from lifecycle.execute in " + phase
+ " because getResponseComplete is true from one of the " + (before ? "before" : "after")
+ " listeners");
}
Expand All @@ -295,7 +295,7 @@ private boolean shouldRenderResponse(FacesContext facesContext, PhaseId phase, b
{
if (log.isLoggable(Level.FINE))
{
log.fine("exiting from lifecycle.execute in " + phase
log.fine("Exiting from lifecycle.execute in " + phase
+ " because getRenderResponse is true from one of the " + (before ? "before" : "after")
+ " listeners");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ private void _invokeViewRootAfterPhaseListener(FacesContext facesContext)
}
catch (Throwable t)
{
log.log(Level.SEVERE, "An Exception occured while processing " +
log.log(Level.SEVERE, "An Exception occurred while processing " +
afterPhaseExpression.getExpressionString() +
" in Phase " + getPhase(), t);
}
Expand Down
26 changes: 13 additions & 13 deletions impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public static String getStringValue(FacesContext facesContext, UIComponent compo

if (log.isLoggable(Level.FINE))
{
log.fine("returning '" + submittedValue + '\'');
log.fine("Returning '" + submittedValue + '\'');
}
return submittedValue.toString();
}
Expand Down Expand Up @@ -181,7 +181,7 @@ public static String getStringValue(FacesContext facesContext, UIComponent compo
converter = facesContext.getApplication().createConverter(value.getClass());
if (log.isLoggable(Level.FINE))
{
log.fine("the created converter is " + converter);
log.fine("The created converter is " + converter);
}
}
catch (FacesException e)
Expand All @@ -199,7 +199,7 @@ public static String getStringValue(FacesContext facesContext, UIComponent compo
{
if (log.isLoggable(Level.FINE))
{
log.fine("returning an empty string");
log.fine("Returning an empty string");
}
return "";
}
Expand All @@ -211,15 +211,15 @@ public static String getStringValue(FacesContext facesContext, UIComponent compo

if (log.isLoggable(Level.FINE))
{
log.fine("returning an .toString");
log.fine("Returning an .toString");
}
return value.toString();

}

if (log.isLoggable(Level.FINE))
{
log.fine("returning converter get as string " + converter);
log.fine("Returning converter get as string " + converter);
}
return converter.getAsString(facesContext, component, value);
}
Expand All @@ -243,7 +243,7 @@ public static String getStringFromSubmittedValueOrLocalValueReturnNull(FacesCont
{
if (log.isLoggable(Level.FINE))
{
log.fine("returning 1 '" + submittedValue + '\'');
log.fine("Returning 1 '" + submittedValue + '\'');
}
return submittedValue.toString();
}
Expand Down Expand Up @@ -277,7 +277,7 @@ public static String getStringFromSubmittedValueOrLocalValueReturnNull(FacesCont
value.getClass());
if (log.isLoggable(Level.FINE))
{
log.fine("the created converter is " + converter);
log.fine("The created converter is " + converter);
}
}
catch (FacesException e)
Expand All @@ -304,22 +304,22 @@ public static String getStringFromSubmittedValueOrLocalValueReturnNull(FacesCont

if (log.isLoggable(Level.FINE))
{
log.fine("returning an .toString");
log.fine("Returning an .toString");
}
return value.toString();

}

if (log.isLoggable(Level.FINE))
{
log.fine("returning converter get as string " + converter);
log.fine("Returning converter get as string " + converter);
}
return converter.getAsString(facesContext, component, value);

}
catch (PropertyNotFoundException ex)
{
log.log(Level.SEVERE, "Property not found - called by component : "
log.log(Level.SEVERE, "Property not found - called by component: "
+ ComponentUtils.getPathToComponent(component), ex);

throw ex;
Expand Down Expand Up @@ -673,7 +673,7 @@ public static Object getConvertedUISelectOneValue(
{
if (log.isLoggable(Level.FINE))
{
log.fine("No conversion necessary for null / empty string uiselectone value: client id "
log.fine("No conversion necessary for null / empty string UISelectOne value: client id "
+ output.getClientId());
}
return null;
Expand Down Expand Up @@ -783,9 +783,9 @@ else if (value instanceof String)
}
else if (value != null)
{
log.severe("value for attribute "
log.severe("Value for attribute "
+ attribute
+ " must be instanceof 'Boolean' or 'String', is of type : "
+ " must be instanceof 'Boolean' or 'String', is of type: "
+ value.getClass());

return defaultValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void encodeChildren(FacesContext context, UIComponent component) throws I
{
if (log.isLoggable(Level.SEVERE))
{
log.severe("facet UIComponent.COMPOSITE_FACET_NAME not found when rendering composite component "+
log.severe("Facet UIComponent.COMPOSITE_FACET_NAME not found when rendering composite component "+
component.getClientId(context));
}
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ else if (CommonHtmlAttributesUtil.isIdRenderingNecessary(component))
{
if (log.isLoggable(Level.FINE))
{
log.fine("renderOutputText writing '" + text + '\'');
log.fine("RenderOutputText writing '" + text + '\'');
}
writer.writeText(text, ComponentAttrs.VALUE_ATTR);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void addRenderer(String componentFamily, String rendererType, Renderer re

if (log.isLoggable(Level.FINEST))
{
log.finest("add Renderer family = " + componentFamily + " rendererType = " + rendererType
log.finest("Add Renderer family = " + componentFamily + " rendererType = " + rendererType
+ " renderer class = " + renderer.getClass().getName());
}
}
Expand All @@ -147,7 +147,7 @@ public void addRenderer(String componentFamily, String rendererType, String rend

if (log.isLoggable(Level.FINEST))
{
log.finest("add Renderer family = " + componentFamily + " rendererType = " + rendererType
log.finest("Add Renderer family = " + componentFamily + " rendererType = " + rendererType
+ " renderer class = " + rendererClass);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private void writeViewStateField(FacesContext facesContext, ResponseWriter respo

if (log.isLoggable(Level.FINE))
{
log.fine("Writing serialized viewstate string with hashCode : " + serializedState.hashCode());
log.fine("Writing serialized ViewState string with hashCode: " + serializedState.hashCode());
}

responseWriter.startElement(HTML.INPUT_ELEM, null);
Expand Down
Loading

0 comments on commit 0168160

Please sign in to comment.