[jboss-svn-commits] JBoss Portal SVN: r5351 - in trunk/core/src/main/org/jboss: portal/core/aspects/controller/node portal/core/portlet/catalog portal/core/portlet/theme portlet
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Oct 7 09:50:27 EDT 2006
Author: julien at jboss.com
Date: 2006-10-07 09:50:15 -0400 (Sat, 07 Oct 2006)
New Revision: 5351
Removed:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/JBossPortalNode.java
Modified:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java
trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java
trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java
trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java
trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java
trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java
trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java
trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java
trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java
trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java
Log:
removed unecessary interface
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -30,11 +30,9 @@
import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
import org.jboss.portal.core.controller.command.InvokeWindowActionCommand;
import org.jboss.portal.core.controller.command.WindowCommand;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.core.aspects.controller.node.Navigation;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.event.PortalEventListenerRegistry;
import org.jboss.portal.portlet.Parameters;
@@ -77,7 +75,7 @@
public void invoke(ControllerCommand cmd) throws Exception, InvocationException
{
- JBossPortalNode node = Navigation.getCurrentNode();
+ PortalObjectNode node = Navigation.getCurrentNode();
//
PortalNodeEvent event = createEvent(cmd, node);
@@ -100,9 +98,8 @@
{
WindowEvent we = (WindowEvent)nextEvent;
-
-
- JBossPortalNode nextNode = (JBossPortalNode)we.getNode();
+ //
+ PortalObjectNode nextNode = (PortalObjectNode)we.getNode();
String nodeRef = nextNode.getRef();
Mode mode = we.getMode();
WindowState windowState = we.getWindowState();
Deleted: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/JBossPortalNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/JBossPortalNode.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/JBossPortalNode.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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.core.aspects.controller.node;
-
-import org.jboss.portal.api.node.PortalNode;
-import org.jboss.portal.api.node.event.PortalNodeEvent;
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
-
-/**
- * Specific extension that allows the node to fire events to the attached listener.
- *
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 3249 $
- */
-public interface JBossPortalNode extends PortalNode
-{
- /**
- * Return the node ref.
- */
- String getRef();
-
- /**
- * Fire a pre event on this node.
- */
- PortalNodeEvent fireEvent(PortalEventListenerRegistry registry, PortalNodeEvent event);
-}
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -37,12 +37,12 @@
private static final ThreadLocal currentNodeLocal = new ThreadLocal();
- public static JBossPortalNode getCurrentNode()
+ public static PortalObjectNode getCurrentNode()
{
- return (JBossPortalNode)currentNodeLocal.get();
+ return (PortalObjectNode)currentNodeLocal.get();
}
- public static void setCurrentNode(JBossPortalNode currentNode)
+ public static void setCurrentNode(PortalObjectNode currentNode)
{
currentNodeLocal.set(currentNode);
}
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -27,10 +27,7 @@
import org.jboss.portal.core.controller.command.RenderPageCommand;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.core.aspects.controller.node.Navigation;
-import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
/**
*
@@ -45,10 +42,10 @@
public void invoke(ControllerCommand cmd) throws Exception, InvocationException
{
// Get the next node
- JBossPortalNode next = getNode(cmd);
+ PortalObjectNode next = getNode(cmd);
// Save previous node temporarily
- JBossPortalNode previous = Navigation.getCurrentNode();
+ PortalObjectNode previous = Navigation.getCurrentNode();
try
{
@@ -65,9 +62,9 @@
}
}
- private JBossPortalNode getNode(ControllerCommand cmd)
+ private PortalObjectNode getNode(ControllerCommand cmd)
{
- JBossPortalNode next = null;
+ PortalObjectNode next = null;
if (cmd instanceof WindowCommand)
{
WindowCommand windowCmd = (WindowCommand)cmd;
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -38,7 +38,7 @@
public class PortalNodeURLFactory
{
- public static PortalNodeURL createActionURL(JBossPortalNode node, PortletInvocation invocation)
+ public static PortalNodeURL createActionURL(PortalObjectNode node, PortletInvocation invocation)
{
switch (node.getType())
{
@@ -52,7 +52,7 @@
}
}
- public static PortalNodeURL createRenderURL(JBossPortalNode node, PortletInvocation invocation)
+ public static PortalNodeURL createRenderURL(PortalObjectNode node, PortletInvocation invocation)
{
switch (node.getType())
{
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -39,7 +39,7 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class PortalObjectNode implements JBossPortalNode
+public class PortalObjectNode implements PortalNode
{
/** The wrapped portal object. */
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.core.portlet.catalog;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
+import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
@@ -110,9 +110,9 @@
{
boolean allowed = false;
// check if the current user is allowed to access this page
- if(child instanceof JBossPortalNode)
+ if(child instanceof PortalObjectNode)
{
- JBossPortalNode pn = (JBossPortalNode) child;
+ PortalObjectNode pn = (PortalObjectNode) child;
//allowed = permissionFactory.checkPermission("portalobject", pn.getHandle(), "view");
/*allowed = getPortalAuthorizationManager().hasPermission(pn.getRef(), "view",
PermissionTypes.PAGE);*/
@@ -131,9 +131,9 @@
{
boolean allowed = false;
// check if the current user is allowed to access this page
- if(parentSibling instanceof JBossPortalNode)
+ if(parentSibling instanceof PortalObjectNode)
{
- JBossPortalNode pn = (JBossPortalNode) parentSibling;
+ PortalObjectNode pn = (PortalObjectNode) parentSibling;
//allowed = permissionFactory.checkPermission("portalobject", pn.getHandle(), "view");
/*allowed = getPortalAuthorizationManager().hasPermission(pn.getRef(), "view",
PermissionTypes.PAGE);*/
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -23,7 +23,7 @@
import org.apache.log4j.Logger;
import org.jboss.portal.common.MediaType;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
+import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.theme.LayoutInfo;
@@ -396,9 +396,9 @@
current = current.getParent();
}
- if (current instanceof JBossPortalNode)
+ if (current instanceof PortalObjectNode)
{
- JBossPortalNode portalNode = (JBossPortalNode)current;
+ PortalObjectNode portalNode = (PortalObjectNode)current;
PortalObject portal = container.getObject(portalNode.getRef());
portal.setDeclaredProperty(key, value);
if (log.isDebugEnabled())
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -23,7 +23,7 @@
import org.apache.log4j.Logger;
import org.jboss.portal.common.MediaType;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
+import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.theme.PortalTheme;
@@ -165,9 +165,9 @@
current = current.getParent();
}
- if (current instanceof JBossPortalNode)
+ if (current instanceof PortalObjectNode)
{
- JBossPortalNode portalNode = (JBossPortalNode)current;
+ PortalObjectNode portalNode = (PortalObjectNode)current;
PortalObject portal = container.getObject(portalNode.getRef());
portal.setDeclaredProperty(key, value);
if (log.isDebugEnabled())
Modified: trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -22,8 +22,8 @@
package org.jboss.portlet;
import org.jboss.portal.common.util.URLTools;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
import org.jboss.portal.core.aspects.controller.node.PortalNodeURLFactory;
+import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
import org.jboss.portal.core.output.SignOutResult;
import org.jboss.portal.api.node.PortalNode;
import org.jboss.portal.api.node.PortalNodeURL;
@@ -86,9 +86,9 @@
public PortalNodeURL createActionURL(PortalNode node) throws IllegalArgumentException
{
- if (node instanceof JBossPortalNode)
+ if (node instanceof PortalObjectNode)
{
- return PortalNodeURLFactory.createActionURL((JBossPortalNode)node, invocation);
+ return PortalNodeURLFactory.createActionURL((PortalObjectNode)node, invocation);
}
else
{
@@ -98,9 +98,9 @@
public PortalNodeURL createRenderURL(PortalNode node) throws IllegalArgumentException
{
- if (node instanceof JBossPortalNode)
+ if (node instanceof PortalObjectNode)
{
- return PortalNodeURLFactory.createRenderURL((JBossPortalNode)node, invocation);
+ return PortalNodeURLFactory.createRenderURL((PortalObjectNode)node, invocation);
}
else
{
Modified: trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java 2006-10-07 13:41:42 UTC (rev 5350)
+++ trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java 2006-10-07 13:50:15 UTC (rev 5351)
@@ -26,7 +26,7 @@
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.core.aspects.controller.node.PortalNodeURLFactory;
-import org.jboss.portal.core.aspects.controller.node.JBossPortalNode;
+import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.portal.api.node.PortalNode;
@@ -44,9 +44,9 @@
public PortalNodeURL createActionURL(PortalNode node) throws IllegalArgumentException
{
- if (node instanceof JBossPortalNode)
+ if (node instanceof PortalObjectNode)
{
- return PortalNodeURLFactory.createActionURL((JBossPortalNode)node, invocation);
+ return PortalNodeURLFactory.createActionURL((PortalObjectNode)node, invocation);
}
else
{
@@ -56,9 +56,9 @@
public PortalNodeURL createRenderURL(PortalNode node) throws IllegalArgumentException
{
- if (node instanceof JBossPortalNode)
+ if (node instanceof PortalObjectNode)
{
- return PortalNodeURLFactory.createRenderURL((JBossPortalNode)node, invocation);
+ return PortalNodeURLFactory.createRenderURL((PortalObjectNode)node, invocation);
}
else
{
More information about the jboss-svn-commits
mailing list