[jboss-svn-commits] JBoss Portal SVN: r5263 - in trunk: core/src/main/org/jboss/portal/core/impl/model/instance federation/src/main/org/jboss/portal/federation/impl portlet/src/main/org/jboss/portal/portlet portlet/src/main/org/jboss/portal/portlet/state/consumer portlet/src/main/org/jboss/portal/portlet/state/producer
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 26 17:45:52 EDT 2006
Author: chris.laprun at jboss.com
Date: 2006-09-26 17:45:47 -0400 (Tue, 26 Sep 2006)
New Revision: 5263
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java
trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java
trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
Log:
Fixed typo.
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java 2006-09-26 13:13:46 UTC (rev 5262)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java 2006-09-26 21:45:47 UTC (rev 5263)
@@ -90,7 +90,7 @@
if (portletContext instanceof StatefulPortletContext)
{
StatefulPortletContext statefulPortletContext = (StatefulPortletContext)portletContext;
- state = statefulPortletContext.getMarshalldState();
+ state = statefulPortletContext.getMarshalledState();
}
}
Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java 2006-09-26 13:13:46 UTC (rev 5262)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java 2006-09-26 21:45:47 UTC (rev 5263)
@@ -22,30 +22,30 @@
package org.jboss.portal.federation.impl;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.federation.FederatedPortletInvoker;
import org.jboss.portal.federation.FederatingPortletInvoker;
import org.jboss.portal.federation.spi.PortletInvokerRegistration;
import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.StatefulPortletContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.DestroyCloneFailure;
import org.jboss.portal.portlet.state.PortletClonedEvent;
import org.jboss.portal.portlet.state.PortletModifiedEvent;
-import org.jboss.portal.portlet.state.DestroyCloneFailure;
-import org.jboss.portal.portlet.spi.InstanceContext;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Set;
-import java.util.List;
-import java.util.Collections;
-import java.util.ArrayList;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -228,7 +228,7 @@
if (compoundPortletContext instanceof StatefulPortletContext)
{
StatefulPortletContext statefulCompoundPortletContext = (StatefulPortletContext)compoundPortletContext;
- return new StatefulPortletContext(portletId, statefulCompoundPortletContext.getMarshalldState());
+ return new StatefulPortletContext(portletId, statefulCompoundPortletContext.getMarshalledState());
}
else
{
@@ -242,7 +242,7 @@
if (portletContext instanceof StatefulPortletContext)
{
StatefulPortletContext statefulPortletContext = (StatefulPortletContext)portletContext;
- return new StatefulPortletContext(compoundPortletId, statefulPortletContext.getMarshalldState());
+ return new StatefulPortletContext(compoundPortletId, statefulPortletContext.getMarshalledState());
}
else
{
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java 2006-09-26 13:13:46 UTC (rev 5262)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java 2006-09-26 21:45:47 UTC (rev 5263)
@@ -29,33 +29,33 @@
{
/** . */
- private final byte[] marshalldState;
+ private final byte[] marshalledState;
public StatefulPortletContext(String id) throws IllegalArgumentException
{
this(id, null);
}
- public StatefulPortletContext(String id, byte[] marshalldState) throws IllegalArgumentException
+ public StatefulPortletContext(String id, byte[] marshalledState) throws IllegalArgumentException
{
super(id);
//
- if (marshalldState == null)
+ if (marshalledState == null)
{
throw new IllegalArgumentException("State cannot be null");
}
- this.marshalldState = marshalldState;
+ this.marshalledState = marshalledState;
}
- public byte[] getMarshalldState()
+ public byte[] getMarshalledState()
{
- return marshalldState;
+ return marshalledState;
}
public String toString()
{
- return "StatefulPortletContext[" + id + "," + marshalldState.length + "]";
+ return "StatefulPortletContext[" + id + "," + marshalledState.length + "]";
}
}
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2006-09-26 13:13:46 UTC (rev 5262)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2006-09-26 21:45:47 UTC (rev 5263)
@@ -21,29 +21,29 @@
*/
package org.jboss.portal.portlet.state.consumer;
+import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.invocation.AttributeResolver;
+import org.jboss.portal.portlet.InvalidPortletIdException;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.InvalidPortletIdException;
import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.StatefulPortletContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.spi.InstanceContext;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.AccessMode;
+import org.jboss.portal.portlet.state.InvalidStateIdException;
import org.jboss.portal.portlet.state.NoSuchStateException;
-import org.jboss.portal.portlet.state.InvalidStateIdException;
-import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.StatefulPortletContext;
import org.jboss.portal.portlet.state.PortletClonedEvent;
import org.jboss.portal.portlet.state.PortletModifiedEvent;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.common.invocation.AttributeResolver;
-import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -133,7 +133,7 @@
public void invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
{
- AttributeResolver resolver = invocation.getContext().getAttributeResolver(PortletInvocation.REQUEST_SCOPE);
+ AttributeResolver resolver = invocation.getContext().getAttributeResolver(PortletInvocation.REQUEST_SCOPE);
if (resolver == null)
{
throw new IllegalArgumentException();
@@ -167,7 +167,7 @@
{
// Save the clone state
StatefulPortletContext statefulClonedContext = (StatefulPortletContext)pictx.clonedContext;
- ConsumerState state = new ConsumerState(statefulClonedContext.getId(), statefulClonedContext.getMarshalldState());
+ ConsumerState state = new ConsumerState(statefulClonedContext.getId(), statefulClonedContext.getMarshalledState());
String stateId = persistenceManager.createState(state);
String clonedId = CLONE_ID_PREFIX + stateId;
PortletClonedEvent event = new PortletClonedEvent(new PortletContext(clonedId));
@@ -187,7 +187,7 @@
try
{
StatefulPortletContext statefulModifiedContext = (StatefulPortletContext)pictx.modifiedContext;
- ConsumerState state = new ConsumerState(statefulModifiedContext.getId(), statefulModifiedContext.getMarshalldState());
+ ConsumerState state = new ConsumerState(statefulModifiedContext.getId(), statefulModifiedContext.getMarshalledState());
persistenceManager.updateState(consumerContext.stateId, state);
}
catch (NoSuchStateException e)
@@ -219,7 +219,7 @@
if (clonedContext instanceof StatefulPortletContext)
{
StatefulPortletContext statefulClonedContext = (StatefulPortletContext)clonedContext;
- ConsumerState state = new ConsumerState(statefulClonedContext.getId(), statefulClonedContext.getMarshalldState());
+ ConsumerState state = new ConsumerState(statefulClonedContext.getId(), statefulClonedContext.getMarshalledState());
String id = persistenceManager.createState(state);
return new PortletContext(CLONE_ID_PREFIX + id);
}
@@ -300,7 +300,7 @@
//
StatefulPortletContext updatedStatefulPortletContext = (StatefulPortletContext)updatedPortletContext;
- ConsumerState state = new ConsumerState(updatedStatefulPortletContext.getId(), updatedStatefulPortletContext.getMarshalldState());
+ ConsumerState state = new ConsumerState(updatedStatefulPortletContext.getId(), updatedStatefulPortletContext.getMarshalledState());
try
{
persistenceManager.updateState(consumerContext.stateId, state);
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2006-09-26 13:13:46 UTC (rev 5262)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2006-09-26 21:45:47 UTC (rev 5263)
@@ -22,39 +22,39 @@
package org.jboss.portal.portlet.state.producer;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.common.value.Value;
-import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.InvalidPortletIdException;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.InvalidPortletIdException;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StatefulPortletContext;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.PreferenceInfo;
+import org.jboss.portal.portlet.info.PreferencesInfo;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.spi.InstanceContext;
+import org.jboss.portal.portlet.state.AbstractPropertyContext;
import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.state.AbstractPropertyContext;
-import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.DestroyCloneFailure;
-import org.jboss.portal.portlet.state.StateManagementPolicy;
-import org.jboss.portal.portlet.state.StateConverter;
import org.jboss.portal.portlet.state.InvalidStateIdException;
import org.jboss.portal.portlet.state.NoSuchStateException;
import org.jboss.portal.portlet.state.PortletClonedEvent;
import org.jboss.portal.portlet.state.PortletModifiedEvent;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.portlet.state.StateConversionException;
-import org.jboss.portal.portlet.info.PreferenceInfo;
-import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.StateConverter;
+import org.jboss.portal.portlet.state.StateManagementPolicy;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -140,7 +140,7 @@
try
{
StatefulPortletContext statefulPortletContext = (StatefulPortletContext)portletContext;
- ProducerState state = stateConverter.unmarshall(statefulPortletContext.getMarshalldState());
+ ProducerState state = stateConverter.unmarshall(statefulPortletContext.getMarshalledState());
return portletInvoker.getPortlet(new PortletContext(state.getPortletId()));
}
catch (StateConversionException e)
@@ -490,7 +490,7 @@
// We need the referenced portlet
if (referencedPortlet == null)
{
- throw new PortletInvokerException("The portlet " + referencedPortletId + " referenced by this clone " + portletId + " is not available");
+ throw new PortletInvokerException("The portlet " + referencedPortletId + " referenced by this clone " + portletId + " is not available");
}
// Get the portlet info
@@ -557,7 +557,7 @@
// We need the referenced portlet
if (referencedPortlet == null)
{
- throw new PortletInvokerException("The portlet " + referencedPortletId + " referenced by this clone " + portletId + " is not available");
+ throw new PortletInvokerException("The portlet " + referencedPortletId + " referenced by this clone " + portletId + " is not available");
}
// Get the portlet info
@@ -664,12 +664,12 @@
}
/**
- * Return the producer state from the specified portlet context or null if that portlet context
- * reference a producer offered portlet.
+ * Return the producer state from the specified portlet context or null if that portlet context reference a producer
+ * offered portlet.
*
* @param portletContext the portlet context
* @return the state that the portlet context carries
- * @throws NoSuchPortletException if the underlying state does not exist
+ * @throws NoSuchPortletException if the underlying state does not exist
* @throws InvalidPortletIdException if the state id is not valid
*/
private ProducerState getProducerState(PortletContext portletContext) throws NoSuchPortletException, InvalidPortletIdException
@@ -679,7 +679,7 @@
String portletId = portletContext.getId();
if (portletContext.getId().startsWith(PRODUCER_CLONE_ID_PREFIX) == true)
{
- String stateId = portletId.substring(1);
+ String stateId = portletId.substring(1);
try
{
return persistenceManager.loadState(stateId);
@@ -703,7 +703,7 @@
try
{
StatefulPortletContext statefulPortletContext = (StatefulPortletContext)portletContext;
- byte[] marshalledState = statefulPortletContext.getMarshalldState();
+ byte[] marshalledState = statefulPortletContext.getMarshalledState();
ProducerState state = stateConverter.unmarshall(marshalledState);
return state;
}
More information about the jboss-svn-commits
mailing list