Skip to content

Commit f6ee3c3

Browse files
committed
Fix double-resolve when having resolveMode=AUTO
This fixes a double-resolve when having resolveMode=AUTO introduced by my laster PR bndtools#6550 I needed to make the reallySave() method public, so I can call it from the Resolve button action in the RunRequirements part Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
1 parent a83e688 commit f6ee3c3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

bndtools.core/src/bndtools/editor/BndEditor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void commitDirtyPages() {
276276
}
277277
}
278278

279-
private void reallySave(IProgressMonitor monitor) {
279+
public void reallySave(IProgressMonitor monitor) {
280280
// Actually save, via the source editor
281281
try {
282282
boolean saveLocked = this.saving.compareAndSet(false, true);

bndtools.core/src/bndtools/editor/project/RunRequirementsPart.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,11 @@ private void doResolve() {
160160
IFormPage formPage = (IFormPage) getManagedForm().getContainer();
161161
BndEditor editor = (BndEditor) formPage.getEditor();
162162

163-
// editor.doSave() is important
164-
// to get changes of included .bndrun files before resolving
163+
// get changes of included .bndrun files before resolving
165164
// (e.g. -include: shared.bndrun)
166-
editor.doSave(null);
165+
editor.commitDirtyPages();
166+
editor.reallySave(null);
167+
167168
refreshFromModel();
168169
commit(false);
169170
editor.resolveRunBundles(new NullProgressMonitor(), false);

0 commit comments

Comments
 (0)