Migrate the e4 tools to PDE #1081

laeubi · 2024-01-28T05:44:40Z

Please carefully review if this is the desired state, I'll now start to integrate this into the build ...

The following commit introduces type parameters on databinding classes. This commit cleans up warnings resulting from that. https://git.eclipse.org/c/platform/eclipse.platform.ui.git/commit/?id=2220dc6057030ca7d761b4ed6b7debb50eec3452 Change-Id: Ibf73d868e3a0db750014329d592db2a97c840760 Signed-off-by: Jens Lidestrom <[email protected]>

The Abstract new class Page now persist the last selected package. (The solution works also for NewAddonCW, NewDynamicMenuContributionCW, NewImperativeExplressionCW, NewPartCW, and NewToolControlCW) Change-Id: I4e3ac01c189ec3fa2441f47c7794bf9d9f451f09 Signed-off-by: Patrik Suzzi <[email protected]>

Change-Id: Iec558d1de9f5c5cf1bd9467ea8350148816e0271 Signed-off-by: Lars Vogel <[email protected]>

Change-Id: Id8f44280053188895ba510563c647374dc46327e Signed-off-by: Lars Vogel <[email protected]>

Change-Id: Ic8f79f160be52f267fcbc1717d60ff8099be90b6 Signed-off-by: Lars Vogel <[email protected]>

Change-Id: I23cab3d2fb96c25491a43e86d05a03bcda2fcf11 Signed-off-by: Lars Vogel <[email protected]>

/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties Change-Id: Ia62912136c42417e10f258b2326a076dc440b0ac Signed-off-by: Lars Vogel <[email protected]>

Change-Id: I4f4aedbc67eb1210c3b92210739e0326c9908b53 Signed-off-by: Sravan Kumar Lakkimsetti <[email protected]>

editor Change-Id: I26018408a1f22a00a7b06e2e4561c90e4375da28 Signed-off-by: Lars Vogel <[email protected]>

Change-Id: Iac2dafc26f4cec4759d7b47c4a13a5e1a5255ebc Signed-off-by: Lars Vogel <[email protected]>

working Change-Id: I897c7f27c66de4e430698d21bb91f1da4e2cab40 Signed-off-by: Burcu Karlidag <[email protected]>

working Steps to reproduce: Create a new Plug-in Project as Rich Client Application select Eclipse 4 RCP application. The class URI Button in the Part Descriptor of the created Application.e4xmi was not working Change-Id: I498e01bb60e2a023dcbb71bbdae4e9ec67fa9398 Signed-off-by: Burcu Karlidag <[email protected]>

Change-Id: Ie0fc86833c346cdde3648d6c1e3cf92afc4be1e4 Signed-off-by: Christof Joswig <[email protected]>

The Feature Name field is empty. Pressing the Add button in the Table Viewer leads to a NPE exception. java.lang.NullPointerException at org.eclipse.e4.tools.emf.ui.internal.common.component.StringModelFragment$3.addPressed(StringModelFragment.java:422) Change-Id: I91ef4e45b654ad8c4d091abbcd2dd904b94da362 Signed-off-by: Christof Joswig <[email protected]>

Change-Id: I7ff26d1ef258f541176773b10ca6c1ebc69403a2 Signed-off-by: Christof Joswig <[email protected]>

Change-Id: I18be37d47d978be4ac5c1283b135dd2ee2b98e8a Signed-off-by: Christof Joswig <[email protected]>

- Disable down/up bottons for multip selections - Disable down/up button when last/first element is selected Fixed issue on windows: - Keep focus when pressing up/down buttons Change-Id: Ic4b899a51df19c018abfdfd5df0dd883ad32aab2 Signed-off-by: Christof Joswig <[email protected]>

Goto: ->Model Fragment->Handler->Persisted State table doesn't fill Change-Id: I07f5baf8d855788d956422b69b4589c35b7ff0e2 Signed-off-by: Christof Joswig <[email protected]>

Change-Id: If33fd165ada604485fc862170dfa9489323f94fb Signed-off-by: [email protected] <[email protected]>

Change-Id: Ia70b63538cec2b725d1163bd9769a06fdba9a121 Signed-off-by: [email protected] <[email protected]>

Change-Id: Id9ef473a54c42b5fac70e550743d23451186536e Signed-off-by: Christof Joswig <[email protected]>

Change-Id: I53468f930e539e46740d16d2d600ca3a89c92a85 Signed-off-by: Christof Joswig <[email protected]>

Change-Id: I7d4500bfe8b1c576131964c6df4932e366b99557 Signed-off-by: Christof Joswig <[email protected]>

Change-Id: If279b3b8d5c109bc036a13e4281c701702899617 Signed-off-by: [email protected] <[email protected]>

Change-Id: I584cbf5c2ae5bb215a520bd65d1a7b6232d90b9a Signed-off-by: [email protected] <[email protected]>

-> align find buttons in E4 Editor Change-Id: I913808af3fea831deaad44246f3434063070f4c7 Signed-off-by: [email protected] <[email protected]>

Change-Id: Ic441b1f61c8f79c4ab88254bc2d440acd1e12db5 Signed-off-by: [email protected] <[email protected]>

Change-Id: I8b8a7f3548273a3535af1cf63ad3f2c1c7619453 Signed-off-by: Lars Vogel <[email protected]>

classes Change-Id: Ibd4496bb5180f825b6aca4f17e439bcdffc497a2 Signed-off-by: Lars Vogel <[email protected]>

Change-Id: I2a54dcdb5503d46621908049691848252e6dc66b

HannesWell

Thanks for working on this.
In general this looks good, but I suggest to move the e4-tools projects into a folder named e4-tools not just tools.
We already have apitools, so we should be specific here too.

Furthermore the Oomph setup has to be adjusted, but that can also be done subsequently.

laeubi · 2024-01-28T10:39:07Z

I suggest to move the e4-tools projects into a folder named e4-tools not just tools.
We already have apitools, so we should be specific here too.

I actually don't want to complicate things too much, the files where already moved to ui then moved there and so on.

If we have merged this, we can of course think about moving thing again around but for now I think we should complete this asap to not run into merge conflicts.

iloveeclipse · 2024-01-28T10:41:45Z

If we have merged this, we can of course think about moving thing again

I would prefer we would move it only once

around but for now I think we should complete this asap to not run into merge conflicts.

There is no rush, as long as few active committers can have a consensus how a merge should happen.

HannesWell · 2024-01-28T10:46:12Z

If we have merged this, we can of course think about moving thing again

I would prefer we would move it only once

Me too.
Does everyone participating in this PR currently is fine with e4-tools?

@laeubi if you have to now time to move it I can adjust this PR for you quickly.

iloveeclipse · 2024-01-28T10:47:08Z

And yes, looking on the new structure I agree with Hannes, "tools" is non saying, while "e4-tools" is much better.
To be consistent with "apitools" may be better to have "e4tools" (no dash)?
Beside this, history seem to be OK after merge.

HannesWell · 2024-01-28T10:49:32Z

To be consistent with "apitools" may be better to have "e4tools" (no dash)?

Thought about this as well and personally would have liked it more with a dash. But since renaming apitools just for that is not really worth the effort I'm also fine with e4tools to have it consistent.

merks · 2024-01-28T10:58:58Z

I’m fine with or without the dash.

HannesWell · 2024-01-28T10:59:51Z

@laeubi I have it almost ready locally, with an intermediate commit just after the merge to move it to e4tools (without dash).
If you are fine, I can force push it to this branch.

HannesWell · 2024-01-28T11:16:35Z

In order to speed this up, I took the liberty to update this PR with the suggested move after the merge and adapted to following commits accordingly.

laeubi · 2024-01-28T12:04:02Z

I would prefer we would move it only once

That's the point it is NOT moved see:

https://github.com/eclipse-platform/eclipse.platform.ui/tree/master/tools

I just imported all commits from the repository as is so don't want to add additional "noise" for the inital import.

laeubi · 2024-01-28T12:07:08Z

So can we PLEASE delay any "make it look nicer" to follow up PRs?

Merging repositories is already a daunting task so adding addition "cleanup" as part of the merge is not really anything beneficial beside it is required for the build to succeed.

HannesWell · 2024-01-28T12:25:39Z

I just imported all commits from the repository as is so don't want to add additional "noise" for the inital import.

Importing these commits is already 'noise' and moving them around is another 'noise'. Therefore I would have done that (closely) together in one 'noise'.

Merging repositories is already a daunting task so adding addition "cleanup" as part of the merge is not really anything beneficial beside it is required for the build to succeed.

Well that's why I tried to help you with that extra work, but if you think it is so much better to do that separately and adjust the build twice you can restore your previous state and it can be moved later.

laeubi · 2024-01-28T12:32:37Z

but if you think it is so much better to do that separately and adjust the build twice

I won't do it at all for a simple reason

we previously always have choose the name of the original repo that was "tools"
we don't have e3tools either so e4tools is missleading, also the ui folder already contains some "e4 tools" so this makes it not clearer or better
we now have two times interrupting the history, e.g. look at this file it show:

Renamed from tools/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
(Browse History)

if you then follow it it shows you the previous move from Lars:
Renamed from bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/CopyAction.java
(Browse History)

and now you see the "real" history, so for me renaming the folder does not bring anything useful in terms of git history either...

HannesWell · 2024-01-28T12:55:24Z

we previously always have choose the name of the original repo that was "tools"

But that was for another repository, which does not have other 'tools'.

we don't have e3tools either so e4tools is missleading, also the ui folder already contains some "e4 tools" so this makes it not clearer or better

And we don't have e2 and e1, so I don't understand why it is a prerequisite?
In general I agree that the overall structure is not ideal, but has probably grown historically, but I don't see a big need to change the existing structure (which affects existing PRs and local changes). In the end the path within the repo does not really matter.
But if we add new files to the repo, we can and should try how to fit that best into the existing structure (existing PRs local changes have to be adapted any way). And since all the added projects are named org.eclipse.e4.tools* and are therefore different from the existing projects, they should IMHO reside in a specific location.

we now have two times interrupting the history, e.g. look at this file it show:

That's right, but I don't see why this is a problem as long as within git-blame per line is preserved (which a move does).

HannesWell · 2024-01-28T12:57:10Z

But as we have discussed privately in the end the location is not a show stopper and all of use can do more important things.
@iloveeclipse and @merks if you are fine with the current location in e4tools I'll continue with the merge to not delay this further.

iloveeclipse · 2024-01-28T13:13:17Z

if you are fine with the current location in e4tools I'll continue with the merge to not delay this further.

Yes, I'm fine.

HannesWell · 2024-01-28T13:44:54Z

Merged it now. Thank you @laeubi for this work.

akurtakov · 2024-01-28T16:03:28Z

Thanks for all the work guys! I try to take weekends off computers so you're most likely gonna see delays during that time in my responses.

mickaelistria · 2024-01-29T08:08:07Z

Thank you very much for this refactoring!

Jens Lidestrom and others added 30 commits July 3, 2018 17:25

Bug 530393 - EPL 2.0 update for platform.ui.tools feature

5b77381

Change-Id: Iec558d1de9f5c5cf1bd9467ea8350148816e0271 Signed-off-by: Lars Vogel <[email protected]>

Bug 530393 - EPL 2.0 update for platform.ui.tools tests

1183317

Change-Id: Id8f44280053188895ba510563c647374dc46327e Signed-off-by: Lars Vogel <[email protected]>

Bug 530393 - EPL 2.0 update for platform.ui.tools plug-ins

8b15549

Change-Id: Ic8f79f160be52f267fcbc1717d60ff8099be90b6 Signed-off-by: Lars Vogel <[email protected]>

Bug 535802 - EPL-2.0 for JDT templates in platform.ui.tools

53fb5a1

Change-Id: I23cab3d2fb96c25491a43e86d05a03bcda2fcf11 Signed-off-by: Lars Vogel <[email protected]>

Bug 538210- Fixes broken copyright in

dc5ab9f

/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties Change-Id: Ia62912136c42417e10f258b2326a076dc440b0ac Signed-off-by: Lars Vogel <[email protected]>

Bug 538531 - POM version change for 4.10 release

3562630

Change-Id: I4f4aedbc67eb1210c3b92210739e0326c9908b53 Signed-off-by: Sravan Kumar Lakkimsetti <[email protected]>

Bug 538778 - Enable auto activation keys for content assists in fragment

7490652

editor Change-Id: I26018408a1f22a00a7b06e2e4561c90e4375da28 Signed-off-by: Lars Vogel <[email protected]>

4.10 version increase for org.eclipse.e4.tools.emf.ui

479b4fa

Change-Id: Iac2dafc26f4cec4759d7b47c4a13a5e1a5255ebc Signed-off-by: Lars Vogel <[email protected]>

Bug 538787 - Find class button in Part Descriptor in e4 editor not

ceb1b07

working Change-Id: I897c7f27c66de4e430698d21bb91f1da4e2cab40 Signed-off-by: Burcu Karlidag <[email protected]>

Fix right-justified editor labels

9f36f16

Change-Id: Ie0fc86833c346cdde3648d6c1e3cf92afc4be1e4 Signed-off-by: Christof Joswig <[email protected]>

Remove label comment

7f01e70

Change-Id: I7ff26d1ef258f541176773b10ca6c1ebc69403a2 Signed-off-by: Christof Joswig <[email protected]>

Replace getSelection with getStructuredSelection

9be4344

Change-Id: I18be37d47d978be4ac5c1283b135dd2ee2b98e8a Signed-off-by: Christof Joswig <[email protected]>

Fix table layout to FILL.BOTH

cb8f0bf

Goto: ->Model Fragment->Handler->Persisted State table doesn't fill Change-Id: I07f5baf8d855788d956422b69b4589c35b7ff0e2 Signed-off-by: Christof Joswig <[email protected]>

Remove unused labels

52cb5af

Change-Id: If33fd165ada604485fc862170dfa9489323f94fb Signed-off-by: [email protected] <[email protected]>

Fix right-justified label in Area Editor

4289b82

Change-Id: Ia70b63538cec2b725d1163bd9769a06fdba9a121 Signed-off-by: [email protected] <[email protected]>

Bug 539141 - Remove Message Class in E4Model Editor

390fca8

Change-Id: Id9ef473a54c42b5fac70e550743d23451186536e Signed-off-by: Christof Joswig <[email protected]>

Bug 539164 - Tabbing is not working in E4 table editors

faaa8bd

Change-Id: I53468f930e539e46740d16d2d600ca3a89c92a85 Signed-off-by: Christof Joswig <[email protected]>

Bug 539142 - Add : to labels in E4Model Editor

791e5e2

Change-Id: I7d4500bfe8b1c576131964c6df4932e366b99557 Signed-off-by: Christof Joswig <[email protected]>

Bug 528860 - Polish e4 Tools

2739af6

Change-Id: If279b3b8d5c109bc036a13e4281c701702899617 Signed-off-by: [email protected] <[email protected]>

Bug 539201 - New Option for AbstractPickList to hide the empty group

89610e6

Change-Id: I584cbf5c2ae5bb215a520bd65d1a7b6232d90b9a Signed-off-by: [email protected] <[email protected]>

Fix missing Find ... button icon for Model Fragment editor

98aac76

-> align find buttons in E4 Editor Change-Id: I913808af3fea831deaad44246f3434063070f4c7 Signed-off-by: [email protected] <[email protected]>

Bug 539141 - Fix compiler warnings

84db347

Change-Id: Ic441b1f61c8f79c4ab88254bc2d440acd1e12db5 Signed-off-by: [email protected] <[email protected]>

Version 4.10 update of bundles/org.eclipse.e4.tools.compat

a799c35

Change-Id: I8b8a7f3548273a3535af1cf63ad3f2c1c7619453 Signed-off-by: Lars Vogel <[email protected]>

Bug 493655 - Remove org.eclipse.e4.languages extension point and related

2738d0d

classes Change-Id: Ibd4496bb5180f825b6aca4f17e439bcdffc497a2 Signed-off-by: Lars Vogel <[email protected]>

Bug 539713 - Comparator Error in I20181001-1800 Build

886ba46

Change-Id: I2a54dcdb5503d46621908049691848252e6dc66b

HannesWell reviewed Jan 28, 2024

View reviewed changes

laeubi mentioned this pull request Jan 28, 2024

Restore RUN_API_ANALYSIS_AS_JOB default value #1083

Merged

Move e4.tools from 'tools' to 'e4tools' sub-directory

13b9e5b

HannesWell force-pushed the merge_e4_tools branch from 69d503a to c4a183e Compare January 28, 2024 11:15

laeubi added 3 commits January 28, 2024 12:21

Adapt the build to e4.tools merge

7363edc

Don't use local build artifacts

8c0d7e2

Fix API tool warnings in e4.tools.compat

3d0cbb8

HannesWell force-pushed the merge_e4_tools branch from c4a183e to 3d0cbb8 Compare January 28, 2024 11:22

HannesWell requested a review from merks January 28, 2024 12:57

laeubi mentioned this pull request Jan 28, 2024

Remove 'tools' from repository eclipse-platform/eclipse.platform.ui#1581

Merged

HannesWell merged commit 8a229fc into eclipse-pde:master Jan 28, 2024
11 of 17 checks passed

HannesWell mentioned this pull request Jan 28, 2024

Adapt PDE's Oomph setupt to e4.tools merge #1085

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate the e4 tools to PDE #1081

Migrate the e4 tools to PDE #1081

laeubi commented Jan 28, 2024

HannesWell left a comment •

edited

Loading

laeubi commented Jan 28, 2024

iloveeclipse commented Jan 28, 2024

HannesWell commented Jan 28, 2024

iloveeclipse commented Jan 28, 2024

HannesWell commented Jan 28, 2024

merks commented Jan 28, 2024

HannesWell commented Jan 28, 2024 •

edited

Loading

HannesWell commented Jan 28, 2024

laeubi commented Jan 28, 2024

laeubi commented Jan 28, 2024

HannesWell commented Jan 28, 2024

laeubi commented Jan 28, 2024

HannesWell commented Jan 28, 2024

HannesWell commented Jan 28, 2024

iloveeclipse commented Jan 28, 2024

HannesWell commented Jan 28, 2024

akurtakov commented Jan 28, 2024

mickaelistria commented Jan 29, 2024

Migrate the e4 tools to PDE #1081

Migrate the e4 tools to PDE #1081

Conversation

laeubi commented Jan 28, 2024

HannesWell left a comment • edited Loading

Choose a reason for hiding this comment

laeubi commented Jan 28, 2024

iloveeclipse commented Jan 28, 2024

HannesWell commented Jan 28, 2024

iloveeclipse commented Jan 28, 2024

HannesWell commented Jan 28, 2024

merks commented Jan 28, 2024

HannesWell commented Jan 28, 2024 • edited Loading

HannesWell commented Jan 28, 2024

laeubi commented Jan 28, 2024

laeubi commented Jan 28, 2024

HannesWell commented Jan 28, 2024

laeubi commented Jan 28, 2024

HannesWell commented Jan 28, 2024

HannesWell commented Jan 28, 2024

iloveeclipse commented Jan 28, 2024

HannesWell commented Jan 28, 2024

akurtakov commented Jan 28, 2024

mickaelistria commented Jan 29, 2024

HannesWell left a comment •

edited

Loading

HannesWell commented Jan 28, 2024 •

edited

Loading