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.

Sign up for GitHub

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

License agreement restrictions must be emitted with restrictive level #1146 #1165

Merged
merged 1 commit into from
Nov 27, 2022
Merged

License agreement restrictions must be emitted with restrictive level #1146 #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ....passage.lic.base/src/org/eclipse/passage/lic/base/restrictions/ExaminationExplained.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,17 @@ private void appendAgreements(StringBuilder out) {
Collection<AgreementToAccept> agreements = certificate.agreements();
out.append(String.format("Agreements state contains %d entries.\r\n", agreements.size())); //$NON-NLS-1$
agreements.forEach(agreement -> {
boolean accepted = agreement.acceptance().accepted();
out.append("\tagreement [") //$NON-NLS-1$
.append(agreement.definition().path())//
.append("]\r\n\tdeclared by [") //$NON-NLS-1$
.append(agreement.origin())//
.append("]\r\n\thas [") //$NON-NLS-1$
.append(agreement.acceptance().accepted() ? "accepted" : "not accepted") //$NON-NLS-1$//$NON-NLS-2$
.append(accepted ? "accepted" : "not accepted") //$NON-NLS-1$//$NON-NLS-2$
.append("] state.\r\n"); //$NON-NLS-1$
if (!accepted) {
out.append("\tThis is FATAL!11. Product cannot proceed without the agreement been accepted.\r\n"); //$NON-NLS-1$
}
if (agreement.acceptance().error().isPresent()) {
out.append("\terror:\r\n\t") //$NON-NLS-1$
.append(new TroubleExplained(agreement.acceptance().error().get()).get())//
Expand Down
1 change: 1 addition & 0 deletions ...oc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/PersistedEncoded.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.passage.loc.internal.licenses.core.i18n.LicensesCoreMessages;
import org.eclipse.passage.loc.internal.products.core.ProductKeys;

@SuppressWarnings("restriction")
final class PersistedEncoded {

private final LicensedProduct product;
Expand Down
3 changes: 2 additions & 1 deletion ...ms/src/org/eclipse/passage/loc/products/emfforms/renderers/ProductVersionKeyRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2020 ArSysOp
* Copyright (c) 2019, 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
Expand Down Expand Up @@ -32,6 +32,7 @@
import org.eclipse.passage.loc.internal.api.workspace.OperatorWorkspace;
import org.eclipse.passage.loc.workbench.emfforms.renderers.FileContentRenderer;

@SuppressWarnings("restriction")
public abstract class ProductVersionKeyRenderer extends FileContentRenderer<ProductVersion> {

protected final OperatorWorkspace workspace;
Expand Down