Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.myfaces.view.facelets.tag.AbstractTagLibrary;
import org.apache.myfaces.view.facelets.tag.TagLibrary;
import org.apache.myfaces.view.facelets.tag.composite.CompositeComponentResourceTagHandler;
import org.apache.myfaces.view.facelets.tag.composite.CompositeResouceWrapper;
import org.apache.myfaces.view.facelets.tag.composite.CompositeResourceWrapper;

import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
Expand Down Expand Up @@ -243,7 +243,7 @@ public TagHandler createTagHandler(String ns, String localName, TagConfig tag) t
// CompositeComponentResourceTagHandler. Then, its values
// (resourceName, libraryName) will be used to derive the real instance
// to use in a view, based on the locale used.
Resource compositeComponentResource = new CompositeResouceWrapper(
Resource compositeComponentResource = new CompositeResourceWrapper(
_resourceHandler.createResource(resourceName, _compositeLibraryName));

if (compositeComponentResource != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.apache.myfaces.config.webparameters.MyfacesConfig;
import org.apache.myfaces.view.facelets.LocationAwareFacesException;
import org.apache.myfaces.view.facelets.tag.composite.CompositeComponentResourceTagHandler;
import org.apache.myfaces.view.facelets.tag.composite.CompositeResouceWrapper;
import org.apache.myfaces.view.facelets.tag.composite.CompositeResourceWrapper;

/**
* Base class for defining TagLibraries in Java
Expand Down Expand Up @@ -832,7 +832,7 @@ public TagHandler createHandler(TagConfig cfg) throws FacesException, ELExceptio
if (compositeComponentResourceWrapped != null)
{
Resource compositeComponentResource
= new CompositeResouceWrapper(compositeComponentResourceWrapped);
= new CompositeResourceWrapper(compositeComponentResourceWrapped);
ComponentConfig componentConfig = new ComponentConfigWrapper(cfg,
"jakarta.faces.NamingContainer", null);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ protected void applyCompositeComponentFacelet(FaceletContext faceletContext, UIC
if (resourceForCurrentView != null)
{
//Wrap it for serialization.
resourceForCurrentView = new CompositeResouceWrapper(resourceForCurrentView);
resourceForCurrentView = new CompositeResourceWrapper(resourceForCurrentView);
}
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public TagHandler createTagHandler(String ns, String localName, TagConfig tag) t
if (compositeComponentResourceWrapped != null)
{
Resource compositeComponentResource
= new CompositeResouceWrapper(compositeComponentResourceWrapped);
= new CompositeResourceWrapper(compositeComponentResourceWrapped);
ComponentConfig componentConfig = new ComponentConfigWrapper(tag,
"jakarta.faces.NamingContainer", null);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
* @author Leonardo Uribe (latest modification by $Author$)
* @version $Revision$ $Date$
*/
public final class CompositeResouceWrapper extends Resource implements FacesWrapper<Resource>, Externalizable
public final class CompositeResourceWrapper extends Resource implements FacesWrapper<Resource>, Externalizable
{
private static final long serialVersionUID = 8067930634887545843L;

private transient Resource _delegate;

public CompositeResouceWrapper()
public CompositeResourceWrapper()
{
super();
}

public CompositeResouceWrapper(Resource delegate)
public CompositeResourceWrapper(Resource delegate)
{
super();
this._delegate = delegate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class SerializableAttributesTestCase
@Test
public void testSerializeCompositeResourceWrapper() throws Exception
{
CompositeResouceWrapper subject = new CompositeResouceWrapper();
CompositeResourceWrapper subject = new CompositeResourceWrapper();
subject.setResourceName("testRes");
subject.setLibraryName("testLib");
subject.setContentType(null);
Expand All @@ -45,7 +45,7 @@ public void testSerializeCompositeResourceWrapper() throws Exception
baos.flush();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
CompositeResouceWrapper blorg = (CompositeResouceWrapper) ois.readObject();
CompositeResourceWrapper blorg = (CompositeResourceWrapper) ois.readObject();
Assertions.assertEquals(blorg.getResourceName(), subject.getResourceName());
Assertions.assertEquals(blorg.getLibraryName(), subject.getLibraryName());
Assertions.assertEquals(blorg.getContentType(), subject.getContentType());
Expand Down