From 24dea94a0c4c34dac1dcd27fb3a95e42a5ce213a Mon Sep 17 00:00:00 2001 From: Peter Skopek Date: Wed, 8 Oct 2014 21:03:49 +0200 Subject: [PATCH] Adding SLF4J support. --- fishingcontest/pom.xml | 10 ++--- .../src/main/java/org/fc/data/Contest.java | 37 ++++++++----------- .../java/org/fc/ui/app/CatchDataEntry.java | 7 +++- .../src/main/resources/log4j.properties | 11 ++++++ 4 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 fishingcontest/src/main/resources/log4j.properties diff --git a/fishingcontest/pom.xml b/fishingcontest/pom.xml index bb16284..cb2a757 100644 --- a/fishingcontest/pom.xml +++ b/fishingcontest/pom.xml @@ -30,11 +30,11 @@ jasperreports 3.7.2 - - apache-log4j - log4j - 1.2.15 - + + org.slf4j + slf4j-log4j12 + 1.7.7 + org.codehaus.groovy groovy diff --git a/fishingcontest/src/main/java/org/fc/data/Contest.java b/fishingcontest/src/main/java/org/fc/data/Contest.java index 75f2f30..c23f3ae 100644 --- a/fishingcontest/src/main/java/org/fc/data/Contest.java +++ b/fishingcontest/src/main/java/org/fc/data/Contest.java @@ -28,6 +28,8 @@ import org.fc.entity.Round; import org.fc.entity.Team; import org.fc.entity.report.Boats; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author pskopek @@ -35,6 +37,8 @@ */ public class Contest { + public static final Logger log = LoggerFactory.getLogger(Contest.class); + public static final String CONTEST_DATE = "12.10.2013"; public static final String YEAR = CONTEST_DATE.substring(CONTEST_DATE.lastIndexOf(".") + 1); // for reporting public static final String FISH_TYPE = "Pd"; @@ -292,12 +296,12 @@ else if (path.equals("/contest/teams/team/gains/gain")) { else if (path.equals("/contest/dataseq")) { dataSeq = Long.parseLong(xmlr.getElementText()); path = path.substring(0, path.lastIndexOf("/")); - System.out.println("dataseq="+dataSeq); + log.debug("dataseq={}", dataSeq); } else if (path.equals("/contest/numRounds")) { NUM_ROUNDS = Integer.parseInt(xmlr.getElementText()); path = path.substring(0, path.lastIndexOf("/")); - System.out.println("NUM_ROUNDS=" + NUM_ROUNDS); + log.debug("NUM_ROUNDS={}", NUM_ROUNDS); } else if (path.equals("/contest/catched/catch")) { loadCatch(xmlr); @@ -472,7 +476,7 @@ else if (teams.size() > 60) { count--; try { singleDraw(); - System.out.println("Vylosovane na " + (NUM_TRIES - count)); + log.info("Vylosovane na {}", NUM_TRIES - count); break; } catch (ContestDrawException e) { @@ -485,7 +489,7 @@ else if (teams.size() > 60) { } private void singleDraw() throws ContestDrawException { - System.out.println("singleDraw"); + log.debug("singleDraw"); ArrayList realTeams = new ArrayList(); ArrayList dummyTeams = new ArrayList(); @@ -517,8 +521,8 @@ private void singleDraw() throws ContestDrawException { int dummy = realTeams.size() - numDummies + i; int real = realTeams.size() - realTeams.size() / (NUM_ROUNDS * 2) - 1 - i; - System.out.println("swapping " + dummy + " <-> " + real); - System.out.println("swapping " + realTeams.get(dummy) + " <-> " + realTeams.get(real)); + log.debug("swapping {} <-> {}", dummy, real); + log.debug("swapping {} <-> {}", realTeams.get(dummy), realTeams.get(real)); Collections.swap(realTeams, dummy, real); @@ -601,7 +605,7 @@ private void setNewPermutationAsTeams(Team[] perm) throws ContestDrawException { teams = new ArrayList(perm.length); - System.out.println("Before sitting order"); + log.debug("Before sitting order"); for (int teamIndex = 0; teamIndex < perm.length; teamIndex++) { Team t = perm[teamIndex]; teams.add(t); @@ -609,9 +613,7 @@ private void setNewPermutationAsTeams(Team[] perm) throws ContestDrawException { createPlan(t, teamIndex); - //System.out.println(t.getPlanAsText()); - System.out.println(t); - + log.debug("{}", t); } @@ -679,8 +681,7 @@ private void assignBoats(int round, String sector) throws ContestDrawException { pf[i].getRoundPlan().get(round).setLocation(boat); pr[i].getRoundPlan().get(round).setLocation(boat); re[i].getRoundPlan().get(round).setLocation(boat); - System.out.print("R:" + round + " S:" + sector + " B:" + boat); - System.out.println(" (" + pf[i].getName() + " - " + re[i].getName() + " - " + pr[i].getName() + ")"); + log.debug("R:{} S:{} B:{} ({} - {} - {})", round, sector, boat, pf[i].getName(), re[i].getName(), pr[i].getName()); boat++; } @@ -715,7 +716,7 @@ else if (ts != null && ts.equals(sector) && role.equals("Z")) private void scrambleTeamsOnH(int round) { - System.out.println("scrambling on H " + round); + log.debug("scrambling on H {}", round); ArrayList toScramble = new ArrayList(teams.size() / NUM_ROUNDS); @@ -726,14 +727,14 @@ private void scrambleTeamsOnH(int round) { } } - System.out.println("xx shuffling"); + log.debug("xx shuffling"); Collections.shuffle(toScramble, new SecureRandom()); int location = 1; for (Team t: toScramble) { t.getRoundPlan().get(round).setLocation(location++); } - System.out.println("shuffling on H - done"); + log.debug("shuffling on H - done"); } @@ -1040,12 +1041,6 @@ else if (r.getRound() == 6) { } - /* - System.out.println("Before sort:"); - for (FinalResult fr: finalResults) - System.out.println(fr); - */ - // delete dummies from final results // and possible non-registered guys (official Slovak LRU mucha competitor) ArrayList deleted = new ArrayList(); diff --git a/fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java b/fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java index 80929bb..77ba228 100644 --- a/fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java +++ b/fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java @@ -20,6 +20,8 @@ import org.fc.data.Contest; import org.fc.entity.Catch; import org.fc.entity.Team; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.core.databinding.observable.map.IObservableMap; @@ -38,6 +40,9 @@ import org.eclipse.swt.events.ModifyEvent; public class CatchDataEntry extends Shell { + + public static final Logger log = LoggerFactory.getLogger(CatchDataEntry.class); + private DataBindingContext m_bindingContext; private Table tableTeam; private Table tableCatch; @@ -289,7 +294,7 @@ public void widgetSelected(SelectionEvent e) { r = Integer.parseInt(txtDefaultRound.getText()); } catch (Exception ex) { - System.out.println("Error in parsing round " + ex); + log.error("Error in parsing round", ex); } c.setRound(r); c.setSector(txtDefaultSector.getText()); diff --git a/fishingcontest/src/main/resources/log4j.properties b/fishingcontest/src/main/resources/log4j.properties new file mode 100644 index 0000000..c49df21 --- /dev/null +++ b/fishingcontest/src/main/resources/log4j.properties @@ -0,0 +1,11 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=DEBUG, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{DATE} [%t] %-5p %c %x - %m%n + +log4j.logger.org.fc=DEBUG \ No newline at end of file