pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-07-03 01:02:55 +00:00
Code Issues Activity

refactor: merge DataForm and Unterformular (#36)

Browse Source 
* refactor: merge DataForm and Unterformular
* refactor: change visibility
This commit is contained in:
Paul-Christian Volkmer
2024-11-07 19:06:06 +01:00
committed by GitHub
parent 15c79f8109
commit 622811df5a
6 changed files with 335 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/model/requirements.rs
View File

@ -19,10 +19,9 @@
*/
use crate::model::data_catalogue::DataCatalogue;
use crate::model::data_form::DataForm;
use crate::model::form::{DataFormType, Form, UnterformularType};
use crate::model::onkostar_editor::OnkostarEditor;
use crate::model::property_catalogue::PropertyCatalogue;
use crate::model::unterformular::Unterformular;
use crate::model::{Comparable, Listable, Sortable};
use std::fmt::Display;
@ -32,14 +31,14 @@ pub enum Requirement<'a> {
DataCatalogue(&'a DataCatalogue),
ExternalPropertyCatalogue(String),
ExternalDataCatalogue(String),
DataFormReference(&'a DataForm),
UnterformularReference(&'a Unterformular),
DataFormReference(&'a Form<DataFormType>),
UnterformularReference(&'a Form<UnterformularType>),
#[allow(dead_code)]
ExternalDataFormReference(String),
ExternalUnterformularReference(String),
DataFormSubform(&'a DataForm),
UnterformularSubform(&'a Unterformular),
DataFormSubform(&'a Form<DataFormType>),
UnterformularSubform(&'a Form<UnterformularType>),
#[allow(dead_code)]
ExternalDataFormSubform(String),
ExternalUnterformularSubform(String),