RFR: 5904: Merge org.openjdk.jmc.ui.celleditors with org.openjdk.jmc.rjmx.ui.celleditors [v5]
Alex Macdonald
aptmac at openjdk.java.net
Fri Sep 24 21:04:29 UTC 2021
> This PR addresses JMC-5904 [[0]](https://bugs.openjdk.java.net/browse/JMC-5904), in which it is noted that org.openjdk.jmc.ui.celleditors could be merged with org.openjdk.jmc.rjmx.ui.celleditors instead of separating the code.
>
> For the most part this is a fairly straightforward migration of code. There are three classes in jmc.ui.celleditors that needed to be moved into rjmx.ui.celleditors:
> 1. ClearableTextCellEditor
> 2. CommonCellEditors
> 3. NullableTextCellEditor
>
> Once these files are moved there is a slight problem: org.openjdk.jmc.ui.misc.FilterEditor uses CommonCellEditors, and org.openjdk.jmc.rjmx.ui requires org.openjdk.jmc.ui. In this case, adding a dependency from org.openjdk.jmc.rjmx.ui.celleditors.CommonCellEditors to org.openjdk.jmc.ui.misc.FilterEditors would introduce a circular dependency.
>
> The solution I've gone with here is to move FilterEditor to org.openjdk.jmc.flightrecorder.ui, which IMO makes sense anyways because it's closer to the code it gets consumed by. FilterEditor is used in:
> - _org.openjdk.jmc.flightrecorder.ui_.common.DataPageToolkit
> - _org.openjdk.jmc.flightrecorder.ui_.common.FilterComponent
> - _org.openjdk.jmc.flightrecorder.ui_.common.LaneEditor
> - _org.openjdk.jmc.flightrecorder.ui_.pages.ItemHandlerPage
>
> **Note:** this issue was originally targeted for 8.1.0, but isn't really critical (it's a P4 task), so if desired we can hold off on integrating it now and keep this around for integration into 8.2.0 as discussed in the jmc bi-weekly calls
>
> [0] https://bugs.openjdk.java.net/browse/JMC-5904
Alex Macdonald has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains three additional commits since the last revision:
- move celleditors to org.openjdk.jmc.ui.celleditors
This commit moves the celleditors code into it's own package:
org.openjdk.jmc.ui.celleditors. This
removes the dependency on rjmx.ui for flightrecorder.ui. Now, both
rjmx.ui and flightrecorder.ui import org.openjdk.jmc.ui.celleditors. The
l10n packages have also been updated with their respective strings.
- update license headers
- 5904: Merge org.openjdk.jmc.ui.celleditors with org.openjdk.jmc.rjmx.ui.celleditors
-------------
Changes:
- all: https://git.openjdk.java.net/jmc/pull/271/files
- new: https://git.openjdk.java.net/jmc/pull/271/files/4829c15e..347873cb
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=jmc&pr=271&range=04
- incr: https://webrevs.openjdk.java.net/?repo=jmc&pr=271&range=03-04
Stats: 7899 lines in 98 files changed: 7330 ins; 470 del; 99 mod
Patch: https://git.openjdk.java.net/jmc/pull/271.diff
Fetch: git fetch https://git.openjdk.java.net/jmc pull/271/head:pull/271
PR: https://git.openjdk.java.net/jmc/pull/271
More information about the jmc-dev
mailing list