Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 71055 invoked from network); 31 Dec 2004 14:22:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 31 Dec 2004 14:22:31 -0000 Received: (qmail 65299 invoked by uid 500); 31 Dec 2004 14:22:31 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 65130 invoked by uid 500); 31 Dec 2004 14:22:30 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 65115 invoked by uid 99); 31 Dec 2004 14:22:30 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 31 Dec 2004 06:22:28 -0800 Received: (qmail 70986 invoked by uid 65534); 31 Dec 2004 14:22:27 -0000 Date: 31 Dec 2004 14:22:27 -0000 Message-ID: <20041231142227.70982.qmail@minotaur.apache.org> From: antonio@apache.org To: cvs@cocoon.apache.org Subject: svn commit: r123794 - /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: antonio Date: Fri Dec 31 06:22:25 2004 New Revision: 123794 URL: http://svn.apache.org/viewcvs?view=rev&rev=123794 Log: Allow equals to be true Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java?view=diff&rev=123794&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java&r1=123793&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java&r2=123794 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java Fri Dec 31 06:22:25 2004 @@ -63,7 +63,7 @@ if ( state != null ) { final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData(); WindowState ws = (WindowState) cid.getTemporaryAttribute("window-state"); - if ( (ws == null && !state.equals(PortletMode.VIEW)) + if ( (ws == null && !state.equals(WindowState.NORMAL)) || (ws != null && !ws.equals(state)) ) { if ( ws != null ) { cid.setTemporaryAttribute("previous-window-state", ws);