diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/floating/IssueLicenseRequestPage.java b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/floating/IssueLicenseRequestPage.java index 88e514fb7..0d9d4ea6a 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/floating/IssueLicenseRequestPage.java +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/floating/IssueLicenseRequestPage.java @@ -33,7 +33,6 @@ public final class IssueLicenseRequestPage implements Supplier { private final Supplier>> users; private final Supplier> product; private final Supplier>> period; - private final Supplier> capacity; private final ComposedPage page; IssueLicenseRequestPage(IEclipseContext context, FloatingDataPack initial) { @@ -42,7 +41,6 @@ public final class IssueLicenseRequestPage implements Supplier { users = page.withUsers(); product = page.withProductVersion(initial.product()); period = page.withPeriod(); - capacity = page.withCapacity(); } @Override diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/LabeledField.java b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/LabeledField.java index 997fad1f3..19ddc6a1b 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/LabeledField.java +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/license/LabeledField.java @@ -50,7 +50,7 @@ public final void installControll(Composite parent) { @SuppressWarnings("unchecked") @Override public final Optional data() { - return Optional.ofNullable((T) widget.getData()); + return Optional.ofNullable(widget).flatMap(w -> Optional.ofNullable((T) w.getData())); } private void installLabel(Composite parent) { diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/request/FLoatingLicenseData.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/request/FLoatingLicenseData.java index 47ca0f599..4a6728323 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/request/FLoatingLicenseData.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/request/FLoatingLicenseData.java @@ -32,7 +32,6 @@ public FLoatingLicenseData(Collection users, LicensePlanDescript super(plan, product, from, until); Objects.requireNonNull(users, "PersonalLicenseData::users"); //$NON-NLS-1$ this.users = users; // FIXME: work for caching function: keep Map and reimplement retrieves - } public FLoatingLicenseData(Collection users, LicensePlanDescriptor plan, @@ -68,7 +67,7 @@ private UserDescriptor user(String identifier) { return users.stream()// .filter(user -> identifier.equals(user.getIdentifier()))// .findAny()// - .get(); // yah, fail if not found, it's a developer's + .get(); // yah, fail if not found, it's a development problem } }