Author: julien(a)jboss.com Date: 2007-04-03 09:10:49 -0400 (Tue, 03 Apr 2007) New Revision: 6909 Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/ns/PortalObjectNavigationalStateContext.java Log: simplified the navigational state change objects in order to compact create/update/destroy into a single object. remove unused listener interface def for now as it uses a batch delivery mechanism. Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/ns/PortalObjectNavigationalStateContext.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/ns/PortalObjectNavigationalStateContext.java 2007-04-03 12:48:01 UTC (rev 6908) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/ns/PortalObjectNavigationalStateContext.java 2007-04-03 13:10:49 UTC (rev 6909) @@ -83,13 +83,16 @@ if (changes != null) { NavigationalStateObjectChange change = (NavigationalStateObjectChange)changes.get(nsKey); - switch(change.getType()) + if (change != null) { - case NavigationalStateObjectChange.CREATE: - case NavigationalStateObjectChange.UPDATE: - return change.getNewValue(); - case NavigationalStateObjectChange.DESTROY: - return null; + switch(change.getType()) + { + case NavigationalStateObjectChange.CREATE: + case NavigationalStateObjectChange.UPDATE: + return change.getNewValue(); + case NavigationalStateObjectChange.DESTROY: + return null; + } } }