Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 125885 Details for
Bug 184475
[Viewers] Handler conflicts when viewer types change
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
Patch v01
clipboard.txt (text/plain), 3.86 KB, created by
Tomasz Zarna
on 2009-02-17 08:34:26 EST
(
hide
)
Description:
Patch v01
Filename:
MIME Type:
Creator:
Tomasz Zarna
Created:
2009-02-17 08:34:26 EST
Size:
3.86 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.compare >Index: compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java,v >retrieving revision 1.75 >diff -u -r1.75 ContentMergeViewer.java >--- compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java 20 Jan 2009 10:56:12 -0000 1.75 >+++ compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java 17 Feb 2009 13:34:38 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2008 IBM Corporation and others. >+ * Copyright (c) 2000, 2009 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -1260,4 +1260,8 @@ > } > refresh(); > } >+ >+ CompareHandlerService getCompareHandlerService() { >+ return fHandlerService; >+ } > } >Index: compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v >retrieving revision 1.250 >diff -u -r1.250 TextMergeViewer.java >--- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 28 Jan 2009 10:43:07 -0000 1.250 >+++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 17 Feb 2009 13:34:40 -0000 >@@ -4899,6 +4899,10 @@ > return getFindReplaceTarget(); > if (adapter == CompareHandlerService.class) > return fHandlerService; >+ if (adapter == CompareHandlerService[].class) { >+ return new CompareHandlerService[] { fHandlerService, >+ super.getCompareHandlerService() }; >+ } > if (adapter == IEditorInput.class) { > // return active editor input > if (fLeft != null && fLeft == fFocusPart) >Index: compare/org/eclipse/compare/internal/ViewerDescriptor.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java,v >retrieving revision 1.14 >diff -u -r1.14 ViewerDescriptor.java >--- compare/org/eclipse/compare/internal/ViewerDescriptor.java 22 May 2007 20:19:52 -0000 1.14 >+++ compare/org/eclipse/compare/internal/ViewerDescriptor.java 17 Feb 2009 13:34:41 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2007 IBM Corporation and others. >+ * Copyright (c) 2000, 2009 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -53,9 +53,12 @@ > // If we are going to return a new viewer, we want to preemptively deregister > // any handlers to avoid the logging of conflict warnings > if (currentViewer != null) { >- CompareHandlerService compareHandlerService = (CompareHandlerService)Utilities.getAdapter(currentViewer, CompareHandlerService.class); >- if (compareHandlerService != null) >- compareHandlerService.dispose(); >+ CompareHandlerService[] compareHandlerService = (CompareHandlerService[]) Utilities.getAdapter(currentViewer, CompareHandlerService[].class); >+ if (compareHandlerService != null) { >+ for (int i = 0; i < compareHandlerService.length; i++) { >+ compareHandlerService[i].dispose(); >+ } >+ } > } > Viewer viewer= fViewerCreator.createViewer(parent, mp); > if (viewer != null)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 184475
: 125885