Bug 547799 LicensePack should have information about Licensing Operator

Rename util structures properly Signed-off-by: eparovyshnaya <[email protected]>
eclipse-passage · May 25, 2021 · 370fe39 · 370fe39
1 parent b2f5493
commit 370fe39
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...l/licenses/convert/ELicenseSignature.java → ...al/licenses/convert/EIssuerSignature.java b/...l/licenses/convert/ELicenseSignature.java → ...al/licenses/convert/EIssuerSignature.java
@@ -23,11 +23,11 @@
 import org.eclipse.passage.lic.licenses.model.meta.LicensesFactory;
 
 @SuppressWarnings("restriction")
-public final class ELicenseSignature implements Supplier<Signature> {
+public final class EIssuerSignature implements Supplier<Signature> {
 
 	private final IssuerSignature signature;
 
-	public ELicenseSignature(IssuerSignature signature) {
+	public EIssuerSignature(IssuerSignature signature) {
 		Objects.requireNonNull(signature, "ELicenseSignature::signature"); //$NON-NLS-1$
 		this.signature = signature;
 	}
@@ -47,7 +47,7 @@ private void installParent(Signature esignature) {
 		if (!signature.parent().isPresent()) {
 			return;
 		}
-		esignature.setParent(new ELicenseSignature(signature.parent().get()).get());
+		esignature.setParent(new EIssuerSignature(signature.parent().get()).get());
 	}
 
 	private void installAttributes(Signature esignature) {

diff --git a/...l/licenses/convert/PLicenseSignature.java → ...al/licenses/convert/PIssuerSignature.java b/...l/licenses/convert/PLicenseSignature.java → ...al/licenses/convert/PIssuerSignature.java
@@ -23,11 +23,11 @@
 import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute;
 
 @SuppressWarnings("restriction")
-public final class PLicenseSignature implements Supplier<IssuerSignature> {
+public final class PIssuerSignature implements Supplier<IssuerSignature> {
 
 	private final Signature signature;
 
-	public PLicenseSignature(Signature signature) {
+	public PIssuerSignature(Signature signature) {
 		this.signature = signature;
 	}
 
@@ -47,7 +47,7 @@ private Optional<IssuerSignature> parent() {
 		Signature parent = signature.getParent();
 		return parent == null //
 				? Optional.empty() //
-				: Optional.of(new PLicenseSignature(parent).get());
+				: Optional.of(new PIssuerSignature(parent).get());
 	}
 
 }
diff --git a/...rg/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java b/...rg/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java
@@ -34,7 +34,7 @@
 import org.eclipse.passage.lic.internal.base.conditions.BaseCondition;
 import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions;
 import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed;
-import org.eclipse.passage.lic.internal.licenses.convert.PLicenseSignature;
+import org.eclipse.passage.lic.internal.licenses.convert.PIssuerSignature;
 import org.eclipse.passage.lic.internal.licenses.convert.PVersionMatch;
 import org.eclipse.passage.lic.internal.licenses.model.migration.LicensesResourceHandler;
 import org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor;
@@ -82,7 +82,7 @@ private Optional<IssuerSignature> signature(PersonalLicensePack pack) {
 		if (pack.getLicense().getSignature() == null) {
 			return Optional.empty();
 		}
-		return Optional.of(new PLicenseSignature(pack.getLicense().getSignature()).get());
+		return Optional.of(new PIssuerSignature(pack.getLicense().getSignature()).get());
 	}
 
 	private Collection<Condition> conditions(PersonalLicensePack license) {

diff --git a/...oc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java b/...oc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java
@@ -28,7 +28,7 @@
 import org.eclipse.passage.lic.internal.base.diagnostic.DiagnosticExplained;
 import org.eclipse.passage.lic.internal.equinox.EquinoxPassage;
 import org.eclipse.passage.lic.internal.equinox.SuppliedFrameworkAware;
-import org.eclipse.passage.lic.internal.licenses.convert.ELicenseSignature;
+import org.eclipse.passage.lic.internal.licenses.convert.EIssuerSignature;
 import org.eclipse.passage.lic.internal.licenses.model.signature.SignatureData;
 import org.eclipse.passage.lic.licenses.model.api.LicenseRequisites;
 import org.eclipse.passage.lic.licenses.model.api.Signature;
@@ -87,7 +87,7 @@ private void installParentSignature(Signature signature, LicensedProduct operato
 	}
 
 	private void installParentSignature(Signature signature, ConditionOrigin origin) {
-		signature.setParent(new ELicenseSignature(origin.signature()).get());
+		signature.setParent(new EIssuerSignature(origin.signature()).get());
 	}
 
 }