[#1300] license issuing dialogs: keep selection

bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/LabeledField.java

@@ -62,10 +62,13 @@ private void installLabel(Composite parent) {
 	}
 
 	protected final void installData(Optional<T> origin) {
-		origin.ifPresent(data -> {
-			widget.ifPresent(w -> w.setData(data));
-			reflectData(data);
-		});
+		T data = origin.orElse(null);
+		widget.ifPresent(w -> w.setData(data));
+		reflectData(data);
+	}
+
+	protected final Optional<T> source() {
+		return source;
 	}
 
 	protected final Shell shell() {

bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/LicensePlanField.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further evolution
  *******************************************************************************/
 package org.eclipse.passage.loc.dashboard.ui.wizards.license;
 
@@ -41,7 +42,7 @@ protected String errorText() {
 
 	@Override
 	protected Optional<LicensePlanDescriptor> select(Text control) {
-		return new SelectRoot<>(new SelectLicensePlan(context).get(), context).get();
+		return new SelectRoot<>(new SelectLicensePlan(context, data()).get(), context).get();
 	}
 
 }

bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/ProductVersionField.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further evolution
  *******************************************************************************/
 package org.eclipse.passage.loc.dashboard.ui.wizards.license;
 
@@ -44,8 +45,8 @@ protected String errorText() {
 	@Override
 	protected Optional<ProductVersionDescriptor> select(Text control) {
 		return new SelectInner<ProductVersionDescriptor, ProductDescriptor>(//
-				new SelectProductVersion(context).get(), //
-				new SelectProduct(context).get(), //
+				new SelectProductVersion(context, data()).get(), //
+				new SelectProduct(context, data().map(ProductVersionDescriptor::getProduct)).get(), //
 				context//
 		).get();
 	}

bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/SelectableField.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.dashboard.ui.wizards.license;
 
@@ -53,12 +54,19 @@ protected Control control(Composite parent) {
 	@Override
 	protected void reflectData(T data) {
 		if (data instanceof Collection) {
-			String altogether = StreamSupport.stream(((Collection<?>) data).spliterator(), false)//
+			Collection<?> collection = (Collection<?>) data;
+			String altogether = StreamSupport.stream(collection.spliterator(), false)//
 					.map(labels::getText)//
 					.collect(Collectors.joining(", ")); //$NON-NLS-1$
-			text.setText(altogether);
+			String fit = altogether;
+			if (altogether.length() > 100) {
+				fit = altogether.substring(0, 80) + String.format("... %d users", collection.size()); //$NON-NLS-1$
+			}
+			text.setText(fit);
+			text.setToolTipText(altogether);
 		} else {
 			text.setText(labels.getText(data));
+			text.setToolTipText(""); //$NON-NLS-1$
 		}
 	}
 

bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/UserField.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.dashboard.ui.wizards.license;
 
@@ -40,7 +41,7 @@ protected String errorText() {
 
 	@Override
 	protected Optional<UserDescriptor> select(Text control) {
-		return new SelectRoot<>(new SelectUser(context).get(), context).get();
+		return new SelectRoot<>(new SelectUser(context, data()).get(), context).get();
 	}
 
 }

bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/UsersField.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,17 +9,19 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.dashboard.ui.wizards.license;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Optional;
 
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.passage.lic.api.MandatoryService;
 import org.eclipse.passage.lic.users.UserDescriptor;
 import org.eclipse.passage.loc.internal.dashboard.ui.i18n.IssueLicensePageMessages;
-import org.eclipse.passage.loc.internal.users.ui.SelectUser;
+import org.eclipse.passage.loc.internal.users.ui.SelectUsers;
 import org.eclipse.passage.loc.internal.workbench.SelectRoots;
 import org.eclipse.swt.widgets.Text;
 
@@ -41,7 +43,9 @@ protected String errorText() {
 
 	@Override
 	protected Optional<Collection<UserDescriptor>> select(Text control) {
-		return Optional.of(new SelectRoots<>(new SelectUser(context).get(), context).get());
+		return Optional.of(//
+				new SelectRoots<>(//
+						new SelectUsers(context, data().orElseGet(Collections::emptyList)).get(), context).get());
 	}
 
 }

bundles/org.eclipse.passage.loc.licenses.ui/src/org/eclipse/passage/loc/internal/licenses/ui/SelectLicensePlan.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,9 +9,11 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further evolution
  *******************************************************************************/
 package org.eclipse.passage.loc.internal.licenses.ui;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -36,12 +38,16 @@
 public final class SelectLicensePlan extends SupplySelectRequest<LicensePlanDescriptor> {
 
 	public SelectLicensePlan(MandatoryService context) {
-		super(context);
+		this(context, Optional.empty());
+	}
+
+	public SelectLicensePlan(MandatoryService context, Optional<LicensePlanDescriptor> selection) {
+		super(context, selection);
 	}
 
 	@Override
 	public SelectRequest<LicensePlanDescriptor> get() {
-		return new SelectRequest<>(LicensePlanDescriptor.class, domain(), input(), appearance());
+		return new SelectRequest<>(LicensePlanDescriptor.class, domain(), input(), () -> initial, appearance());
 	}
 
 	private Supplier<Iterable<LicensePlanDescriptor>> input() {

bundles/org.eclipse.passage.loc.products.ui/src/org/eclipse/passage/loc/internal/products/ui/SelectProduct.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.internal.products.ui;
 
@@ -36,7 +37,11 @@
 public final class SelectProduct extends SupplySelectRequest<ProductDescriptor> {
 
 	public SelectProduct(MandatoryService context) {
-		super(context);
+		this(context, Optional.empty());
+	}
+
+	public SelectProduct(MandatoryService context, Optional<ProductDescriptor> selection) {
+		super(context, selection);
 	}
 
 	@Override

bundles/org.eclipse.passage.loc.products.ui/src/org/eclipse/passage/loc/internal/products/ui/SelectProductVersion.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further evolution
  *******************************************************************************/
 package org.eclipse.passage.loc.internal.products.ui;
 
@@ -36,12 +37,16 @@
 public final class SelectProductVersion extends SupplySelectRequest<ProductVersionDescriptor> {
 
 	public SelectProductVersion(MandatoryService context) {
-		super(context);
+		this(context, Optional.empty());
+	}
+
+	public SelectProductVersion(MandatoryService context, Optional<ProductVersionDescriptor> selection) {
+		super(context, selection);
 	}
 
 	@Override
 	public SelectRequest<ProductVersionDescriptor> get() {
-		return new SelectRequest<>(ProductVersionDescriptor.class, domain(), input(), appearance());
+		return new SelectRequest<>(ProductVersionDescriptor.class, domain(), input(), () -> initial, appearance());
 	}
 
 	private Supplier<Iterable<ProductVersionDescriptor>> input() {

bundles/org.eclipse.passage.loc.users.ui/src/org/eclipse/passage/loc/internal/users/ui/SelectUser.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.internal.users.ui;
 
@@ -30,19 +31,23 @@
 
 /**
  * Selects or creates {@link UserOriginDescriptor}. Will return either
- * {@link Optional} with selected/created license plan or
+ * {@link Optional} with selected/created {@link UserOriginDescriptor} or
  * {@link Optional#empty()}
  * 
  */
 public final class SelectUser extends SupplySelectRequest<UserDescriptor> {
 
 	public SelectUser(MandatoryService context) {
-		super(context);
+		this(context, Optional.empty());
+	}
+
+	public SelectUser(MandatoryService context, Optional<UserDescriptor> selection) {
+		super(context, selection);
 	}
 
 	@Override
 	public SelectRequest<UserDescriptor> get() {
-		return new SelectRequest<>(UserDescriptor.class, domain(), input(), appearance());
+		return new SelectRequest<>(UserDescriptor.class, domain(), input(), () -> initial, appearance());
 	}
 
 	private Supplier<Iterable<UserDescriptor>> input() {

bundles/org.eclipse.passage.loc.users.ui/src/org/eclipse/passage/loc/internal/users/ui/SelectUsers.java

@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2020, 2024 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
+ *******************************************************************************/
+package org.eclipse.passage.loc.internal.users.ui;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.eclipse.passage.lic.api.MandatoryService;
+import org.eclipse.passage.lic.jface.resource.LicensingImages;
+import org.eclipse.passage.lic.users.UserDescriptor;
+import org.eclipse.passage.lic.users.UserOriginDescriptor;
+import org.eclipse.passage.lic.users.model.meta.UsersPackage;
+import org.eclipse.passage.loc.internal.users.UserRegistry;
+import org.eclipse.passage.loc.internal.users.ui.i18n.UsersUiMessages;
+import org.eclipse.passage.loc.internal.workbench.SelectRequest;
+import org.eclipse.passage.loc.internal.workbench.SupplySelectRequest;
+import org.eclipse.passage.loc.jface.dialogs.Appearance;
+
+/**
+ * Selects or creates {@link UserOriginDescriptor}. Will return either
+ * {@link Optional} with selected/created {@link UserOriginDescriptor} or
+ * {@link Optional#empty()}
+ * 
+ */
+public final class SelectUsers extends SupplySelectRequest<UserDescriptor> {
+
+	public SelectUsers(MandatoryService context) {
+		this(context, Collections.emptyList());
+	}
+
+	public SelectUsers(MandatoryService context, Collection<UserDescriptor> selection) {
+		super(context, selection);
+	}
+
+	@Override
+	public SelectRequest<UserDescriptor> get() {
+		return new SelectRequest<>(UserDescriptor.class, domain(), input(), () -> initial, appearance());
+	}
+
+	private Supplier<Iterable<UserDescriptor>> input() {
+		return () -> StreamSupport.stream(context.get(UserRegistry.class).getUsers().spliterator(), false)//
+				.collect(Collectors.toList());
+	}
+
+	private Appearance appearance() {
+		return new Appearance(UsersUiMessages.SelectUser_title, //
+				() -> LicensingImages.getImage(UsersPackage.eINSTANCE.getUser().getName()), labels());
+	}
+
+	private String domain() {
+		return UsersPackage.eNAME;
+	}
+
+}