### Eclipse Workspace Patch 1.0 #P org.eclipse.tptp.platform.common.ui.trace Index: src/org/eclipse/hyades/trace/ui/TraceViewer.java =================================================================== RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/src/org/eclipse/hyades/trace/ui/TraceViewer.java,v retrieving revision 1.2 diff -u -r1.2 TraceViewer.java --- src/org/eclipse/hyades/trace/ui/TraceViewer.java 18 Aug 2006 14:48:34 -0000 1.2 +++ src/org/eclipse/hyades/trace/ui/TraceViewer.java 29 May 2007 16:15:48 -0000 @@ -476,7 +476,8 @@ * Shows the given page */ public void showPage(IPage page) { - book.showPage(page.getControl()); + if (page.getControl()!=null) + book.showPage(page.getControl()); currentPage = page; } #P org.eclipse.tptp.platform.log.views Index: src/org/eclipse/tptp/platform/log/views/internal/navigator/LogNavigatorActionGroup.java =================================================================== RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/tptp/platform/log/views/internal/navigator/LogNavigatorActionGroup.java,v retrieving revision 1.17 diff -u -r1.17 LogNavigatorActionGroup.java --- src/org/eclipse/tptp/platform/log/views/internal/navigator/LogNavigatorActionGroup.java 5 Apr 2007 15:34:37 -0000 1.17 +++ src/org/eclipse/tptp/platform/log/views/internal/navigator/LogNavigatorActionGroup.java 29 May 2007 16:15:48 -0000 @@ -23,6 +23,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Platform; import org.eclipse.emf.ecore.EObject; import org.eclipse.hyades.log.ui.internal.LogMessages; import org.eclipse.hyades.models.hierarchy.CorrelationContainerProxy; @@ -287,7 +288,8 @@ } menu.appendToGroup(INavigatorContribution.GROUP_REFRESH,fRefreshTree); - menu.appendToGroup(INavigatorContribution.GROUP_REFRESH,fRefreshLocal); + if (Platform.getBundle("org.eclipse.tptp.platform.rcp.log")==null) + menu.appendToGroup(INavigatorContribution.GROUP_REFRESH,fRefreshLocal); if (!multiSelection) { Index: src/org/eclipse/tptp/platform/log/views/internal/views/LogPage.java =================================================================== RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/tptp/platform/log/views/internal/views/LogPage.java,v retrieving revision 1.19 diff -u -r1.19 LogPage.java --- src/org/eclipse/tptp/platform/log/views/internal/views/LogPage.java 3 Oct 2006 22:48:38 -0000 1.19 +++ src/org/eclipse/tptp/platform/log/views/internal/views/LogPage.java 29 May 2007 16:15:48 -0000 @@ -112,7 +112,7 @@ */ public void update(boolean newPage) { - if(!newPage){ + if(!newPage && _view!=null){ _view.refresh(); } }