From a2d36c56ee3ca147fa0d0e3287598c3b4522390d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 2 Dec 2024 12:32:58 +0100 Subject: [PATCH] Fixes #6380 --- Signed-off-by: github-actions Signed-off-by: github-actions --- biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java | 2 +- bndtools.core/src/bndtools/editor/BndEditor.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java index 66da3564df..4b7d3f6767 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java @@ -1,4 +1,4 @@ -@Version("7.2.0") +@Version("7.3.0") package aQute.bnd.osgi; import org.osgi.annotation.versioning.Version; diff --git a/bndtools.core/src/bndtools/editor/BndEditor.java b/bndtools.core/src/bndtools/editor/BndEditor.java index daae63e131..65cd78a9b9 100644 --- a/bndtools.core/src/bndtools/editor/BndEditor.java +++ b/bndtools.core/src/bndtools/editor/BndEditor.java @@ -85,6 +85,7 @@ import aQute.bnd.help.instructions.ResolutionInstructions.ResolveMode; import aQute.bnd.osgi.Processor; import aQute.bnd.properties.BadLocationException; +import biz.aQute.resolve.Bndrun; import bndtools.Plugin; import bndtools.central.Central; import bndtools.editor.common.IPriority; @@ -617,10 +618,12 @@ private Promise loadEditModel(File inputFile, BndEditModel model) thr Processor p = workspace.readLocked(() -> workspace.findProcessor(inputFile) .orElseGet(() -> { - Processor dummy = new Processor(); - dummy.setBase(inputFile.getParentFile()); - dummy.setPropertiesFile(inputFile); - return dummy; + try { + Bndrun bndrun = Bndrun.createBndrun(workspace, inputFile); + return bndrun; + } catch (Exception e) { + throw Exceptions.duck(e); + } })); model.setWorkspace(workspace); model.setOwner(p);