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

add description to floating license issue wizard's info

Signed-off-by: eparovyshnaya <[email protected]>

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

@@ -13,6 +13,7 @@
 
 DescribedAuthenticationInstructions_environment=Authenticated by 
 DescribedAuthenticationInstructions_expression=with expression 
+DescribedHost_host=Intended for server 
 DescribedLicenseRequisites_identifier=Identifier: 
 DescribedLicenseRequisites_issued=Issued: 
 DescribedLicenseRequisites_plan=Under licensing plan 
@@ -24,5 +25,7 @@ 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/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/DescribedUserGrant.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.UserGrantDescriptor;
+
+public final class DescribedUserGrant extends Described {
+
+	private UserGrantDescriptor grant;
+
+	public DescribedUserGrant(UserGrantDescriptor grant) {
+		this.grant = grant;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(tab).append(Messages.getString("DescribedPersonalFeatureGrant_user")) //$NON-NLS-1$
+				.append(grant.getUser()).append(nl)//
+				.append(tabs).append(new DescribedAuthenticationInstructions(grant.getAuthentication()).get())
+				.append(nl);
+		return out.toString();
+	}
+
+}

bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/licenses/model/described/DescribedUserGrants.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.UserGrantDescriptor;
+
+public final class DescribedUserGrants extends Described {
+
+	private final List<? extends UserGrantDescriptor> grants;
+
+	public DescribedUserGrants(List<? extends UserGrantDescriptor> grants) {
+		this.grants = grants;
+	}
+
+	@Override
+	public String get() {
+		StringBuilder out = new StringBuilder();
+		out.append(grants.size()).append(Messages.getString("DescribedUserGrants_grants")).append(nl); //$NON-NLS-1$
+		for (UserGrantDescriptor grant : grants) {
+			out.append(new DescribedUserGrant(grant).get());
+		}
+		return out.toString();
+	}
+
+}