Skip to content

Commit ab92130

Browse files
bactbact
committed
deploy: 3718577 
1 parent c3eda0d commit ab92130

7 files changed

Lines changed: 48 additions & 20 deletions

File tree

‎index-all.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,10 @@ <h2 class="title">C</h2>
387387
<div class="block">Converts an SPDX spec version 2 SPDX ExtractedLicenseInfo to an SPDX spec version 3 SPDX CustomLicense and store the result
388388
in the toStore</div>
389389
</dd>
390+
<dt><span class="memberNameLink"><a href="org/spdx/library/conversion/Spdx2to3Converter.html#convertAndStore(org.spdx.library.model.v2.license.InvalidLicenseExpression)">convertAndStore(InvalidLicenseExpression)</a></span> - Method in class org.spdx.library.conversion.<a href="org/spdx/library/conversion/Spdx2to3Converter.html" title="class in org.spdx.library.conversion">Spdx2to3Converter</a></dt>
391+
<dd>
392+
<div class="block">Converts an SPDX spec version 2 SPDX InvalidLicenseExpression to an SPDX spec version 3 SPDX InvalidLicenseExpression and store the result</div>
393+
</dd>
390394
<dt><span class="memberNameLink"><a href="org/spdx/library/conversion/Spdx2to3Converter.html#convertAndStore(org.spdx.library.model.v2.license.LicenseException)">convertAndStore(LicenseException)</a></span> - Method in class org.spdx.library.conversion.<a href="org/spdx/library/conversion/Spdx2to3Converter.html" title="class in org.spdx.library.conversion">Spdx2to3Converter</a></dt>
391395
<dd>
392396
<div class="block">Converts an SPDX spec version 2 SPDX LicenseException to an SPDX spec version 3 LicenseAddition and store the result

‎member-search-index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎member-search-index.zip‎

16 Bytes
Binary file not shown.

‎org/spdx/library/LicenseInfoFactory.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,7 @@ <h4>parseSPDXLicenseStringCompatV2</h4>
488488
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang" class="externalLink">String</a>&nbsp;documentUri,
489489
<a href="https://docs.oracle.com/javase/8/docs/api/javax/annotation/Nullable.html?is-external=true" title="class or interface in javax.annotation" class="externalLink">@Nullable</a>
490490
org.spdx.core.IModelCopyManager&nbsp;copyManager)
491-
throws org.spdx.library.model.v2.license.InvalidLicenseStringException,
492-
org.spdx.core.DefaultStoreNotInitializedException</pre>
491+
throws org.spdx.core.DefaultStoreNotInitializedException</pre>
493492
<div class="block">Parses a license string and converts it into a SPDXLicenseInfo object
494493
Syntax - A license set must start and end with a parenthesis "("
495494
A conjunctive license set will have and AND after the first
@@ -513,7 +512,6 @@ <h4>parseSPDXLicenseStringCompatV2</h4>
513512
<dd>an SPDXLicenseInfo created from the string. If the license expression is not parseable, a <code>InvalidLicenseExpression</code> is returned.</dd>
514513
<dt><span class="throwsLabel">Throws:</span></dt>
515514
<dd><code>org.spdx.core.DefaultStoreNotInitializedException</code> - if the default model store is not initialized</dd>
516-
<dd><code>org.spdx.library.model.v2.license.InvalidLicenseStringException</code></dd>
517515
</dl>
518516
</li>
519517
</ul>

‎org/spdx/library/conversion/Spdx2to3Converter.html‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
catch(err) {
2828
}
2929
//-->
30-
var data = {"i0":9,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":9,"i23":10,"i24":10,"i25":9};
30+
var data = {"i0":9,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":9,"i24":10,"i25":10,"i26":9};
3131
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
3232
var altColor = "altColor";
3333
var rowColor = "rowColor";
@@ -339,117 +339,124 @@ <h3>Method Summary</h3>
339339
</td>
340340
</tr>
341341
<tr id="i10" class="altColor">
342+
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.simplelicensing.InvalidLicenseExpression</code></td>
343+
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.license.InvalidLicenseExpression)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.license.InvalidLicenseExpression&nbsp;fromInvalidLicenseExpression)</code></th>
344+
<td class="colLast">
345+
<div class="block">Converts an SPDX spec version 2 SPDX InvalidLicenseExpression to an SPDX spec version 3 SPDX InvalidLicenseExpression and store the result</div>
346+
</td>
347+
</tr>
348+
<tr id="i11" class="rowColor">
342349
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.expandedlicensing.LicenseAddition</code></td>
343350
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.license.LicenseException)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.license.LicenseException&nbsp;fromException)</code></th>
344351
<td class="colLast">
345352
<div class="block">Converts an SPDX spec version 2 SPDX LicenseException to an SPDX spec version 3 LicenseAddition and store the result
346353
in the toStore</div>
347354
</td>
348355
</tr>
349-
<tr id="i11" class="rowColor">
356+
<tr id="i12" class="altColor">
350357
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicenseException</code></td>
351358
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.license.ListedLicenseException)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.license.ListedLicenseException&nbsp;fromException)</code></th>
352359
<td class="colLast">
353360
<div class="block">Converts an SPDX spec version 2 SPDX ListedLicenseException to an SPDX spec version 3 ListedLicenseAddition and store the result
354361
in the toStore</div>
355362
</td>
356363
</tr>
357-
<tr id="i12" class="altColor">
364+
<tr id="i13" class="rowColor">
358365
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.expandedlicensing.OrLaterOperator</code></td>
359366
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.license.OrLaterOperator)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.license.OrLaterOperator&nbsp;fromOrLaterOperator)</code></th>
360367
<td class="colLast">
361368
<div class="block">Converts an SPDX spec version 2 SPDX OrLaterOperator to an SPDX spec version 3 SPDX OrLaterOperator and store the result
362369
in the toStore</div>
363370
</td>
364371
</tr>
365-
<tr id="i13" class="rowColor">
372+
<tr id="i14" class="altColor">
366373
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicense</code></td>
367374
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.license.SpdxListedLicense)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.license.SpdxListedLicense&nbsp;fromSpdxListedLicense)</code></th>
368375
<td class="colLast">
369376
<div class="block">Converts an SPDX spec version 2 SPDX SpdxListedLicense to an SPDX spec version 3 SPDX ListedLicense and store the result
370377
in the toStore</div>
371378
</td>
372379
</tr>
373-
<tr id="i14" class="altColor">
380+
<tr id="i15" class="rowColor">
374381
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.expandedlicensing.WithAdditionOperator</code></td>
375382
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.license.WithExceptionOperator)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.license.WithExceptionOperator&nbsp;fromWithExceptionOperator)</code></th>
376383
<td class="colLast">
377384
<div class="block">Converts an SPDX spec version 2 SPDX WithExceptionOperator to an SPDX spec version 3 SPDX WithAdditionOperator and store the result
378385
in the toStore</div>
379386
</td>
380387
</tr>
381-
<tr id="i15" class="rowColor">
388+
<tr id="i16" class="altColor">
382389
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.core.Relationship</code></td>
383390
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.Relationship,org.spdx.library.model.v3_0_1.core.Element)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.Relationship&nbsp;fromRelationship,
384391
org.spdx.library.model.v3_0_1.core.Element&nbsp;containingElement)</code></th>
385392
<td class="colLast">
386393
<div class="block">Converts an SPDX spec version 2 relationship to an SPDX spec version 3 relationship</div>
387394
</td>
388395
</tr>
389-
<tr id="i16" class="altColor">
396+
<tr id="i17" class="rowColor">
390397
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.core.SpdxDocument</code></td>
391398
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.SpdxDocument)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.SpdxDocument&nbsp;fromDoc)</code></th>
392399
<td class="colLast">
393400
<div class="block">Converts an SPDX spec version 2 SPDX document to an SPDX spec version 3 SPDX document and store the result
394401
in the toStore</div>
395402
</td>
396403
</tr>
397-
<tr id="i17" class="rowColor">
404+
<tr id="i18" class="altColor">
398405
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.core.Element</code></td>
399406
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.SpdxElement)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.SpdxElement&nbsp;fromElement)</code></th>
400407
<td class="colLast">
401408
<div class="block">Converts the Element and stores all properties in the toStore</div>
402409
</td>
403410
</tr>
404-
<tr id="i18" class="altColor">
411+
<tr id="i19" class="rowColor">
405412
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.software.SpdxFile</code></td>
406413
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.SpdxFile)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.SpdxFile&nbsp;spdxFile)</code></th>
407414
<td class="colLast">
408415
<div class="block">Converts the SPDX 2 SpdxFile to an SPDX 3 SpdxFile and returns the converted file</div>
409416
</td>
410417
</tr>
411-
<tr id="i19" class="rowColor">
418+
<tr id="i20" class="altColor">
412419
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.software.SpdxPackage</code></td>
413420
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.SpdxPackage)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.SpdxPackage&nbsp;spdxPackage)</code></th>
414421
<td class="colLast">
415422
<div class="block">Converts the SPDX 2 SpdxPackage to an SPDX 3 SpdxPackage and returns the converted package</div>
416423
</td>
417424
</tr>
418-
<tr id="i20" class="altColor">
425+
<tr id="i21" class="rowColor">
419426
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.core.IntegrityMethod</code></td>
420427
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.SpdxPackageVerificationCode)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.SpdxPackageVerificationCode&nbsp;spdxPackageVerificationCode)</code></th>
421428
<td class="colLast">
422429
<div class="block">Converts the spdxPackageVerificationCode to an IntegrityMethod and store the result in the toModelStore</div>
423430
</td>
424431
</tr>
425-
<tr id="i21" class="rowColor">
432+
<tr id="i22" class="altColor">
426433
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.software.Snippet</code></td>
427434
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertAndStore(org.spdx.library.model.v2.SpdxSnippet)">convertAndStore</a></span>&#8203;(org.spdx.library.model.v2.SpdxSnippet&nbsp;fromSnippet)</code></th>
428435
<td class="colLast">
429436
<div class="block">Converts the SPDX 2 SpdxSnippet to an SPDX 3 Snippet and returns the converted snippet</div>
430437
</td>
431438
</tr>
432-
<tr id="i22" class="altColor">
439+
<tr id="i23" class="rowColor">
433440
<td class="colFirst"><code>static org.spdx.library.model.v3_0_1.core.CreationInfo</code></td>
434441
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertCreationInfo(org.spdx.library.model.v2.SpdxCreatorInformation,org.spdx.storage.IModelStore,java.lang.String)">convertCreationInfo</a></span>&#8203;(org.spdx.library.model.v2.SpdxCreatorInformation&nbsp;creationInfoV2,
435442
org.spdx.storage.IModelStore&nbsp;modelStore,
436443
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang" class="externalLink">String</a>&nbsp;uriPrefix)</code></th>
437444
<td class="colLast">&nbsp;</td>
438445
</tr>
439-
<tr id="i23" class="rowColor">
446+
<tr id="i24" class="altColor">
440447
<td class="colFirst"><code>org.spdx.library.model.v3_0_1.simplelicensing.LicenseExpression</code></td>
441448
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToLicenseExpression(org.spdx.library.model.v2.license.AnyLicenseInfo)">convertToLicenseExpression</a></span>&#8203;(org.spdx.library.model.v2.license.AnyLicenseInfo&nbsp;fromLicense)</code></th>
442449
<td class="colLast">
443450
<div class="block">Converts an SPDX spec version 2 SPDX AnyLicenseInfo to an SPDX spec version 3 LicenseExpression</div>
444451
</td>
445452
</tr>
446-
<tr id="i24" class="altColor">
453+
<tr id="i25" class="rowColor">
447454
<td class="colFirst"><code>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util" class="externalLink">Optional</a>&lt;org.spdx.library.model.v3_0_1.ModelObjectV3&gt;</code></td>
448455
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExistingObject(java.lang.String,java.lang.String)">getExistingObject</a></span>&#8203;(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang" class="externalLink">String</a>&nbsp;fromObjectUri,
449456
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang" class="externalLink">String</a>&nbsp;toType)</code></th>
450457
<td class="colLast">&nbsp;</td>
451458
</tr>
452-
<tr id="i25" class="rowColor">
459+
<tr id="i26" class="altColor">
453460
<td class="colFirst"><code>static org.spdx.library.model.v3_0_1.core.Agent</code></td>
454461
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#stringToAgent(java.lang.String,org.spdx.library.model.v3_0_1.core.CreationInfo)">stringToAgent</a></span>&#8203;(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang" class="externalLink">String</a>&nbsp;spdx2personOrgString,
455462
org.spdx.library.model.v3_0_1.core.CreationInfo&nbsp;creationInfo)</code></th>
@@ -862,6 +869,25 @@ <h4>convertAndStore</h4>
862869
</dl>
863870
</li>
864871
</ul>
872+
<a id="convertAndStore(org.spdx.library.model.v2.license.InvalidLicenseExpression)">
873+
<!-- -->
874+
</a>
875+
<ul class="blockList">
876+
<li class="blockList">
877+
<h4>convertAndStore</h4>
878+
<pre class="methodSignature">public&nbsp;org.spdx.library.model.v3_0_1.simplelicensing.InvalidLicenseExpression&nbsp;convertAndStore&#8203;(org.spdx.library.model.v2.license.InvalidLicenseExpression&nbsp;fromInvalidLicenseExpression)
879+
throws org.spdx.core.InvalidSPDXAnalysisException</pre>
880+
<div class="block">Converts an SPDX spec version 2 SPDX InvalidLicenseExpression to an SPDX spec version 3 SPDX InvalidLicenseExpression and store the result</div>
881+
<dl>
882+
<dt><span class="paramLabel">Parameters:</span></dt>
883+
<dd><code>fromInvalidLicenseExpression</code> - an SPDX spec version 2 InvalidLicenseExpression</dd>
884+
<dt><span class="returnLabel">Returns:</span></dt>
885+
<dd>an SPDX spec version 3 InvalidLicenseExpression</dd>
886+
<dt><span class="throwsLabel">Throws:</span></dt>
887+
<dd><code>org.spdx.core.InvalidSPDXAnalysisException</code> - on any errors converting</dd>
888+
</dl>
889+
</li>
890+
</ul>
865891
<a id="convertAndStore(org.spdx.library.model.v2.license.SpdxListedLicense)">
866892
<!-- -->
867893
</a>

‎package-search-index.zip‎

0 Bytes
Binary file not shown.

‎type-search-index.zip‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)