[portal-commits] JBoss Portal SVN: r6115 - in trunk: federation/src/main/org/jboss/portal/federation/impl and 1 other directories.
Author: julien(a)jboss.com
Date: 2007-01-29 18:54:59 -0500 (Mon, 29 Jan 2007)
New Revision: 6115
Modified:
trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java
trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java
Log:
- moved getFederatedInvoker() from FederatedPortletInvokerService implementation to
FederatedPortletInvoker interface and avoid to cast to the service implementation in
ConsumerRegistryService
Modified:
trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java
===================================================================
---
trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java 2007-01-29
17:06:21 UTC (rev 6114)
+++
trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java 2007-01-29
23:54:59 UTC (rev 6115)
@@ -39,4 +39,12 @@
* @return the invoker id
*/
String getId();
+
+ /**
+ * Returns the underlying portlet invoker. Added to be able to access invoker when
configuring WSRP consumers.
+ *
+ * @return the underlying portlet invoker
+ * @since 2.6
+ */
+ PortletInvoker getPortletInvoker();
}
Modified:
trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
===================================================================
---
trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java 2007-01-29
17:06:21 UTC (rev 6114)
+++
trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java 2007-01-29
23:54:59 UTC (rev 6115)
@@ -70,13 +70,6 @@
this.federatingPortletInvoker = federatingPortletInvoker;
}
- /**
- * Added to be able to access invoker when configuring WSRP consumers.
- *
- * @return
- * @see org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService
- * @since 2.6
- */
public PortletInvoker getPortletInvoker()
{
return portletInvoker;
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-01-29
17:06:21 UTC (rev 6114)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-01-29
23:54:59 UTC (rev 6115)
@@ -25,7 +25,7 @@
import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.federation.FederatingPortletInvoker;
-import org.jboss.portal.federation.impl.FederatedPortletInvokerService;
+import org.jboss.portal.federation.FederatedPortletInvoker;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
@@ -67,7 +67,7 @@
List result = new ArrayList(invokers.size());
for (Iterator invokersIt = invokers.iterator(); invokersIt.hasNext();)
{
- WSRPConsumer consumer =
getConsumerFrom((FederatedPortletInvokerService)invokersIt.next());
+ WSRPConsumer consumer =
getConsumerFrom((FederatedPortletInvoker)invokersIt.next());
if (consumer != null)
{
@@ -81,10 +81,11 @@
public WSRPConsumer getConsumer(String id)
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer
id", null);
- return
getConsumerFrom((FederatedPortletInvokerService)federatingPortletInvoker.getFederatedInvoker(id));
+ return getConsumerFrom(federatingPortletInvoker.getFederatedInvoker(id));
}
- private WSRPConsumer getConsumerFrom(FederatedPortletInvokerService service)
+ private WSRPConsumer getConsumerFrom(FederatedPortletInvoker
+ service)
{
PortletInvoker invoker = service.getPortletInvoker();
if (invoker instanceof WSRPConsumer)