Eclipse Bugzilla #383367: Fix drop-down menus in coverage view for Ec…

…lipse 4.2.
jacoco · Jun 25, 2012 · 19e2c33 · 19e2c33
1 parent 1432a0d
commit 19e2c33
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/com.mountainminds.eclemma.doc/pages/changes.html b/com.mountainminds.eclemma.doc/pages/changes.html
@@ -16,6 +16,8 @@ <h1>EclEmma Change Log</h1>
 
 <h2>Version 2.1.3 (not yet released)</h2>
 <ul>
+ <li>Eclipse Bugzilla #383367: Fix drop-down menus in coverage view for Eclipse
+ 4.2.</li>
  <li>Trac #158: Lifecycle mapping for JaCoCo Maven goals when M2E is used.</li>
  <li>Trac #203: EclEmma feature now depends on Eclipse 3.5 or greater to
  ensure version check at installation time.</li>

diff --git a/...eclemma.ui/src/com/mountainminds/eclemma/internal/ui/handlers/DumpExecutionDataItems.java b/...eclemma.ui/src/com/mountainminds/eclemma/internal/ui/handlers/DumpExecutionDataItems.java
@@ -29,14 +29,20 @@
 public class DumpExecutionDataItems extends ContributionItem {
 
  @Override
- public void fill(final Menu menu, final int index) {
+ public boolean isDynamic() {
+ return true;
+ }
+
+ @Override
+ public void fill(final Menu menu, int index) {
  for (ICoverageLaunch launch : CoverageTools.getRunningCoverageLaunches()) {
- createItem(menu, launch);
+ createItem(menu, index++, launch);
  }
  }
 
- private void createItem(final Menu parent, final ICoverageLaunch launch) {
- final MenuItem item = new MenuItem(parent, SWT.PUSH);
+ private void createItem(final Menu parent, final int index,
+ final ICoverageLaunch launch) {
+ final MenuItem item = new MenuItem(parent, SWT.PUSH, index);
  item.setImage(EclEmmaUIPlugin.getImage(EclEmmaUIPlugin.ELCL_DUMP));
  item.setText(LaunchLabelProvider.getLaunchText(launch));
  item.addSelectionListener(new SelectionAdapter() {

diff --git a/...emma.ui/src/com/mountainminds/eclemma/internal/ui/handlers/SelectActiveSessionsItems.java b/...emma.ui/src/com/mountainminds/eclemma/internal/ui/handlers/SelectActiveSessionsItems.java
@@ -31,20 +31,27 @@
 public class SelectActiveSessionsItems extends ContributionItem {
 
  @Override
- public void fill(final Menu menu, final int index) {
+ public boolean isDynamic() {
+ return true;
+ }
+
+ @Override
+ public void fill(final Menu menu, int index) {
  final ISessionManager sm = CoverageTools.getSessionManager();
  final ICoverageSession activeSession = sm.getActiveSession();
- int idx = 0;
+ int position = 1;
  for (ICoverageSession session : sm.getSessions()) {
- createItem(menu, session, session == activeSession, ++idx, sm);
+ createItem(menu, index++, session, session == activeSession, position++,
+ sm);
  }
  }
 
- private void createItem(final Menu parent, final ICoverageSession session,
- final boolean selected, final int idx, final ISessionManager sm) {
- final MenuItem item = new MenuItem(parent, SWT.RADIO);
+ private void createItem(final Menu parent, final int index,
+ final ICoverageSession session, final boolean selected,
+ final int position, final ISessionManager sm) {
+ final MenuItem item = new MenuItem(parent, SWT.RADIO, index);
  item.setImage(EclEmmaUIPlugin.getImage(EclEmmaUIPlugin.ELCL_SESSION));
- item.setText(getLabel(session, idx));
+ item.setText(getLabel(session, position));
  item.setSelection(selected);
  item.addSelectionListener(new SelectionAdapter() {
  @Override
@@ -55,9 +62,8 @@ public void widgetSelected(SelectionEvent e) {
  }
 
  private String getLabel(ICoverageSession session, int idx) {
- final Object[] values = new Object[] { Integer.valueOf(idx),
- session.getDescription() };
- return NLS.bind(UIMessages.CoverageViewSelectSessionMenu_label, values);
+ return NLS.bind(UIMessages.CoverageViewSelectSessionMenu_label,
+ Integer.valueOf(idx), session.getDescription());
  }
 
 }