From 1e08221d2bbb4a41bc8d9a79b84c065e930c0ee4 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Wed, 23 Apr 2025 21:19:06 +0200 Subject: [PATCH] Add plugin/package distinction to double-click listener Closes https://github.com/eclipse-pde/eclipse.pde/issues/1736 --- .../internal/ui/parts/PluginVersionPart.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java index be5066ad459..7712c54730a 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2015 IBM Corporation and others. + * Copyright (c) 2005, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -70,8 +70,7 @@ protected void selectionChanged(IStructuredSelection selection) { @Override protected void handleDoubleClick(IStructuredSelection selection) { if (selection.size() == 1) { - IPluginModelBase entry = (IPluginModelBase) selection.getFirstElement(); - String version = VersionUtil.computeInitialPluginVersion(entry.getBundleDescription().getVersion().toString()); + String version = getVersion(selection.getFirstElement()); setVersion(version, ""); //$NON-NLS-1$ } } @@ -80,15 +79,7 @@ protected void handleDoubleClick(IStructuredSelection selection) { protected void buttonSelected(Button button, int index) { IStructuredSelection selection = getTableViewer().getStructuredSelection(); if (selection.size() == 1) { - String version; - if (isPlugin) { - IPluginModelBase entry = (IPluginModelBase) selection.getFirstElement(); - version = VersionUtil - .computeInitialPluginVersion(entry.getBundleDescription().getVersion().toString()); - } else { - PackageObject po = (PackageObject) selection.getFirstElement(); - version = po.getVersion(); - } + String version = getVersion(selection.getFirstElement()); setVersion(version, ""); //$NON-NLS-1$ } else { // plug-ins come back in a sorted order so we assume min/max @@ -116,6 +107,14 @@ protected void buttonSelected(Button button, int index) { } } + private String getVersion(Object firstElement) { + if (isPlugin) { + IPluginModelBase entry = (IPluginModelBase) firstElement; + return VersionUtil.computeInitialPluginVersion(entry.getBundleDescription().getVersion().toString()); + } + PackageObject po = (PackageObject) firstElement; + return po.getVersion(); + } } private static class PluginVersionContentProvider implements IStructuredContentProvider {