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 121942 Details for
Bug 260362
NPE when using content assist in compare
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch v01
clipboard.txt (text/plain), 1.44 KB, created by
Tomasz Zarna
on 2009-01-08 07:56:44 EST
(
hide
)
Description:
Patch v01
Filename:
MIME Type:
Creator:
Tomasz Zarna
Created:
2009-01-08 07:56:44 EST
Size:
1.44 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jdt.ui >Index: ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java,v >retrieving revision 1.22 >diff -u -r1.22 JavaMergeViewer.java >--- ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java 7 Jan 2009 10:15:57 -0000 1.22 >+++ ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java 8 Jan 2009 12:56:02 -0000 >@@ -145,14 +145,6 @@ > setPreferenceStore(createChainedPreferenceStore(project)); > } > } >- if (fSourceViewer != null) { >- Iterator iterator= fSourceViewer.iterator(); >- while (iterator.hasNext()) { >- SourceViewer sourceViewer= (SourceViewer)iterator.next(); >- sourceViewer.unconfigure(); >- sourceViewer.configure(getSourceViewerConfiguration(sourceViewer, null)); >- } >- } > super.setInput(input); > } > >@@ -208,9 +200,11 @@ > JavaTextTools tools= JavaCompareUtilities.getJavaTextTools(); > if (tools != null) { > IEditorInput editorInput= getEditorInput(sourceViewer); >- if (editorInput == null) >- return; > sourceViewer.unconfigure(); >+ if (editorInput == null) { >+ sourceViewer.configure(getSourceViewerConfiguration(sourceViewer, null)); >+ return; >+ } > getSourceViewerConfiguration(sourceViewer, editorInput); > } > }
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 260362
: 121942 |
121943