Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 28, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
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]>
eparovyshnaya committed Nov 28, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 21a0f3fb55900b089c18b2ca4d94feacfbea4923
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}