From c04ca5653cab1c61105b8ae57d554e47a505ad82 Mon Sep 17 00:00:00 2001
From: kevjov <kevinjovanovic@googlemail.com>
Date: Wed, 29 Apr 2020 14:47:09 +0200
Subject: [PATCH] Added fuctionalities

---
 .settings/org.eclipse.buildship.core.prefs | 11 ++++++++
 src/main/java/io/fp/campus/App.java        |  9 ++++++-
 src/main/java/io/fp/campus/Faculty.java    | 31 +++++++++++++++++++++-
 src/main/java/io/fp/campus/Professor.java  |  2 +-
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index e889521..5190501 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
+gradle.user.home=
+java.home=C\:/Program Files/Java/jdk-13.0.2
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/src/main/java/io/fp/campus/App.java b/src/main/java/io/fp/campus/App.java
index 1af3c83..548ad72 100644
--- a/src/main/java/io/fp/campus/App.java
+++ b/src/main/java/io/fp/campus/App.java
@@ -6,11 +6,13 @@ package io.fp.campus;
 public class App {
 
     public static void main(String[] args) {
+        
         Faculty inf = new Faculty("INF");
+
         Professor schmolli = new Professor("Schmollinger", 77, "BPM", inf);
         System.out.println(schmolli.getName());
         System.out.println("Hält er Vorlesung? "+schmolli.isTalking());
-        schmolli.setTalking(true);
+        schmolli.setTalking(false);
         System.out.println("Hält er Vorlesung? "+schmolli.isTalking());
 
         Assistent kevin = new Assistent("Jovanovic", 26, inf);
@@ -34,5 +36,10 @@ public class App {
 
         System.out.println(inf.getAssisOfProf(schmolli));
 
+        System.out.println(inf.getProfWithAssis());
+
+        System.out.println("Anzahl Profs: " + inf.getAmountProfs());
+
+        System.out.println("Anzahl Assis: " + inf.getAmountAssis());
     }
 }
diff --git a/src/main/java/io/fp/campus/Faculty.java b/src/main/java/io/fp/campus/Faculty.java
index df8d911..0ed34af 100644
--- a/src/main/java/io/fp/campus/Faculty.java
+++ b/src/main/java/io/fp/campus/Faculty.java
@@ -40,7 +40,10 @@ public class Faculty {
 
         ArrayList<Assistent> profassis = new ArrayList<>();
 
-        if (!profs.contains(professor)) return profassis;
+        if (!profs.contains(professor)){
+
+            return profassis;
+        }
 
         for (Assistent assi : assis) {
             Professor p = assi.getBoss();
@@ -51,4 +54,30 @@ public class Faculty {
         return profassis;
     }
 
+    public ArrayList<Professor> getProfWithAssis(){
+
+        ArrayList<Professor> profsWithAssis = new ArrayList<>();
+
+        for(Assistent assi : assis){
+
+            Professor p = assi.getBoss();
+
+            if(p != null && !profsWithAssis.contains(p)){
+               
+                profsWithAssis.add(p);
+            }
+        }
+
+        return profsWithAssis;
+    }
+
+    public int getAmountProfs(){
+
+        return profs.size();
+    }
+
+    public int getAmountAssis(){
+
+        return assis.size();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/io/fp/campus/Professor.java b/src/main/java/io/fp/campus/Professor.java
index ba3ff6b..afc01bf 100644
--- a/src/main/java/io/fp/campus/Professor.java
+++ b/src/main/java/io/fp/campus/Professor.java
@@ -4,7 +4,7 @@ public class Professor {
 
     private String name;
     private int age;
-    private boolean isTalking=false;
+    private boolean isTalking= true;
     private String researchArea=null;
     private Faculty faculty;
 
-- 
GitLab