diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index e8895216fd3c0c3af4c4522334775f41b7deb42e..519050183b23c7412e9e0ee89646441d42de9f59 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 1af3c83ccf14873067a402bbb2c2530d19229cb1..548ad72043b82aed12b1e6706baaa02f0fcd01aa 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 df8d911a464a4a9095942503207209fed7a605cf..0ed34af5e9c4e8f1b7630e531c46add9d51013a7 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 ba3ff6ba4c7c3fa8c6abca418313f00a3aa68cf2..afc01bf0e79e86310c2cf512800102e4a3786fce 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;