Author: thomas.heute(a)jboss.com Date: 2007-11-27 12:48:07 -0500 (Tue, 27 Nov 2007) New Revision: 9134 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java Log: Copy to dashboard bug Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2007-11-27 17:00:45 UTC (rev 9133) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2007-11-27 17:48:07 UTC (rev 9134) @@ -104,6 +104,7 @@ ContextImpl clone = new ContextImpl(); clone.setDeclaredPropertyMap(new HashMap(getDeclaredPropertyMap())); clone.setListener(getListener()); + clone.setDisplayName(getDisplayName()); return clone; } } Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java 2007-11-27 17:00:45 UTC (rev 9133) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java 2007-11-27 17:48:07 UTC (rev 9134) @@ -103,6 +103,7 @@ PageImpl clone = new PageImpl(); clone.setDeclaredPropertyMap(new HashMap(getDeclaredPropertyMap())); clone.setListener(getListener()); + clone.setDisplayName(getDisplayName()); return clone; } } Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java 2007-11-27 17:00:45 UTC (rev 9133) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java 2007-11-27 17:48:07 UTC (rev 9134) @@ -127,6 +127,7 @@ clone.setModes(new HashSet(getModes())); clone.setDeclaredPropertyMap(new HashMap(getDeclaredPropertyMap())); clone.setListener(getListener()); + clone.setDisplayName(getDisplayName()); return clone; } } Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-27 17:00:45 UTC (rev 9133) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-27 17:48:07 UTC (rev 9134) @@ -170,7 +170,14 @@ public LocalizedString getDisplayName() { - return new LocalizedString(displayNames, Locale.ENGLISH); + if (displayNames != null) + { + return new LocalizedString(displayNames, Locale.ENGLISH); + } + else + { + return null; + } } public PortalObject copy(PortalObject parent, String name, boolean deep) throws DuplicatePortalObjectException, IllegalArgumentException Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-11-27 17:00:45 UTC (rev 9133) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-11-27 17:48:07 UTC (rev 9134) @@ -154,6 +154,7 @@ clone.setURI(uri); clone.setDeclaredPropertyMap(new HashMap(getDeclaredPropertyMap())); clone.setListener(getListener()); + clone.setDisplayName(getDisplayName()); return clone; }