Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 346574 - Compile errors in latest WTP RC2 build
Summary: Compile errors in latest WTP RC2 build
Status: RESOLVED FIXED
Alias: None
Product: Dali JPA Tools
Classification: WebTools
Component: Diagram Editor (show other bugs)
Version: 3.0   Edit
Hardware: PC Windows 7
: P1 normal (vote)
Target Milestone: 3.0 RC2   Edit
Assignee: Tran Le CLA
QA Contact: Stefan Dimov CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-19 21:56 EDT by Neil Hauge CLA
Modified: 2011-05-26 04:02 EDT (History)
2 users (show)

See Also:

Attachments
Proposed patch (2.90 KB, text/plain)
2011-05-19 22:15 EDT, Tran Le CLA 		no flags Details
Proposed patch 2 (3.01 KB, patch)
2011-05-19 22:53 EDT, Tran Le CLA 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Neil Hauge CLA 2011-05-19 21:56:52 EDT 
Several patches were committed in the last RC2 build.  The file JPAEditorMessages was in 3 of these patches creating a merge condition.  There was an error in the merge and as a result there are now 3 compile errors.  message.properties was also in a merge state and likely has errors that won't be seen at compile time.  This resource should also be fixed if it is broken.

In build - http://build.eclipse.org/webtools/committers/wtp-R3.3.0-I/20110519201242/I-3.3.0-20110519201242/

The 3 patches that were committed.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=345274

https://bugs.eclipse.org/bugs/show_bug.cgi?id=345312

https://bugs.eclipse.org/bugs/show_bug.cgi?id=345323
Comment 1 Tran Le CLA 2011-05-19 22:15:29 EDT 
Created attachment 196176 [details]
Proposed patch

Patch ready to be tested
Comment 2 Neil Hauge CLA 2011-05-19 22:38:39 EDT 
(In reply to comment #1)
> Created attachment 196176 [details]
> Proposed patch
> 
> Patch ready to be tested

It looks like you are missing one message in message.properties:

SaveAndRemoveAllEntitiesFeature_ContextMenuOperationDescription=Remove All Entities From Diagram and Save Changes
Comment 3 Neil Hauge CLA 2011-05-19 22:45:15 EDT 
There was also a merge in ModelIntegrationUtil, but this appears to be fine.  I think we are good to go after adding the missed property in messages.properties.
Comment 4 Tran Le CLA 2011-05-19 22:53:19 EDT 
Created attachment 196178 [details]
Proposed patch 2

Thanks Neil, I made the correction and applied the patch.
I am releasing and restarting the build.
Comment 5 Stefan Dimov CLA 2011-05-26 04:02:54 EDT 
I'm closing this one.