Added more examples of classes

Author: viddie

input.txt renamed to input_class.txt

@@ -0,0 +1,40 @@
+Model:Object
+
+Object:lg
+lieblingsgrieche:Restaurant
+kategorie:Sterne 3
+name "Platon"
+
+Object:maren
+maren:Gast
+status "König"
+geldbetrag:EUR 300
+
+Object:klaudia
+klaudia:Gast
+status "König"
+geldbetrag:EUR 20
+hunger true
+
+Object:k1
+:Kellner
+persAusweisNr 12345
+gehalt:EUR 1500
+
+Link
+k1,lg
++Arbeitnehmer,+Arbeitgeber
+
+Link:bedient
+k1,maren
+
+Link:bedient
+k1,klaudia
+
+Link:besucht
+klaudia,lg
+
+Link:besucht
+maren,lg
+
+/Model

input_object.txt

@@ -0,0 +1,34 @@
+Model:Package
+
+Package:main
+gui,drawer,generator,reader,parser
+
+Package:gui
+
+Package:drawer
+
+Package:generator
+
+Package:reader
+
+Package:parser
+
+Package:azul
+
+Package:imageproc
+
+Package:nom
+
+Import
+gui,azul
+
+Import
+drawer,imageproc
+
+Import
+parser,nom
+
+Access
+drawer,parser
+
+/Model

input_package.txt

@@ -0,0 +1,33 @@
+Model:UseCase
+
+System:Bank
+
+Actor:customer
+Kunde
+
+Actor:employee
+Bank Angestellter
+
+UseCase:openAccount
+Konto eröffnen
+
+UseCase:depositFunds
+Geld einzahlen
+
+UseCase:calcBonus
+Bonus berechnen
+
+Extend
+calcBonus,depositFunds
+Wenn Geld größer als 10.000€
+
+Association
+customer,openAccount
+
+Association
+customer,depositFunds
+
+Association
+employee,openAccount
+
+/Model

input_use_case.txt

@@ -36,7 +36,7 @@ struct AppData {
 impl Default for AppData {
     fn default() -> Self {
         Self {
-            input_file_name: TextInputState::new("input.txt"),
+            input_file_name: TextInputState::new("input_class.txt"),
             output_file_name: TextInputState::new("output.png"),
             input_model_structure: TextInputState::new("Model:Object
 

src/gui.rs

@@ -98,7 +98,7 @@ private String description
 //                     "".to_string(),
 //                     "/Model".to_string()];
 //    let current_working_directory = current_dir().ok().and_then(|p| Some(p.to_str().unwrap_or("/").to_string())).unwrap_or_default();;
-//    let stringo = match reader::read_from_file(&*format!("{}/{}", current_working_directory, "input.txt")) {
+//    let stringo = match reader::read_from_file(&*format!("{}/{}", current_working_directory, "input_class.txt")) {
 //        Ok(val) => val,
 //        Err(err) => return,
 //    };
@@ -118,7 +118,7 @@ private String description
 //    };
 
     // So sollten Bilder eigentlich geladen werden:
-    // let (input_filename, output_filename) = get_cli_args("input.txt", "output.png");
+    // let (input_filename, output_filename) = get_cli_args("input_class.txt_class", "output.png");
     // let (classes, relations) = parser::init(&input_filename).unwrap();
     // let image_buf = generator::generate_pic(&classes, &relations);
     // image_buf.save(&Path::new(&output_filename)).unwrap();

src/main.rs

@@ -533,10 +533,26 @@ pub fn parse_model(lines: &[String]) -> Result<ModelContainer, ParseError> {
             ModelContainer {model_type: ModelType::ObjectModel, class_model: None, object_model: Some(object_model), package_model: None, use_case_model: None}
         },
         ModelType::PackageModel => {
-            return Err(ParseError::InvalidModelError);
+            let package_model = match pack_package_model(all_lines.as_bytes()){
+                Ok(val) => val.1,
+                Err(err) => {
+                    println!("Encountered error while parsing: {}", err);
+                    return Err(ParseError::ParseError);
+                }
+            };
+
+            ModelContainer {model_type: ModelType::ObjectModel, class_model: None, object_model: None, package_model: Some(package_model), use_case_model: None}
         },
         ModelType::UseCaseModel => {
-            return Err(ParseError::InvalidModelError);
+            let uc_model = match uc_use_case_model(all_lines.as_bytes()){
+                Ok(val) => val.1,
+                Err(err) => {
+                    println!("Encountered error while parsing: {}", err);
+                    return Err(ParseError::ParseError);
+                }
+            };
+
+            ModelContainer {model_type: ModelType::ObjectModel, class_model: None, object_model: None, package_model: None, use_case_model: Some(uc_model)}
         },
         ModelType::None => return Err(ParseError::InvalidModelError)
     };