model updates

Signed-off-by: Peter Kirschner <peter@klib.io>

Author: peterkir

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

@@ -41,6 +41,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
@@ -775,6 +776,40 @@ public void resourceChanged(IResourceChangeEvent event) {
 		IResourceDelta delta = event.getDelta();
 		if (delta == null)
 			return;
+
+		// When an included file is saved, refresh the owner processor and reload
+		// so merged properties (e.g. -runrequires, -runproperties) reflect the change.
+		aQute.bnd.osgi.Processor owner = model.getOwner();
+		if (owner != null && !saving.get()) {
+			final IResourceDelta fullDelta = delta; // delta is reassigned below; capture before
+			boolean includedChanged = owner.getIncluded()
+				.stream()
+				.anyMatch(includedFile -> {
+					IFile wsFile = ResourcesPlugin.getWorkspace()
+						.getRoot()
+						.getFileForLocation(new Path(includedFile.getAbsolutePath()));
+					if (wsFile == null)
+						return false;
+					IResourceDelta d = fullDelta.findMember(wsFile.getFullPath());
+					return d != null
+						&& (d.getKind() & IResourceDelta.CHANGED) != 0
+						&& (d.getFlags() & IResourceDelta.CONTENT) != 0;
+				});
+			if (includedChanged) {
+				final IDocumentProvider docProvider = sourcePage.getDocumentProvider();
+				if (docProvider != null) {
+					final IDocument document = docProvider.getDocument(getEditorInput());
+					SWTConcurrencyUtil.execForControl(getEditorSite().getShell(), true, () -> {
+						try {
+							owner.forceRefresh();
+							model.loadFrom(new IDocumentWrapper(document));
+						} catch (IOException e) {
+							logger.logError("Failed to reload model after included file change", e);
+						}
+					});
+				}
+			}
+		}
 		IPath fullPath = myResource.getFullPath();
 		delta = delta.findMember(fullPath);
 		if (delta == null)

bndtools.core/src/bndtools/editor/pages/ProjectRunPage.java

@@ -182,13 +182,15 @@ protected void createFormContent(IManagedForm managedForm) {
 			.setLayoutData(PageLayoutUtils.createCollapsed());
 
 		AvailableBundlesPart availableBundlesPart = new AvailableBundlesPart(left, tk,
-			ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED);
+			ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 		managedForm.addPart(availableBundlesPart);
 		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gd.widthHint = 50;
 		gd.heightHint = 50;
 		availableBundlesPart.getSection()
 			.setLayoutData(PageLayoutUtils.createExpanded());
+		availableBundlesPart.getSection()
+			.addExpansionListener(new ResizeExpansionAdapter(availableBundlesPart.getSection()));
 
 		RunFrameworkPart runFwkPart = new RunFrameworkPart(left, tk,
 			ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
@@ -198,11 +200,12 @@ protected void createFormContent(IManagedForm managedForm) {
 			.setLayoutData(gd);
 
 		RunPropertiesPart runPropertiesPart = new RunPropertiesPart(left, tk,
-			ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+			ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 		managedForm.addPart(runPropertiesPart);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, false);
 		runPropertiesPart.getSection()
-			.setLayoutData(gd);
+			.setLayoutData(PageLayoutUtils.createExpanded());
+		runPropertiesPart.getSection()
+			.addExpansionListener(new ResizeExpansionAdapter(runPropertiesPart.getSection()));
 
 		// SECOND COLUMN
 		if (supportsResolve) {

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

@@ -4,14 +4,17 @@
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.Iterator;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.bndtools.core.ui.resource.RequirementLabelProvider;
 import org.bndtools.utils.dnd.AbstractViewerDropAdapter;
@@ -34,6 +37,7 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -76,52 +80,76 @@ public AbstractRequirementListPart(Composite parent, FormToolkit toolkit, int st
 		super(parent, toolkit, style);
 	}
 
-	private final BndPreferences	preferences			= new BndPreferences();
-	private final List<Requirement>	requires			= new ArrayList<>();
+	private final BndPreferences	preferences				= new BndPreferences();
+	/** Local requirements: written to this file's own merge key. */
+	private final List<Requirement>	requires				= new ArrayList<>();
+	/** Inherited requirements: from included files, shown in gray (read-only). */
+	private final List<Requirement>	inheritedRequires		= new ArrayList<>();
 
 	private TableViewer				viewer;
 	private ToolItem				addBundleTool;
 	private ToolItem				removeTool;
 
-	private boolean					committing			= false;
-	private boolean					inherited			= false;
-	private String					inheritedProvenance	= null;
+	private boolean					committing				= false;
+	/** Per-requirement provenance: maps each inherited requirement to the file path that defines it. */
+	private Map<Requirement, String>	inheritedProvenances	= new java.util.LinkedHashMap<>();
+	/** The key used to write local requirements (plain stem or stem.local). */
+	private String					localKey				= null;
+	/** Extra property key subscribed dynamically (the localKey when it's a suffix). */
+	private String					subscribedLocalKey		= null;
 
 	/** Returns the primary bnd property key this part displays (e.g. {@code -runrequires}). */
 	protected abstract String getPrimaryPropertyKey();
 
-	/** A label provider that renders items in grey to indicate they are inherited. */
-	private static class InheritedRequirementLabelProvider extends RequirementLabelProvider {
+	/** Returns the local write key (plain stem or stem.local) determined during the last refresh. */
+	protected final String getLocalKey() {
+		return localKey != null ? localKey : getPrimaryPropertyKey();
+	}
+
+	/** Colors inherited items gray and local items with the default foreground. */
+	private class MixedRequirementLabelProvider extends RequirementLabelProvider {
 		private final Color grey;
 
-		InheritedRequirementLabelProvider(Display display) {
+		MixedRequirementLabelProvider(Display display) {
 			grey = display.getSystemColor(SWT.COLOR_DARK_GRAY);
 		}
 
 		@Override
 		public void update(ViewerCell cell) {
 			super.update(cell);
-			cell.setForeground(grey);
-			// clear styled ranges so the grey foreground is not overridden
-			cell.setStyleRanges(new org.eclipse.swt.custom.StyleRange[0]);
+			if (inheritedRequires.contains(cell.getElement())) {
+				cell.setForeground(grey);
+				// clear styled ranges so the grey foreground is not overridden
+				cell.setStyleRanges(new StyleRange[0]);
+			}
 		}
 	}
 
 	protected TableViewer createViewer(Composite parent, FormToolkit tk) {
 		Table table = tk.createTable(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER);
 		viewer = new TableViewer(table);
 		viewer.setContentProvider(ArrayContentProvider.getInstance());
-		viewer.setLabelProvider(new RequirementLabelProvider());
+		viewer.setLabelProvider(new MixedRequirementLabelProvider(table.getDisplay()));
 
 		// Listeners
-		viewer.addSelectionChangedListener(event -> removeTool.setEnabled(!inherited && !viewer.getSelection()
-			.isEmpty()));
+		viewer.addSelectionChangedListener(event -> {
+			IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
+			boolean hasLocalSelected = !sel.isEmpty()
+				&& sel.toList().stream().anyMatch(e -> requires.contains(e));
+			removeTool.setEnabled(hasLocalSelected);
+		});
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 			@Override
 			public void doubleClick(DoubleClickEvent event) {
-				if (inherited && inheritedProvenance != null) {
-					openProvenanceFile(inheritedProvenance);
-				}
+				IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
+				if (sel.isEmpty())
+					return;
+				Requirement req = (Requirement) sel.getFirstElement();
+				if (!inheritedRequires.contains(req))
+					return;
+				String prov = inheritedProvenances.get(req);
+				if (prov != null)
+					openProvenanceFile(prov);
 			}
 		});
 		table.addKeyListener(new KeyAdapter() {
@@ -237,14 +265,11 @@ private void doAddBundle() {
 	private void doRemove() {
 		IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
 		if (!selection.isEmpty()) {
-			Iterator<?> elements = selection.iterator();
-			List<Object> removed = new LinkedList<>();
-			while (elements.hasNext()) {
-				Object element = elements.next();
-				if (this.requires.remove(element))
-					removed.add(element);
-			}
-
+			// Only local items may be removed; inherited ones stay in their source file.
+			@SuppressWarnings("unchecked")
+			List<Object> removed = ((List<Object>) selection.toList()).stream()
+				.filter(e -> this.requires.remove(e))
+				.collect(Collectors.toList());
 			if (!removed.isEmpty()) {
 				viewer.remove(removed.toArray());
 				markDirty();
@@ -264,44 +289,83 @@ public final void commitToModel(boolean onSave) {
 
 	@Override
 	protected final void refreshFromModel() {
-		List<Requirement> loadedReqs = doRefreshFromModel();
-		if (loadedReqs == null)
-			loadedReqs = Collections.emptyList();
+		// Local requirements: only what is defined in this file's own merge keys.
+		List<Requirement> newLocal = doRefreshFromModel();
+		if (newLocal == null)
+			newLocal = Collections.emptyList();
 
-		// Determine whether the property is inherited from another file.
-		// Check stem and stem.* variant keys (e.g. -runrequires.shared).
+		// Inherited requirements: merged view minus local.
 		String primaryKey = getPrimaryPropertyKey();
-		boolean nowInherited = primaryKey != null && model != null && !BndEditModelAccessor.hasLocalMergeProperty(model, primaryKey)
-			&& !loadedReqs.isEmpty();
-		Optional<String> provenance = (nowInherited && primaryKey != null && model != null)
-			? BndEditModelAccessor.getPropertyProvenance(model, primaryKey)
-			: Optional.empty();
-		inherited = nowInherited;
-		inheritedProvenance = provenance.orElse(null);
-
-		// Switch label provider based on inherited state; update tooltip
-		if (inherited) {
-			viewer.setLabelProvider(new InheritedRequirementLabelProvider(viewer.getControl()
-				.getDisplay()));
-			String tip = inheritedProvenance != null
-				? "Inherited from " + inheritedProvenance + ". Double-click to open source."
-				: "Inherited from an included file. Double-click to open source.";
-			viewer.getControl()
-				.setToolTipText(tip);
+		List<Requirement> newInherited = Collections.emptyList();
+		if (primaryKey != null && model != null) {
+			List<Requirement> merged = BndEditModelAccessor.getMergedRequirements(model, primaryKey);
+			if (merged != null && !merged.isEmpty()) {
+				Set<Requirement> localSet = new HashSet<>(newLocal);
+				newInherited = merged.stream()
+					.filter(r -> !localSet.contains(r))
+					.collect(Collectors.toList());
+			}
+		}
+
+		// Determine which key local additions should be written to.
+		String newLocalKey = primaryKey;
+		if (primaryKey != null && model != null) {
+			String existingKey = BndEditModelAccessor.findLocalMergeKey(model, primaryKey);
+			if (existingKey != null) {
+				newLocalKey = existingKey;
+			} else if (!newInherited.isEmpty()) {
+				// No local key yet but inherited items exist: use a suffix so bnd merges them.
+				newLocalKey = primaryKey + ".local";
+			}
+		}
+		localKey = newLocalKey;
+
+		// Keep the property-change subscription aligned with the local key.
+		if (!Objects.equals(subscribedLocalKey, newLocalKey)) {
+			if (subscribedLocalKey != null && model != null)
+				model.removePropertyChangeListener(subscribedLocalKey, this);
+			subscribedLocalKey = newLocalKey;
+			if (newLocalKey != null && model != null
+				&& !Arrays.asList(getProperties()).contains(newLocalKey))
+				model.addPropertyChangeListener(newLocalKey, this);
+		}
+
+		// Update provenance tooltip for inherited items.
+		if (!newInherited.isEmpty()) {
+			inheritedProvenances = BndEditModelAccessor.getInheritedRequirementProvenances(model, primaryKey);
+			String tip = inheritedProvenances.values().stream().findAny().isPresent()
+				? "Some requirements are inherited from included files. Double-click an inherited item to open its source."
+				: "Some requirements are inherited from included files.";
+			viewer.getControl().setToolTipText(tip);
 		} else {
-			viewer.setLabelProvider(new RequirementLabelProvider());
-			viewer.getControl()
-				.setToolTipText(null);
+			inheritedProvenances = Collections.emptyMap();
+			viewer.getControl().setToolTipText(null);
 		}
-		addBundleTool.setEnabled(!inherited);
+
+		addBundleTool.setEnabled(true);
 		removeTool.setEnabled(false);
 
-		if (loadedReqs.equals(this.requires))
+		if (newInherited.equals(this.inheritedRequires) && newLocal.equals(this.requires))
 			return;
 
+		this.inheritedRequires.clear();
+		this.inheritedRequires.addAll(newInherited);
 		this.requires.clear();
-		this.requires.addAll(loadedReqs);
-		viewer.setInput(this.requires);
+		this.requires.addAll(newLocal);
+
+		List<Requirement> combined = new ArrayList<>(this.inheritedRequires.size() + this.requires.size());
+		combined.addAll(this.inheritedRequires);
+		combined.addAll(this.requires);
+		viewer.setInput(combined);
+	}
+
+	@Override
+	public void dispose() {
+		if (subscribedLocalKey != null && model != null) {
+			model.removePropertyChangeListener(subscribedLocalKey, this);
+			subscribedLocalKey = null;
+		}
+		super.dispose();
 	}
 
 	@Override
@@ -336,13 +400,12 @@ private void openProvenanceFile(String absolutePath) {
 		}
 	}
 
-	/** Update the requirements already available with new ones. Already existing requirements will be removed. */
+	/** Adds new requirements as local items. Items already in inherited or local lists are skipped. */
 	private boolean updateViewerWithNewRequirements(Set<Requirement> adding) {
-		// remove duplicates
+		adding.removeAll(this.inheritedRequires);
 		adding.removeAll(this.requires);
-		if (adding.isEmpty()) {
+		if (adding.isEmpty())
 			return false;
-		}
 		this.requires.addAll(adding);
 		viewer.add(adding.toArray());
 		markDirty();