Author: julien(a)jboss.com
Date: 2007-03-15 17:05:07 -0400 (Thu, 15 Mar 2007)
New Revision: 6699
Added:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryListener.java
Removed:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
Log:
correctly renamed the PortletContainerRegistryListener to
PortletApplicationRegistryListener
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java 2007-03-15
20:57:21 UTC (rev 6698)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java 2007-03-15
21:05:07 UTC (rev 6699)
@@ -58,12 +58,12 @@
*
* @param listener
*/
- void addListener(PortletContainerRegistryListener listener);
+ void addListener(PortletApplicationRegistryListener listener);
/**
* Removes a portlet container registry listener.
*
* @param listener
*/
- void removeListener(PortletContainerRegistryListener listener);
+ void removeListener(PortletApplicationRegistryListener listener);
}
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java 2007-03-15
20:57:21 UTC (rev 6698)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java 2007-03-15
21:05:07 UTC (rev 6699)
@@ -97,7 +97,7 @@
return (PortletApplication)portletApplications.get(id);
}
- public void addListener(PortletContainerRegistryListener listener)
+ public void addListener(PortletApplicationRegistryListener listener)
{
if (listener == null)
{
@@ -112,7 +112,7 @@
}
}
- public void removeListener(PortletContainerRegistryListener listener)
+ public void removeListener(PortletApplicationRegistryListener listener)
{
if (listener == null)
{
@@ -132,8 +132,8 @@
Iterator it = listeners.iterator();
while (it.hasNext())
{
- PortletContainerRegistryListener listener =
(PortletContainerRegistryListener)it.next();
- listener.registerPortletContainer(portlet);
+ PortletApplicationRegistryListener listener =
(PortletApplicationRegistryListener)it.next();
+ listener.portletContainerRegistered(portlet);
}
}
@@ -142,8 +142,8 @@
Iterator it = listeners.iterator();
while (it.hasNext())
{
- PortletContainerRegistryListener listener =
(PortletContainerRegistryListener)it.next();
- listener.unregisterPortletContainer(portlet);
+ PortletApplicationRegistryListener listener =
(PortletApplicationRegistryListener)it.next();
+ listener.portletContainerUnregistered(portlet);
}
}
Copied:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryListener.java
(from rev 6697,
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java)
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryListener.java
(rev 0)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryListener.java 2007-03-15
21:05:07 UTC (rev 6699)
@@ -0,0 +1,41 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.container;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ */
+public interface PortletApplicationRegistryListener
+{
+
+ /**
+ * A portlet container has been registered.
+ */
+ void portletContainerRegistered(PortletContainer portletContainer);
+
+ /**
+ * A portlet container has been unregistered.
+ */
+ void portletContainerUnregistered(PortletContainer portletContainer);
+
+}
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2007-03-15
20:57:21 UTC (rev 6698)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2007-03-15
21:05:07 UTC (rev 6699)
@@ -55,7 +55,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class PortletContainerInvoker extends AbstractJBossService implements
PortletInvoker, PortletContainerRegistryListener
+public class PortletContainerInvoker extends AbstractJBossService implements
PortletInvoker, PortletApplicationRegistryListener
{
/** . */
@@ -107,7 +107,7 @@
this.stackFactory = stackFactory;
}
- public synchronized void registerPortletContainer(PortletContainer portletContainer)
+ public synchronized void portletContainerRegistered(PortletContainer
portletContainer)
{
Map portlets = new HashMap(this.portlets);
PortletImpl portlet = new PortletImpl(portletContainer);
@@ -117,7 +117,7 @@
this.portlets = portlets;
}
- public synchronized void unregisterPortletContainer(PortletContainer
portletContainer)
+ public synchronized void portletContainerUnregistered(PortletContainer
portletContainer)
{
Map portlets = new HashMap(this.portlets);
PortletImpl portlet = new PortletImpl(portletContainer);
Deleted:
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java 2007-03-15
20:57:21 UTC (rev 6698)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerRegistryListener.java 2007-03-15
21:05:07 UTC (rev 6699)
@@ -1,40 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.portlet.container;
-
-/**
- * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
- */
-public interface PortletContainerRegistryListener {
-
- /**
- * A portlet container has been registered.
- */
- void registerPortletContainer(PortletContainer portletContainer);
-
- /**
- * A portlet container has been unregistered.
- */
- void unregisterPortletContainer(PortletContainer portletContainer);
-
-}