From 75b7ecd00be1186e87ecd2ebad4fa22acd4e888f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eckl=2C=20M=C3=A1t=C3=A9?= <ecklm@sch.bme.hu> Date: Tue, 29 Sep 2015 08:53:27 +0200 Subject: [PATCH] 4. labor minimum feladatai befejezve --- .../src/beerregister/BeerRegister.java | 21 ++++++++++++++++++- .../src/beerregister/NameComparator.java | 2 -- .../src/beerregister/StrengthComparator.java | 2 -- .../src/beerregister/StyleComparator.java | 3 --- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/4. labor/BeerRegister/src/beerregister/BeerRegister.java b/4. labor/BeerRegister/src/beerregister/BeerRegister.java index 4793016..db680fb 100644 --- a/4. labor/BeerRegister/src/beerregister/BeerRegister.java +++ b/4. labor/BeerRegister/src/beerregister/BeerRegister.java @@ -9,6 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; public class BeerRegister { public static void main(String[] args) throws IOException, ClassNotFoundException @@ -24,7 +25,25 @@ public class BeerRegister { storage.add(new Beer(cmd[1], cmd[2], Double.parseDouble(cmd[3]))); break; case "list": - Collections.sort(storage,new NameComparator()); + if (cmd.length>1) + { + Comparator<Beer> cmp=null; + switch(cmd[1]) + { + case "name": + cmp=new NameComparator(); + break; + case "style": + cmp=new StyleComparator(); + break; + case "strength": + cmp=new StrengthComparator(); + break; + default: + break; + } + Collections.sort(storage, cmp); + } for(Beer element: storage) System.out.println(element); break; diff --git a/4. labor/BeerRegister/src/beerregister/NameComparator.java b/4. labor/BeerRegister/src/beerregister/NameComparator.java index cf372ce..cc4e97e 100644 --- a/4. labor/BeerRegister/src/beerregister/NameComparator.java +++ b/4. labor/BeerRegister/src/beerregister/NameComparator.java @@ -3,10 +3,8 @@ package beerregister; import java.util.Comparator; public class NameComparator implements Comparator<Beer>{ - @Override public int compare(Beer t, Beer t1) { return t.name.compareTo(t1.name); } - } diff --git a/4. labor/BeerRegister/src/beerregister/StrengthComparator.java b/4. labor/BeerRegister/src/beerregister/StrengthComparator.java index f51a7b4..ff1ddab 100644 --- a/4. labor/BeerRegister/src/beerregister/StrengthComparator.java +++ b/4. labor/BeerRegister/src/beerregister/StrengthComparator.java @@ -4,7 +4,6 @@ package beerregister; import java.util.Comparator; public class StrengthComparator implements Comparator<Beer>{ - @Override public int compare(Beer t, Beer t1) { if(t.strength==t1.strength) @@ -14,5 +13,4 @@ public class StrengthComparator implements Comparator<Beer>{ else return 1; } - } diff --git a/4. labor/BeerRegister/src/beerregister/StyleComparator.java b/4. labor/BeerRegister/src/beerregister/StyleComparator.java index d4d3fd6..2861fa2 100644 --- a/4. labor/BeerRegister/src/beerregister/StyleComparator.java +++ b/4. labor/BeerRegister/src/beerregister/StyleComparator.java @@ -3,11 +3,8 @@ package beerregister; import java.util.Comparator; public class StyleComparator implements Comparator<Beer>{ - @Override public int compare(Beer t, Beer t1) { return t.style.compareTo(t1.style); } - - } -- GitLab