Merge pull request #667 from eclipse-passage/571326

Bug 571325 encrypted licenses cannot be issued remove tests file Signed-off-by: eparovyshnaya <[email protected]>
eclipse-passage · Feb 23, 2021 · 1513386 · 1513386
1 parent cdbccd6
commit 1513386
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 44 deletions.
diff --git a/bundles/org.eclipse.passage.loc.api/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.api/META-INF/MANIFEST.MF
@@ -40,3 +40,4 @@ Require-Bundle: org.eclipse.e4.core.services;bundle-version="0.0.0",
  org.eclipse.passage.lic.products;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.passage.lic.users;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.passage.lic.users.model;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/...rd.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/floating/IssueLicensePackPage.java b/...rd.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/floating/IssueLicensePackPage.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.passage.loc.dashboard.ui.wizards.floating;
 
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.Supplier;
 
@@ -37,6 +38,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 
 public final class IssueLicensePackPage extends WizardPage {
 
@@ -45,7 +47,7 @@ public final class IssueLicensePackPage extends WizardPage {
 	private final Adapter update = new EContentAdapter() {
 		@Override
 		public void notifyChanged(Notification notification) {
-			setPageComplete(validatePage());
+			updatePageComplete();
 		}
 	};
 	private FloatingLicensePack license;
@@ -85,38 +87,45 @@ public void createControl(Composite parent) {
 	}
 
 	private void init() {
-		boolean render = license == null;
 		createLicensePack();
-		if (render) {
-			updatePage();
-		}
+		updatePage();
 	}
 
 	private void createLicensePack() {
 		if (license != null) {
 			license.eAdapters().remove(update);
-		} else {
-			license = context.get(OperatorLicenseService.class)//
-					.createFloatingLicensePack(data.get(), Optional.ofNullable(license));
-			license.eAdapters().add(update);
 		}
+		license = context.get(OperatorLicenseService.class)//
+				.createFloatingLicensePack(data.get(), Optional.ofNullable(license));
+		license.eAdapters().add(update);
 	}
 
 	private void updatePage() {
 		if (base == null || base.isDisposed()) {
 			setPageComplete(false);
 			return;
 		}
-		if (license != null) {
-			try {
-				ECPSWTViewRenderer.INSTANCE.render(base, license, properties);
-				base.layout();
-			} catch (ECPRendererException e) {
-			}
-		}
+		renderEmfForms();
+		updatePageComplete();
+	}
+
+	private void updatePageComplete() {
 		setPageComplete(validatePage());
 	}
 
+	private void renderEmfForms() {
+		if (license == null) {
+			return;
+		}
+		try {
+			Arrays.asList(base.getChildren()).forEach(Control::dispose);
+			ECPSWTViewRenderer.INSTANCE.render(base, license, properties);
+			base.layout(); // guaranteed to exist and been not disposed
+		} catch (ECPRendererException e) {
+			// do nothing
+		}
+	}
+
 	protected boolean validatePage() {
 		String errors = LicensingEcore.extractValidationError(license);
 		setErrorMessage(errors);

diff --git a/...ashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/SelectableField.java b/...ashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/SelectableField.java
@@ -40,7 +40,7 @@ protected SelectableField(Optional<T> source, Runnable modified, LabelProvider l
 
 	@Override
 	public Optional<String> error() {
-		return data().isEmpty() ? Optional.of(errorText()) : Optional.empty();
+		return noData() ? Optional.of(errorText()) : Optional.empty();
 	}
 
 	@Override
@@ -75,6 +75,17 @@ private void installSelectButton(Composite parent) {
 		select.setLayoutData(GridDataFactory.fillDefaults().create());
 	}
 
+	private boolean noData() {
+		Optional<T> data = data();
+		if (!data.isPresent()) {
+			return true;
+		}
+		if (data.get() instanceof Collection<?>) {
+			return ((Collection<?>) data.get()).isEmpty();
+		}
+		return false;
+	}
+
 	@Override
 	protected void enableAuxiliaryControls(boolean enable) {
 		select.setEnabled(enable);

diff --git a/...re/src/org/eclipse/passage/loc/internal/licenses/core/FloatingLicensePackFromRequest.java b/...re/src/org/eclipse/passage/loc/internal/licenses/core/FloatingLicensePackFromRequest.java
@@ -182,7 +182,7 @@ private FeatureGrant featureGrant(LicensePlanFeatureDescriptor feature, Floating
 		FeatureGrant grant = FloatingFactory.eINSTANCE.createFeatureGrant();
 		String fid = feature.getFeatureIdentifier();
 		grant.setFeature(fid);
-		grant.setCapacity(featureGrantCapacity(fid));
+		grant.setCapacity(request.defaultCapacity());
 		grant.setIdentifier(String.format("%s#%d", request.identifier(), no)); //$NON-NLS-1$
 		grant.setPack(pack);
 		grant.setValid(featureGrantPeriod(fid));
@@ -191,13 +191,6 @@ private FeatureGrant featureGrant(LicensePlanFeatureDescriptor feature, Floating
 		return grant;
 	}
 
-	private int featureGrantCapacity(String feature) {
-		return template//
-				.flatMap(l -> forFeature(l.getFeatures(), feature)) //
-				.map(FeatureGrant::getCapacity)//
-				.orElseGet(request::defaultCapacity);
-	}
-
 	private ValidityPeriod featureGrantPeriod(String feature) {
 		return template//
 				.flatMap(l -> forFeature(l.getFeatures(), feature)) //

diff --git a/bundles/org.eclipse.passage.seal.demo/OSGI-INF/anti-human-magic.product_0.2.1.pub b/bundles/org.eclipse.passage.seal.demo/OSGI-INF/anti-human-magic.product_0.2.1.pub