[jboss-svn-commits] JBoss Portal SVN: r5390 - in trunk/core/src/main/org/jboss/portal/core: impl/model/instance model/instance

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-10-10 05:16:31 -0400 (Tue, 10 Oct 2006)
New Revision: 5390

Modified:
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java
Log:
allows to create instance customization of existing customization

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java	2006-10-10 09:00:10 UTC (rev 5389)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java	2006-10-10 09:16:31 UTC (rev 5390)
@@ -172,19 +172,8 @@
       session.update(this);
    }
 
-   public InstanceCustomization getCustomization(String customizationId)
+   protected InstanceDefinitionImpl getDef()
    {
-      // Check if we have an instance for this particular user
-      Session session = containerContext.getCurrentSession();
-      Query query = session.createQuery("from InstanceCustomizationImpl where def.key=:defKey and customizationId=:customizationId");
-      query.setParameter("defKey", key);
-      query.setParameter("customizationId", customizationId);
-      query.setCacheable(true);
-      InstanceCustomizationImpl customization = (InstanceCustomizationImpl)query.uniqueResult();
-      if (customization == null)
-      {
-         customization = new InstanceCustomizationImpl(this, customizationId, containerContext, getPortletContext());
-      }
-      return customization;
+      return this;
    }
 }

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-10 09:00:10 UTC (rev 5389)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-10 09:16:31 UTC (rev 5390)
@@ -31,7 +31,9 @@
 import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.jems.hibernate.ContextObject;
 import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.core.model.instance.InstanceCustomization;
 import org.hibernate.Session;
+import org.hibernate.Query;
 import org.apache.log4j.Logger;
 
 import java.util.Arrays;
@@ -143,6 +145,8 @@
 
    protected abstract void modified(PortletContext portletContext);
 
+   protected abstract InstanceDefinitionImpl getDef();
+
    public void setProperties(PropertyChange[] changes) throws PortletInvokerException
    {
       if (changes == null)
@@ -285,6 +289,25 @@
       }
    }
 
+   public InstanceCustomization getCustomization(String customizationId)
+   {
+      // Check if we have an instance for this particular customized id
+      Session session = containerContext.getCurrentSession();
+      Query query = session.createQuery("from InstanceCustomizationImpl where def.key=:defKey and customizationId=:customizationId");
+      query.setParameter("defKey", key);
+      query.setParameter("customizationId", customizationId);
+      query.setCacheable(true);
+      InstanceCustomizationImpl customization = (InstanceCustomizationImpl)query.uniqueResult();
+      if (customization == null)
+      {
+         InstanceDefinitionImpl def = getDef();
+         customization = new InstanceCustomizationImpl(def, customizationId, containerContext, getPortletContext());
+      }
+      return customization;
+   }
+
+
+
    // ContextObject implementation *************************************************************************************
 
    public void setContext(Object context)

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java	2006-10-10 09:00:10 UTC (rev 5389)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java	2006-10-10 09:16:31 UTC (rev 5390)
@@ -85,4 +85,9 @@
     * @param changes the changes
     */
    void setProperties(PropertyChange[] changes) throws PortletInvokerException;
+
+   /**
+    * Return a customization.
+    */
+   InstanceCustomization getCustomization(String customizationId);
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java	2006-10-10 09:00:10 UTC (rev 5389)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java	2006-10-10 09:16:31 UTC (rev 5390)
@@ -33,12 +33,6 @@
    String getId();
 
    /**
-    * Return a customization.
-    */
-   InstanceCustomization getCustomization(String customizationId);
-
-
-   /**
     * Return true if the instance state can be modified.
     *
     * @return if the instance is modifiable