[portal-commits] JBoss Portal SVN: r6734 - trunk/core/src/main/org/jboss/portal/core/impl/model/instance.
Author: julien(a)jboss.com
Date: 2007-03-18 21:09:46 -0400 (Sun, 18 Mar 2007)
New Revision: 6734
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java
Log:
better impl of InstanceContext.getId() in case of a customization
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java 2007-03-19
00:38:40 UTC (rev 6733)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java 2007-03-19
01:09:46 UTC (rev 6734)
@@ -23,6 +23,8 @@
package org.jboss.portal.core.impl.model.instance;
import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.core.model.instance.InstanceDefinition;
+import org.jboss.portal.core.model.instance.InstanceCustomization;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.StateEvent;
import org.jboss.portal.portlet.spi.InstanceContext;
@@ -59,7 +61,16 @@
public String getId()
{
- return instance.getId();
+ if (instance instanceof InstanceDefinition)
+ {
+ return instance.getId();
+ }
+ else
+ {
+ InstanceCustomization cust = (InstanceCustomization)instance;
+ InstanceDefinition def = cust.getDefinition();
+ return def.getId() + "." + cust.getId();
+ }
}
public AccessMode getAccessMode()