Merge pull request #1168 from eclipse-passage/1148

last page of a license issuing wizard is always empty #1148

bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/restrictions/ExaminationExplained.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2022 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF

@@ -18,6 +18,7 @@ Export-Package: org.eclipse.passage.lic.internal.licenses.convert;x-friends:="or
  org.eclipse.passage.lic.internal.licenses.model;x-friends:="org.eclipse.passage.lic.licenses.migration,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.core",
  org.eclipse.passage.lic.internal.licenses.model.signature,
  org.eclipse.passage.lic.licenses.model.api,
+ org.eclipse.passage.lic.licenses.model.described;x-internal:=true,
  org.eclipse.passage.lic.licenses.model.impl;x-internal:=true,
  org.eclipse.passage.lic.licenses.model.meta,
  org.eclipse.passage.lic.licenses.model.transport,

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/i18n/Messages.java

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.internal.licenses.model.i18n;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+
+	private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/i18n/messages.properties

@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2022 ArSysOp and others
+#
+# 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
+###############################################################################
+
+DescribedAuthenticationInstructions_environment=Authenticated by 
+DescribedAuthenticationInstructions_expression=with expression 
+DescribedHost_host=Intended for server 
+DescribedLicenseRequisites_identifier=Identifier: 
+DescribedLicenseRequisites_issued=Issued: 
+DescribedLicenseRequisites_plan=Under licensing plan 
+DescribedLicenseRequisites_product=Product 
+DescribedLicenseRequisites_requisites=General requisites
+DescribedLicenseRequisites_version=\ version 
+DescribedLicenseRequisites_agreements=\ agreements
+DescribedPersonalFeatureGrant_capacity=Capacity: 
+DescribedPersonalFeatureGrant_feature=Grant for feature 
+DescribedPersonalFeatureGrant_version=version 
+DescribedPersonalFeatureGrant_rule = \ matching with rule 
+DescribedPersonalFeatureGrant_user=User
+DescribedPersonalFeatureGrants_grants=\ grants
+DescribedUserGrants_grants=User grants
+DescribedValidityPeriodClosed.template=Valid from %s until %s

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/Described.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import java.util.function.Supplier;
+
+abstract class Described implements Supplier<String> {
+
+	protected final String nl = "\r\n"; //$NON-NLS-1$
+	protected final String tab = "\t"; //$NON-NLS-1$
+	protected final String tabs = "\t\t"; //$NON-NLS-1$
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedAuthenticationInstructions.java

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import org.eclipse.passage.lic.internal.licenses.model.i18n.Messages;
+import org.eclipse.passage.lic.licenses.EvaluationInstructionsDescriptor;
+
+public final class DescribedAuthenticationInstructions extends Described {
+
+	private final EvaluationInstructionsDescriptor auth;
+
+	public DescribedAuthenticationInstructions(EvaluationInstructionsDescriptor auth) {
+		this.auth = auth;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(tabs).append(Messages.getString("DescribedAuthenticationInstructions_environment")) //$NON-NLS-1$
+				.append(auth.getType()).append(nl)//
+				.append(tabs).append(tabs).append(Messages.getString("DescribedAuthenticationInstructions_expression")) //$NON-NLS-1$
+				.append(auth.getExpression()).append(nl);
+		return out.toString();
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedDate.java

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.function.Supplier;
+
+public final class DescribedDate implements Supplier<String> {
+
+	private final SimpleDateFormat format = new SimpleDateFormat("dd.MM.YYYY z"); //$NON-NLS-1$
+
+	private final Date date;
+
+	public DescribedDate(Date date) {
+		this.date = date;
+	}
+
+	@Override
+	public String get() {
+		return format.format(date);
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedFloatingFeatureGrant.java

@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import org.eclipse.passage.lic.internal.licenses.model.i18n.Messages;
+import org.eclipse.passage.lic.licenses.FeatureGrantDescriptor;
+
+public final class DescribedFloatingFeatureGrant extends Described {
+
+	private FeatureGrantDescriptor grant;
+
+	public DescribedFloatingFeatureGrant(FeatureGrantDescriptor grant) {
+		this.grant = grant;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(tab).append(Messages.getString("DescribedPersonalFeatureGrant_feature")) // //$NON-NLS-1$
+				.append(grant.getFeature().getIdentifier()).append(nl)//
+
+				.append(tabs).append(Messages.getString("DescribedPersonalFeatureGrant_version")) // //$NON-NLS-1$
+				.append(grant.getFeature().getVersionMatch().getVersion())//
+				.append(Messages.getString("DescribedPersonalFeatureGrant_rule")) // //$NON-NLS-1$
+				.append(grant.getFeature().getVersionMatch().getRule())//
+				.append(nl)//
+
+				.append(tabs).append(new DescribedValidityPeriod(grant.getValid()).get()).append(nl)//
+
+				.append(tabs).append(Messages.getString("DescribedPersonalFeatureGrant_capacity"))// //$NON-NLS-1$
+				.append(grant.getCapacity()).append(nl);//
+		return out.toString();
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedFloatingFeatureGrants.java

@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import java.util.List;
+
+import org.eclipse.passage.lic.internal.licenses.model.i18n.Messages;
+import org.eclipse.passage.lic.licenses.FeatureGrantDescriptor;
+
+public final class DescribedFloatingFeatureGrants extends Described {
+
+	private final List<? extends FeatureGrantDescriptor> grants;
+
+	public DescribedFloatingFeatureGrants(List<? extends FeatureGrantDescriptor> grants) {
+		this.grants = grants;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(grants.size()).append(Messages.getString("DescribedPersonalFeatureGrants_grants")).append(nl); //$NON-NLS-1$
+		for (FeatureGrantDescriptor grant : grants) {
+			out.append(new DescribedFloatingFeatureGrant(grant).get());
+		}
+		return out.toString();
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedFloatingLicense.java

@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import java.util.function.Supplier;
+
+import org.eclipse.passage.lic.licenses.FloatingLicensePackDescriptor;
+
+public final class DescribedFloatingLicense implements Supplier<String> {
+
+	private final FloatingLicensePackDescriptor pack;
+
+	public DescribedFloatingLicense(FloatingLicensePackDescriptor license) {
+		this.pack = license;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(new DescribedLicenseRequisites(pack.getLicense()).get());
+		out.append(new DescribedHost(pack.getHost()).get());
+		out.append(new DescribedUserGrants(pack.getUsers()).get());
+		out.append(new DescribedFloatingFeatureGrants(pack.getFeatures()).get());
+		return out.toString();
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedHost.java

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import org.eclipse.passage.lic.internal.licenses.model.i18n.Messages;
+import org.eclipse.passage.lic.licenses.FloatingServerDescriptor;
+
+public final class DescribedHost extends Described {
+
+	private final FloatingServerDescriptor server;
+
+	public DescribedHost(FloatingServerDescriptor server) {
+		this.server = server;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(tab).append(Messages.getString("DescribedHost_host")) //$NON-NLS-1$
+				.append(server.getIdentifier()).append(nl)//
+				.append(tab).append(new DescribedAuthenticationInstructions(server.getAuthentication())).append(nl);
+		return out.toString();
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedLicenseRequisites.java

@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2022 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
+ *******************************************************************************/
+package org.eclipse.passage.lic.licenses.model.described;
+
+import org.eclipse.passage.lic.internal.licenses.model.i18n.Messages;
+import org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor;
+
+public final class DescribedLicenseRequisites extends Described {
+
+	private final LicenseRequisitesDescriptor license;
+
+	public DescribedLicenseRequisites(LicenseRequisitesDescriptor license) {
+		this.license = license;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(Messages.getString("DescribedLicenseRequisites_requisites")).append(nl)// //$NON-NLS-1$
+				.append(tab).append(Messages.getString("DescribedLicenseRequisites_product")) //$NON-NLS-1$
+				.append(license.getProduct().getIdentifier())//
+				.append(Messages.getString("DescribedLicenseRequisites_version")) //$NON-NLS-1$
+				.append(license.getProduct().getVersion()).append(nl)//
+
+				.append(tab).append(Messages.getString("DescribedLicenseRequisites_identifier")) //$NON-NLS-1$
+				.append(license.getIdentifier()).append(nl)//
+
+				.append(tab).append(new DescribedValidityPeriod(license.getValid()).get()).append(nl) //
+
+				.append(tab).append(Messages.getString("DescribedLicenseRequisites_issued")) //$NON-NLS-1$
+				.append(new DescribedDate(license.getIssueDate()).get()).append(nl)//
+
+				.append(tab).append(Messages.getString("DescribedLicenseRequisites_plan")).append(license.getPlan()) //$NON-NLS-1$
+				.append(nl)//
+
+				.append(tab).append(license.getAgreements().size())
+				.append(Messages.getString("DescribedLicenseRequisites_agreements")).append(nl); //$NON-NLS-1$
+		return out.toString();
+	}
+
+}