From 8cae6ce706458a148f16b15cc4ad446d6cfea894 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Sat, 30 Sep 2023 13:04:47 +0200
Subject: [PATCH] Cleanup Requirement::to_string()

---
 src/model/requirements.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/model/requirements.rs b/src/model/requirements.rs
index 0e785db..84595d6 100644
--- a/src/model/requirements.rs
+++ b/src/model/requirements.rs
@@ -53,26 +53,22 @@ impl ToString for Requirement<'_> {
         match self {
             Requirement::PropertyCatalogue(item) => item.to_listed_string(),
             Requirement::DataCatalogue(item) => item.to_listed_string(),
+            Requirement::DataFormReference(item) => item.to_listed_string(),
+            Requirement::UnterformularReference(item) => item.to_listed_string(),
+            Requirement::DataFormSubform(item) => item.to_listed_string(),
+            Requirement::UnterformularSubform(item) => item.to_listed_string(),
             Requirement::ExternalPropertyCatalogue(name) => {
                 format!("Merkmalskatalog (-) '{}' - hier nicht enthalten", name)
             }
             Requirement::ExternalDataCatalogue(name) => {
                 format!("Datenkatalog (-) '{}' - hier nicht enthalten", name)
             }
-            Requirement::DataFormReference(item) => item.to_listed_string(),
-            Requirement::UnterformularReference(item) => item.to_listed_string(),
-            Requirement::ExternalDataFormReference(name) => {
+            Requirement::ExternalDataFormReference(name)
+            | Requirement::ExternalDataFormSubform(name) => {
                 format!("Formular (-) '{}' - hier nicht enthalten", name)
             }
-            Requirement::ExternalUnterformularReference(name) => {
-                format!("Unterformular (-) '{}' - hier nicht enthalten", name)
-            }
-            Requirement::DataFormSubform(item) => item.to_listed_string(),
-            Requirement::UnterformularSubform(item) => item.to_listed_string(),
-            Requirement::ExternalDataFormSubform(name) => {
-                format!("Formular (-) '{}' - hier nicht enthalten", name)
-            }
-            Requirement::ExternalUnterformularSubform(name) => {
+            Requirement::ExternalUnterformularReference(name)
+            | Requirement::ExternalUnterformularSubform(name) => {
                 format!("Unterformular (-) '{}' - hier nicht enthalten", name)
             }
         }