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 153369 Details for
Bug 296457
Problems with new problems and quick fixes for build.properties
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
20091201.txt (text/plain), 6.54 KB, created by
Ankur Sharma
on 2009-11-30 13:31:08 EST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Ankur Sharma
Created:
2009-11-30 13:31:08 EST
Size:
6.54 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.pde.core >Index: src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java,v >retrieving revision 1.46 >diff -u -r1.46 BuildErrorReporter.java >--- src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java 23 Nov 2009 19:40:51 -0000 1.46 >+++ src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java 30 Nov 2009 18:32:49 -0000 >@@ -288,8 +288,10 @@ > message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel); > prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_EE); > } else { >- message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel); >- prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_REPLACE, PDEMarkerFactory.CAT_EE); >+ if (!projectJavaCompatibility.equalsIgnoreCase(jreCompilationProfileEntry.getTokens()[0])) { >+ message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel); >+ prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_REPLACE, PDEMarkerFactory.CAT_EE); >+ } > } > } else { > if (javacSourceEntry == null) { >#P org.eclipse.pde.ui >Index: src/org/eclipse/pde/internal/ui/correction/MultiFixResolution.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/MultiFixResolution.java,v >retrieving revision 1.1 >diff -u -r1.1 MultiFixResolution.java >--- src/org/eclipse/pde/internal/ui/correction/MultiFixResolution.java 17 Nov 2009 20:33:09 -0000 1.1 >+++ src/org/eclipse/pde/internal/ui/correction/MultiFixResolution.java 30 Nov 2009 18:32:53 -0000 >@@ -15,6 +15,7 @@ > import org.eclipse.core.resources.IResource; > import org.eclipse.core.runtime.CoreException; > import org.eclipse.pde.internal.core.builders.PDEMarkerFactory; >+import org.eclipse.pde.internal.ui.PDEPluginImages; > import org.eclipse.pde.internal.ui.PDEUIMessages; > import org.eclipse.swt.graphics.Image; > import org.eclipse.ui.IMarkerResolution; >@@ -27,26 +28,24 @@ > public class MultiFixResolution extends WorkbenchMarkerResolution { > > IMarker fMarker; >- String fCategory; > // if quick fix is invoked from editor, then fix all related markers. If invoked from problem view, fix only the selected ones. > boolean problemViewQuickFix; > >- public MultiFixResolution(IMarker marker, String category) { >+ public MultiFixResolution(IMarker marker) { > fMarker = marker; >- fCategory = category; > problemViewQuickFix = false; > } > > public IMarker[] findOtherMarkers(IMarker[] markers) { > ArrayList relatedMarkers = new ArrayList(); >- for (int i = 0; i < markers.length; i++) { >- try { >- if (markers[i].getAttribute(PDEMarkerFactory.CAT_ID).equals(fCategory) && !markers[i].equals(fMarker)) { >+ try { >+ String markerCategory = (String) fMarker.getAttribute(PDEMarkerFactory.CAT_ID); >+ for (int i = 0; i < markers.length; i++) { >+ if (markerCategory.equals(markers[i].getAttribute(PDEMarkerFactory.CAT_ID)) && !markers[i].equals(fMarker)) { > relatedMarkers.add(markers[i]); > } >- } catch (CoreException e) { > } >- >+ } catch (CoreException e) { > } > problemViewQuickFix = true; > return (IMarker[]) relatedMarkers.toArray(new IMarker[relatedMarkers.size()]); >@@ -57,7 +56,7 @@ > } > > public Image getImage() { >- return null; >+ return PDEPluginImages.DESC_ADD_ATT.createImage(); > } > > public String getLabel() { >Index: src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java,v >retrieving revision 1.37 >diff -u -r1.37 ResolutionGenerator.java >--- src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java 17 Nov 2009 20:33:09 -0000 1.37 >+++ src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java 30 Nov 2009 18:32:54 -0000 >@@ -110,8 +110,13 @@ > ArrayList resolutions = new ArrayList(2); > resolutions.add(new AddBuildEntryResolution(AbstractPDEMarkerResolution.CREATE_TYPE, marker)); > try { >- if (marker.getAttribute(PDEMarkerFactory.CAT_ID).equals(PDEMarkerFactory.CAT_EE)) { >- resolutions.add(new MultiFixResolution(marker, PDEMarkerFactory.CAT_EE)); >+ String markerCategory = (String) marker.getAttribute(PDEMarkerFactory.CAT_ID); >+ IMarker[] relatedMarkers = marker.getResource().findMarkers(marker.getType(), true, IResource.DEPTH_INFINITE); >+ for (int i = 0; i < relatedMarkers.length; i++) { >+ if (markerCategory.equals(relatedMarkers[i].getAttribute(PDEMarkerFactory.CAT_ID)) && !marker.equals(relatedMarkers[i])) { >+ resolutions.add(new MultiFixResolution(marker)); >+ break; >+ } > } > } catch (CoreException e) { > } >Index: src/org/eclipse/pde/internal/ui/pderesources.properties >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v >retrieving revision 1.1101 >diff -u -r1.1101 pderesources.properties >--- src/org/eclipse/pde/internal/ui/pderesources.properties 17 Nov 2009 20:33:09 -0000 1.1101 >+++ src/org/eclipse/pde/internal/ui/pderesources.properties 30 Nov 2009 18:32:53 -0000 >@@ -2140,7 +2140,7 @@ > RenamePluginProcessor_renameProjectDesc=Rename project ''{0}'' to ''{1}'' > RemoveInternalDirective_label=Remove redundant x-internal header > RemoveInternalDirective_desc=The x-friends directive implies x-internal, so the latter is redundant >-MultiFixResolution_FixAll=Add all missing java compiler build entries. >+MultiFixResolution_FixAll=Add all missing java compiler build entries > ImportPackageSection_dialogButtonLabel=&Show non-exported packages > ExportPackageSection_dialogButtonLabel=&Show non-Java packages > MissingResourcePage_missingResource=Missing Resource
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 296457
: 153369