aboutsummaryrefslogtreecommitdiff
path: root/tvsaver/saver2v1/save_annotation.go
diff options
context:
space:
mode:
authorBrandon Lum <lumjjb@gmail.com>2022-07-19 16:43:48 -0400
committerBrandon Lum <lumjjb@gmail.com>2022-07-19 22:43:24 -0400
commit9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1 (patch)
treea43213aadfb9bde3d9ec15634a39305f19ff38b2 /tvsaver/saver2v1/save_annotation.go
parent41d2272711255f5a25e16e3507ec3318bc550189 (diff)
downloadspdx-tools-9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1.tar.gz
replace all v2_1, v2_2 with new convention
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Diffstat (limited to 'tvsaver/saver2v1/save_annotation.go')
-rw-r--r--tvsaver/saver2v1/save_annotation.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/tvsaver/saver2v1/save_annotation.go b/tvsaver/saver2v1/save_annotation.go
index f7d7953..3fa351f 100644
--- a/tvsaver/saver2v1/save_annotation.go
+++ b/tvsaver/saver2v1/save_annotation.go
@@ -6,10 +6,11 @@ import (
"fmt"
"io"
- "github.com/spdx/tools-golang/spdx"
+ "github.com/spdx/tools-golang/spdx/common"
+ "github.com/spdx/tools-golang/spdx/v2_1"
)
-func renderAnnotation2_1(ann *spdx.Annotation2_1, w io.Writer) error {
+func renderAnnotation2_1(ann *v2_1.Annotation, w io.Writer) error {
if ann.Annotator.Annotator != "" && ann.Annotator.AnnotatorType != "" {
fmt.Fprintf(w, "Annotator: %s: %s\n", ann.Annotator.AnnotatorType, ann.Annotator.Annotator)
}
@@ -19,7 +20,7 @@ func renderAnnotation2_1(ann *spdx.Annotation2_1, w io.Writer) error {
if ann.AnnotationType != "" {
fmt.Fprintf(w, "AnnotationType: %s\n", ann.AnnotationType)
}
- annIDStr := spdx.RenderDocElementID(ann.AnnotationSPDXIdentifier)
+ annIDStr := common.RenderDocElementID(ann.AnnotationSPDXIdentifier)
if annIDStr != "SPDXRef-" {
fmt.Fprintf(w, "SPDXREF: %s\n", annIDStr)
}