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

Bug 575166 License Agreement management: license issuing #877

Merged
merged 1 commit into from
Aug 16, 2021
Merged

Bug 575166 License Agreement management: license issuing #877

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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="file" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="hashAlgo" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="hash" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="hash" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByteArray"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="content" ordered="false"
unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByteArray"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="contentType" lowerBound="1"
Expand Down
6 changes: 3 additions & 3 deletions ....lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/AgreementData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ public interface AgreementData extends EObject, AgreementDataDescriptor {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Hash</em>' attribute.
* @see #setHash(String)
* @see #setHash(byte[])
* @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getAgreementData_Hash()
* @model required="true"
* @generated
*/
@Override
String getHash();
byte[] getHash();

/**
* Sets the value of the '{@link org.eclipse.passage.lic.licenses.model.api.AgreementData#getHash <em>Hash</em>}' attribute.
Expand All @@ -156,7 +156,7 @@ public interface AgreementData extends EObject, AgreementDataDescriptor {
* @see #getHash()
* @generated
*/
void setHash(String value);
void setHash(byte[] value);

/**
* Returns the value of the '<em><b>Content</b></em>' attribute.
Expand Down
12 changes: 6 additions & 6 deletions ...licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/AgreementDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public class AgreementDataImpl extends MinimalEObjectImpl.Container implements A
* @generated
* @ordered
*/
protected static final String HASH_EDEFAULT = null;
protected static final byte[] HASH_EDEFAULT = null;

/**
* The cached value of the '{@link #getHash() <em>Hash</em>}' attribute.
Expand All @@ -144,7 +144,7 @@ public class AgreementDataImpl extends MinimalEObjectImpl.Container implements A
* @generated
* @ordered
*/
private String hash = HASH_EDEFAULT;
private byte[] hash = HASH_EDEFAULT;

/**
* The default value of the '{@link #getContent() <em>Content</em>}' attribute.
Expand Down Expand Up @@ -309,7 +309,7 @@ public void setHashAlgo(String newHashAlgo) {
* @generated
*/
@Override
public String getHash() {
public byte[] getHash() {
return hash;
}

Expand All @@ -319,8 +319,8 @@ public String getHash() {
* @generated
*/
@Override
public void setHash(String newHash) {
String oldHash = hash;
public void setHash(byte[] newHash) {
byte[] oldHash = hash;
hash = newHash;
if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, LicensesPackage.AGREEMENT_DATA__HASH, oldHash, hash));
Expand Down Expand Up @@ -425,7 +425,7 @@ public void eSet(int featureID, Object newValue) {
setHashAlgo((String) newValue);
return;
case LicensesPackage.AGREEMENT_DATA__HASH:
setHash((String) newValue);
setHash((byte[]) newValue);
return;
case LicensesPackage.AGREEMENT_DATA__CONTENT:
setContent((byte[]) newValue);
Expand Down
2 changes: 1 addition & 1 deletion ...censes.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2257,7 +2257,7 @@ public void initializePackageContents() {
initEAttribute(getAgreementData_HashAlgo(), ecorePackage.getEString(), "hashAlgo", null, 1, 1, //$NON-NLS-1$
AgreementData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getAgreementData_Hash(), ecorePackage.getEString(), "hash", null, 1, 1, AgreementData.class, //$NON-NLS-1$
initEAttribute(getAgreementData_Hash(), ecorePackage.getEByteArray(), "hash", null, 1, 1, AgreementData.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getAgreementData_Content(), ecorePackage.getEByteArray(), "content", null, 1, 1, //$NON-NLS-1$
AgreementData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
Expand Down
2 changes: 1 addition & 1 deletion ...se.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/AgreementDataDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public interface AgreementDataDescriptor {

String getHashAlgo();

String getHash();
byte[] getHash();

byte[] getContent();

Expand Down