10:47 a.m.
Author: julien(a)jboss.com
Date: 2006-12-07 11:47:35 -0500 (Thu, 07 Dec 2006)
New Revision: 5771
Removed:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
Log:
make ContainerContext an inner interface of AbstractPortalObjectContainer
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-12-06
09:43:49 UTC (rev 5770)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-12-07
16:47:35 UTC (rev 5771)
@@ -171,4 +171,23 @@
return null;
}
}
+
+ public interface Context
+ {
+ /**
+ */
+ PortalObjectContainer getContainer();
+
+ /**
+ */
+ void destroyChild(ObjectNode node);
+
+ /**
+ */
+ void createChild(ObjectNode node);
+
+ /**
+ */
+ void updated(ObjectNode node);
+ }
}
Deleted:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java 2006-12-06
09:43:49 UTC (rev 5770)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java 2006-12-07
16:47:35 UTC (rev 5771)
@@ -1,48 +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.core.impl.model.portal;
-
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public interface ContainerContext
-{
- /**
- */
- PortalObjectContainer getContainer();
-
- /**
- */
- void destroyChild(ObjectNode node);
-
- /**
- */
- void createChild(ObjectNode node);
-
- /**
- */
- void updated(ObjectNode node);
-}
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2006-12-06
09:43:49 UTC (rev 5770)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2006-12-07
16:47:35 UTC (rev 5771)
@@ -58,7 +58,7 @@
private Map securityConstraints;
// Runtime fields
- private ContainerContext context;
+ private AbstractPortalObjectContainer.Context context;
public ObjectNode()
{
@@ -69,7 +69,7 @@
this.children = null;
}
- public ObjectNode(ContainerContext context, String id, String name)
+ public ObjectNode(AbstractPortalObjectContainer.Context context, String id, String
name)
{
if (context == null)
{
@@ -86,7 +86,7 @@
public void setContext(Object context)
{
- this.context = (ContainerContext)context;
+ this.context = (AbstractPortalObjectContainer.Context)context;
}
public Long getKey()
@@ -216,7 +216,7 @@
this.children = children;
}
- public ContainerContext getContext()
+ public AbstractPortalObjectContainer.Context getContext()
{
return context;
}
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2006-12-06
09:43:49 UTC (rev 5770)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2006-12-07
16:47:35 UTC (rev 5771)
@@ -55,7 +55,7 @@
protected SessionFactory sessionFactory;
/** . */
- protected ContainerContext ctx;
+ protected Context ctx;
/** . */
protected PortalAuthorizationManagerFactory portalAuthorizationManagerFactory;
@@ -80,7 +80,7 @@
public PersistentPortalObjectContainer()
{
- ctx = new ContainerContext()
+ ctx = new Context()
{
public PortalObjectContainer getContainer()
{
@@ -171,7 +171,7 @@
this.sessionFactoryJNDIName = sessionFactoryJNDIName;
}
- public ContainerContext getContainerContext()
+ public Context getContainerContext()
{
return this.ctx;
}
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java 2006-12-06
09:43:49 UTC (rev 5770)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java 2006-12-07
16:47:35 UTC (rev 5771)
@@ -38,14 +38,14 @@
protected ObjectNode root;
/** . */
- protected ContainerContext ctx;
+ protected Context ctx;
protected void createService() throws Exception
{
super.createService();
//
- ctx = new ContainerContext()
+ ctx = new Context()
{
public PortalObjectContainer getContainer()
{