Skip to content

Commit

Permalink
Adding SLF4J support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pskopek
pskopek committed Oct 8, 2014
1 parent 4cdae76 commit 24dea94
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 27 deletions.
10 changes: 5 additions & 5 deletions fishingcontest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<artifactId>jasperreports</artifactId>
<version>3.7.2</version>
</dependency>
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
Expand Down
37 changes: 16 additions & 21 deletions fishingcontest/src/main/java/org/fc/data/Contest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@
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
*
*/
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";
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand All @@ -485,7 +489,7 @@ else if (teams.size() > 60) {
}

private void singleDraw() throws ContestDrawException {
System.out.println("singleDraw");
log.debug("singleDraw");

ArrayList<Team> realTeams = new ArrayList<Team>();
ArrayList<Team> dummyTeams = new ArrayList<Team>();
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -601,17 +605,15 @@ private void setNewPermutationAsTeams(Team[] perm) throws ContestDrawException {

teams = new ArrayList<Team>(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);
t.setId((long)teamIndex + 1);

createPlan(t, teamIndex);

//System.out.println(t.getPlanAsText());
System.out.println(t);

log.debug("{}", t);
}


Expand Down Expand Up @@ -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++;
}

Expand Down Expand Up @@ -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<Team> toScramble = new ArrayList<Team>(teams.size() / NUM_ROUNDS);

Expand All @@ -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");
}


Expand Down Expand Up @@ -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<FinalResult> deleted = new ArrayList<FinalResult>();
Expand Down
7 changes: 6 additions & 1 deletion fishingcontest/src/main/java/org/fc/ui/app/CatchDataEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
11 changes: 11 additions & 0 deletions fishingcontest/src/main/resources/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 24dea94

Please sign in to comment.