summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-03-13 03:20:39 (EDT)
committer Manik Kishore2012-06-19 07:20:49 (EDT)
commit60bb525757009c38f6fa6d51137791a4e78c5a9a (patch)
tree5c613d5f9cc07df3470d1a896ec6724e6d6e26b5
parent7b74923ac0b891a703ad3a866e51d2f1220bbca0 (diff)
downloadorg.eclipse.stardust.ui.web-60bb525757009c38f6fa6d51137791a4e78c5a9a.zip
org.eclipse.stardust.ui.web-60bb525757009c38f6fa6d51137791a4e78c5a9a.tar.gz
org.eclipse.stardust.ui.web-60bb525757009c38f6fa6d51137791a4e78c5a9a.tar.bz2
Jira-ID: CRNT-24171
1)Added check in setFocusView(view) for newFocusView STATE already closed in portalUiController.java. 2)Removed code from closeAllViews() in PortalApplication.java setting setFocusView(null) for portalUiController. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54486 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java10
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java2
2 files changed, 6 insertions, 6 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
index b7da4cc..0364cf2 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
@@ -789,11 +789,7 @@ public class PortalApplication
closeView(view);
}
- // When activity panel is open with Document Viewer, closeView() does not clear the
- // Activity Panel view fro focusViewStack, manually removing if any view is open
- focusViewStack.clear();
- displayedViews.clear();
- getPortalUiController().setFocusView(null);
+ addToDisplayedViews(getLastFocusView());
}
/**
@@ -835,6 +831,10 @@ public class PortalApplication
*/
public void closeView(View view, boolean force)
{
+ if (ViewState.CLOSED == view.getViewState())
+ {
+ return; // Already Closed
+ }
View focusView = getFocusView();
if (getPortalUiController().closeView(view, force))
{
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java
index 8a0eb2b..e458390 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java
@@ -420,7 +420,7 @@ public class PortalUiController
broadcastNonVetoableViewEvent(oldFocusView, ViewEventType.DEACTIVATED);
}
- if (null != newFocusView)
+ if (null != newFocusView && ViewState.CLOSED != newFocusView.getViewState())
{
boolean success = broadcastVetoableViewEvent(newFocusView, ViewEventType.TO_BE_ACTIVATED);
if(!success)