From 417f02725b7afe9c4fc22ce33ba7341a20be46fe Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 20 Feb 2020 19:29:23 +0100 Subject: [PATCH] added log4j --- allinone/build.gradle | 10 ++++--- .../kurzweil/ComputerKurzweilApplication.java | 4 +-- .../ComputerKurzweilApplicationContext.java | 4 +-- .../ComputerKurzweilApplicationFrame.java | 4 +-- ...ComputerKurzweilApplicationTabbedPane.java | 5 ++-- .../ComputerKurzweilProperties.java | 4 +-- .../kurzweil/commons/tabs/TabPanel.java | 4 +-- .../computer/kurzweil/model/Bounds.java | 4 +-- .../kurzweil/model/LatticeNeighbourhood.java | 4 +-- .../computer/kurzweil/model/LatticePoint.java | 4 +-- .../cca/CyclicCellularAutomatonButtons.java | 8 +++--- .../cca/CyclicCellularAutomatonCanvas.java | 26 +++++++++---------- .../cca/CyclicCellularAutomatonContext.java | 4 +-- .../CyclicCellularAutomatonController.java | 4 +-- .../tabs/cca/CyclicCellularAutomatonTab.java | 4 +-- .../DiffusionLimitedAggregationCanvas.java | 4 +-- .../DiffusionLimitedAggregationContext.java | 5 ++-- ...DiffusionLimitedAggregationController.java | 4 +-- .../dla/DiffusionLimitedAggregationTab.java | 5 ++-- .../evolution/SimulatedEvolutionCanvas.java | 4 +-- .../SimulatedEvolutionCanvasStatistics.java | 4 +-- .../evolution/SimulatedEvolutionContext.java | 5 ++-- .../SimulatedEvolutionController.java | 4 +-- .../tabs/evolution/SimulatedEvolutionTab.java | 4 +-- .../evolution/SimulatedEvolutionWorld.java | 4 +-- .../SimulatedEvolutionWorldLattice.java | 4 +-- .../food/FoodPerDayDecreaseButton.java | 4 +-- .../food/FoodPerDayIncreaseButton.java | 4 +-- .../tabs/evolution/food/FoodPerDayLabel.java | 4 +-- .../tabs/evolution/food/FoodPerDayPanel.java | 4 +-- .../evolution/food/FoodPerDayTextField.java | 4 +-- .../garden/GardenOfEdenCheckBox.java | 4 +-- .../evolution/garden/GardenOfEdenPanel.java | 4 +-- .../garden/GardenOfEdenPanelRow.java | 4 +-- .../garden/GardenOfEdenToggleButton.java | 4 +-- .../population/PopulationStatistics.java | 4 +-- .../PopulationStatisticsElement.java | 4 +-- .../SimulatedEvolutionPopulationCensus.java | 4 +-- .../kurzweil/tabs/mandelbrot/Mandelbrot.java | 5 ++-- .../tabs/mandelbrot/MandelbrotButtons.java | 4 +-- .../tabs/mandelbrot/MandelbrotCanvas.java | 5 ++-- .../tabs/mandelbrot/MandelbrotContext.java | 5 ++-- .../tabs/mandelbrot/MandelbrotController.java | 4 +-- .../tabs/mandelbrot/MandelbrotTab.java | 4 +-- .../fractal/GaussianNumberPlaneBaseJulia.java | 4 +-- .../GaussianNumberPlaneMandelbrot.java | 4 +-- .../model/turing/TuringPhaseStateMachine.java | 4 +-- .../turing/TuringPositionsStateMachine.java | 4 +-- .../mandelbrot/widgets/PanelButtonsGroup.java | 1 - .../mandelbrot/widgets/PanelZoomButtons.java | 7 ++--- .../tabs/randomwalk/WienerProcessButtons.java | 4 +-- .../tabs/randomwalk/WienerProcessCanvas.java | 4 +-- .../tabs/randomwalk/WienerProcessContext.java | 5 ++-- .../randomwalk/WienerProcessController.java | 5 ++-- .../tabs/randomwalk/WienerProcessTab.java | 4 +-- .../kurzweil/widgets/BottomButtonsPanel.java | 4 +-- .../kurzweil/widgets/PanelCopyright.java | 4 +-- .../kurzweil/widgets/PanelSubtitle.java | 4 +-- .../computer/kurzweil/widgets/PanelTitle.java | 4 +-- .../widgets/StartStopButtonsPanel.java | 4 +-- allinone/src/main/resources/log4j.xml | 13 ++++++++++ 61 files changed, 149 insertions(+), 145 deletions(-) create mode 100644 allinone/src/main/resources/log4j.xml diff --git a/allinone/build.gradle b/allinone/build.gradle index ab4bafd3..30c62708 100644 --- a/allinone/build.gradle +++ b/allinone/build.gradle @@ -59,7 +59,8 @@ test { ext { jacksonDatabindVersion = '2.9.8' //2.9.8,2.10.2 lombokVersion = '1.18.12' - log4jVersion = '2.13.0' + log4j2Version = '2.13.0' + log4j12Version = '1.2.17' } dependencies { @@ -81,8 +82,11 @@ dependencies { implementation 'org.yaml:snakeyaml:1.17' implementation 'com.google.guava:guava:28.0-jre' implementation 'javax.validation:validation-api:2.0.1.Final' - implementation 'org.apache.logging.log4j:log4j:'+log4jVersion - implementation 'org.apache.logging.log4j:log4j-core:'+log4jVersion + implementation 'org.apache.logging.log4j:log4j:'+log4j2Version + implementation 'org.apache.logging.log4j:log4j-core:'+log4j2Version + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:'+log4j2Version + implementation 'org.apache.logging.log4j:log4j-api:'+log4j2Version + implementation 'org.apache.logging.log4j:log4j-jcl:'+log4j2Version testImplementation("junit:junit:4.13") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.6.0") testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0' diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/ComputerKurzweilApplication.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/ComputerKurzweilApplication.java index eac7fd20..c3a54720 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/ComputerKurzweilApplication.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/ComputerKurzweilApplication.java @@ -1,6 +1,6 @@ package org.woehlke.computer.kurzweil; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationFrame; import org.woehlke.computer.kurzweil.application.ComputerKurzweilProperties; import org.woehlke.computer.kurzweil.commons.Startable; @@ -26,7 +26,7 @@ *

* © 2006 - 2008 Thomas Woehlke. */ -@Log +@Log4j2 public class ComputerKurzweilApplication implements Startable { private final ComputerKurzweilApplicationFrame frame; diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationContext.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationContext.java index 5aae8871..0fe7a3b1 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationContext.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationContext.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.Startable; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.tabs.evolution.cell.CellCore; @@ -15,7 +15,7 @@ import java.util.Date; import java.util.Random; -@Log +@Log4j2 @Getter @ToString(exclude={"random","frame"},callSuper=true) public class ComputerKurzweilApplicationContext implements Startable { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationFrame.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationFrame.java index 0b382890..374c14e4 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationFrame.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationFrame.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabPanel; import org.woehlke.computer.kurzweil.widgets.layouts.BoxLayoutVertical; import org.woehlke.computer.kurzweil.commons.Startable; @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.List; -@Log +@Log4j2 @Getter @ToString(callSuper=true) public class ComputerKurzweilApplicationFrame extends JFrame implements Serializable, diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationTabbedPane.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationTabbedPane.java index d7083616..036b32f8 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationTabbedPane.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilApplicationTabbedPane.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import org.woehlke.computer.kurzweil.commons.Startable; import org.woehlke.computer.kurzweil.tabs.cca.CyclicCellularAutomatonTab; @@ -15,14 +15,13 @@ import org.woehlke.computer.kurzweil.tabs.randomwalk.WienerProcessTab; import javax.swing.*; -import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import java.awt.*; import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.List; -@Log +@Log4j2 @Getter @ToString(exclude={"ctx","apps","border"},callSuper=true) @EqualsAndHashCode(callSuper=true) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilProperties.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilProperties.java index 3fd702db..49a744d6 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilProperties.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/application/ComputerKurzweilProperties.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import lombok.*; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.TabType; import javax.validation.Valid; @@ -13,7 +13,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -@Log +@Log4j2 @ToString @EqualsAndHashCode @NoArgsConstructor diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/commons/tabs/TabPanel.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/commons/tabs/TabPanel.java index 11954f8c..d9c07567 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/commons/tabs/TabPanel.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/commons/tabs/TabPanel.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationTabbedPane; import org.woehlke.computer.kurzweil.tabs.TabType; @@ -13,7 +13,7 @@ import javax.swing.*; import javax.swing.border.Border; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"ctx","tabbedPane","border","layout","panelSubtitle"}) @EqualsAndHashCode(callSuper=true, exclude = {"ctx","tabbedPane","border","layout","panelSubtitle"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/model/Bounds.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/model/Bounds.java index dcdb30dd..76643b59 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/model/Bounds.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/model/Bounds.java @@ -1,13 +1,13 @@ package org.woehlke.computer.kurzweil.model; import lombok.*; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import javax.swing.*; import java.awt.*; import java.io.Serializable; -@Log +@Log4j2 @Getter @ToString @AllArgsConstructor diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticeNeighbourhood.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticeNeighbourhood.java index 1c7b8ab6..4bf71af7 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticeNeighbourhood.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticeNeighbourhood.java @@ -3,9 +3,9 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; -@Log +@Log4j2 @Getter @ToString @EqualsAndHashCode diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticePoint.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticePoint.java index 8028b6e4..88570bb9 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticePoint.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/model/LatticePoint.java @@ -1,7 +1,7 @@ package org.woehlke.computer.kurzweil.model; import lombok.*; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; /** * A Point is used to define the Position of Cell or as a Vector for defining Dimensions. @@ -16,7 +16,7 @@ * Date: 04.02.2006 * Time: 23:47:05 */ -@Log +@Log4j2 @Getter @Setter @ToString diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonButtons.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonButtons.java index d67a256a..e4129bbb 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonButtons.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonButtons.java @@ -3,14 +3,14 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import javax.swing.*; import javax.swing.border.CompoundBorder; import java.awt.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"buttonVonNeumann","buttonMoore","buttonWoehlke"}) @EqualsAndHashCode(callSuper=true, exclude = {"buttonVonNeumann","buttonMoore","buttonWoehlke"}) @@ -50,9 +50,7 @@ public CyclicCellularAutomatonButtons( @Override public void showMe() { - log.info("showMe"); - this.setVisible(true); - repaint(); + //log.info("showMe"); } } diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonCanvas.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonCanvas.java index 1ccda223..f1ce1df6 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonCanvas.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonCanvas.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabCanvas; import org.woehlke.computer.kurzweil.commons.tabs.TabModel; import org.woehlke.computer.kurzweil.model.LatticeNeighbourhoodType; @@ -30,7 +30,7 @@ * Date: 05.02.2006 * Time: 00:51:51 */ -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx","border","preferredSize","layout","colorScheme","lattice"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx","border","preferredSize","layout","colorScheme","lattice"}) @@ -103,24 +103,24 @@ public void update(Graphics g) { @Override public void showMe() { - //log.info("showMe "+this.toString()); + log.info("showMe "+this.toString()); } public void start() { - //log.info("start"); + log.info("start"); showMe(); synchronized (running) { running = Boolean.TRUE; } - //log.info("started "+this.toString()); + log.info("started "+this.toString()); } public void stop() { - //log.info("stop"); + log.info("stop"); synchronized (running) { running = Boolean.FALSE; } - //log.info("stopped "+this.toString()); + log.info("stopped "+this.toString()); } public void update(){ @@ -163,15 +163,15 @@ public void step(){ } private void initCreateLattice(){ - //log.info("initCreateLattice start: "+neighbourhoodType.name()); + log.info("initCreateLattice start: "+neighbourhoodType.name()); lattice = new int[versions][worldX][worldY]; source = 0; target = 1; - //log.info("initCreateLattice finished: "+neighbourhoodType.name()); + log.info("initCreateLattice finished: "+neighbourhoodType.name()); } private void initFillLattice(){ - //log.info("initCreateLattice start: "+neighbourhoodType.name()); + log.info("initCreateLattice start: "+neighbourhoodType.name()); Random random = this.tabCtx.getCtx().getRandom(); int maxState = this.colorScheme.getMaxState(); int y; @@ -181,7 +181,7 @@ private void initFillLattice(){ lattice[source][x][y] = random.nextInt(maxState); } } - //log.info("initCreateLattice finished: "+neighbourhoodType.name()); + log.info("initCreateLattice finished: "+neighbourhoodType.name()); } public void resetLattice(){ @@ -190,20 +190,18 @@ public void resetLattice(){ } public void startWithNeighbourhoodVonNeumann() { - /* if( this.neighbourhoodType == null) { log.info("startWithNeighbourhoodVonNeumann"); } else { log.info("startWithNeighbourhoodVonNeumann: " + neighbourhoodType.name()); } - */ this.neighbourhoodType=VON_NEUMANN_NEIGHBORHOOD; resetLattice(); log.info("startWithNeighbourhoodVonNeumann started: "+neighbourhoodType.name()); } public void startWithNeighbourhoodMoore() { - //log.info("startWithNeighbourhoodVonNeumann: "+neighbourhoodType.name()); + log.info("startWithNeighbourhoodVonNeumann: "+neighbourhoodType.name()); this.neighbourhoodType=MOORE_NEIGHBORHOOD; resetLattice(); log.info("startWithNeighbourhoodVonNeumann started: "+neighbourhoodType.name()); diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonContext.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonContext.java index 1c41f777..8589d052 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonContext.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonContext.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.tabs.TabType; import org.woehlke.computer.kurzweil.commons.tabs.TabContext; @@ -11,7 +11,7 @@ import static java.lang.Thread.State.NEW; import static org.woehlke.computer.kurzweil.tabs.TabType.CYCLIC_CELLULAR_AUTOMATON; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tab"}) @EqualsAndHashCode(exclude = {"tab"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonController.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonController.java index 7a1e6e69..b34a1c57 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonController.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonController.java @@ -1,7 +1,7 @@ package org.woehlke.computer.kurzweil.tabs.cca; import lombok.Getter; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.commons.tabs.TabController; @@ -15,7 +15,7 @@ * Date: 05.02.2006 * Time: 00:36:20 */ -@Log +@Log4j2 @Getter public class CyclicCellularAutomatonController extends Thread implements TabController { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonTab.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonTab.java index 86f50d28..0d70432b 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonTab.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/cca/CyclicCellularAutomatonTab.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationTabbedPane; import org.woehlke.computer.kurzweil.tabs.TabType; import org.woehlke.computer.kurzweil.commons.tabs.TabPanel; @@ -13,7 +13,7 @@ import java.awt.event.ActionEvent; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationCanvas.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationCanvas.java index e4337b62..ab9b5cf6 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationCanvas.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationCanvas.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabCanvas; import org.woehlke.computer.kurzweil.commons.tabs.TabModel; import org.woehlke.computer.kurzweil.model.LatticeNeighbourhood; @@ -28,7 +28,7 @@ * Date: 05.02.2006 * Time: 00:51:51 */ -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx","border","preferredSize","layout","particles"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx","border","preferredSize","layout","particles"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationContext.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationContext.java index 94e71a76..dcdf0756 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationContext.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationContext.java @@ -3,18 +3,17 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabModel; import org.woehlke.computer.kurzweil.tabs.TabType; import org.woehlke.computer.kurzweil.commons.tabs.TabContext; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; -import org.woehlke.computer.kurzweil.tabs.cca.CyclicCellularAutomatonController; import static java.lang.Thread.State.NEW; import static org.woehlke.computer.kurzweil.tabs.TabType.DIFFUSION_LIMITED_AGGREGATION; -@Log +@Log4j2 @Getter @ToString(exclude={"canvas","controller","tab","ctx"}) @EqualsAndHashCode(exclude={"canvas","controller","tab","ctx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationController.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationController.java index ea73ff0e..fdb35773 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationController.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationController.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabController; /** @@ -16,7 +16,7 @@ * Date: 05.02.2006 * Time: 00:36:20 */ -@Log +@Log4j2 @Getter @ToString(callSuper=true,exclude={"tabCtx"}) @EqualsAndHashCode(callSuper=true,exclude={"tabCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationTab.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationTab.java index bcf3cad5..9a0bebfc 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationTab.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/dla/DiffusionLimitedAggregationTab.java @@ -3,8 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; -import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationTabbedPane; import org.woehlke.computer.kurzweil.commons.tabs.TabPanel; import org.woehlke.computer.kurzweil.tabs.TabType; @@ -12,7 +11,7 @@ import org.woehlke.computer.kurzweil.commons.tabs.Tab; import java.awt.event.ActionEvent; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx","canvas"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx","canvas"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvas.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvas.java index 76ed6cd1..4cd1ca17 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvas.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvas.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.Startable; import org.woehlke.computer.kurzweil.model.LatticeNeighbourhood; import org.woehlke.computer.kurzweil.tabs.evolution.cell.Cell; @@ -37,7 +37,7 @@ * Date: 05.02.2006 * Time: 00:51:51 */ -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude={"tabCtx","border","preferredSize","layout","tab"}) @EqualsAndHashCode(callSuper=true, exclude={"tabCtx","border","preferredSize","layout","tab"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvasStatistics.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvasStatistics.java index 4af634ae..6be08e90 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvasStatistics.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionCanvasStatistics.java @@ -3,12 +3,12 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.population.SimulatedEvolutionPopulationCensus; import java.util.concurrent.ConcurrentLinkedQueue; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude={"tabCtx","statistics"}) @EqualsAndHashCode(exclude={"tabCtx","statistics"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionContext.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionContext.java index 8c8137b5..c0aa3c27 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionContext.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionContext.java @@ -4,16 +4,15 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.TabType; import org.woehlke.computer.kurzweil.commons.tabs.TabContext; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; -import org.woehlke.computer.kurzweil.tabs.dla.DiffusionLimitedAggregationController; import static java.lang.Thread.State.NEW; import static org.woehlke.computer.kurzweil.tabs.TabType.SIMULATED_EVOLUTION; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude={"ctx","controller","tab"}) @EqualsAndHashCode(exclude={"ctx","controller","tab"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionController.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionController.java index 98cb10db..2cb3570e 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionController.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionController.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabController; @@ -20,7 +20,7 @@ * Date: 05.02.2006 * Time: 00:36:20 */ -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude={"tabCtx"}) @EqualsAndHashCode(callSuper = true, exclude={"tabCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionTab.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionTab.java index 2fc8c7ca..00a07be2 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionTab.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionTab.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationTabbedPane; import org.woehlke.computer.kurzweil.commons.tabs.TabPanel; import org.woehlke.computer.kurzweil.tabs.TabType; @@ -15,7 +15,7 @@ import java.awt.event.ActionEvent; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorld.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorld.java index 90e94352..3e2a8ae2 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorld.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorld.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabModel; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.commons.Startable; @@ -31,7 +31,7 @@ * © 2006 - 2008 Thomas Woehlke. * http://thomas-woehlke.de/p/simulated-evolution/ */ -@Log +@Log4j2 @Getter @ToString(exclude={"cells","appCtx"}) @EqualsAndHashCode(exclude={"cells","appCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorldLattice.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorldLattice.java index 6d57d057..3312d7a7 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorldLattice.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/SimulatedEvolutionWorldLattice.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.model.LatticeNeighbourhood; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.commons.Startable; @@ -23,7 +23,7 @@ * Date: 24.08.13 * Time: 12:37 */ -@Log +@Log4j2 @Getter @ToString(exclude={"appCtx","worldMapFoodLattice"}) @EqualsAndHashCode(exclude={"appCtx","worldMapFoodLattice"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayDecreaseButton.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayDecreaseButton.java index 7c977fb8..b8f189e7 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayDecreaseButton.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayDecreaseButton.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class FoodPerDayDecreaseButton extends JButton { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayIncreaseButton.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayIncreaseButton.java index 696ccb07..505848f7 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayIncreaseButton.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayIncreaseButton.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class FoodPerDayIncreaseButton extends JButton { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayLabel.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayLabel.java index ed4e0494..499c227f 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayLabel.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayLabel.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class FoodPerDayLabel extends JLabel { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayPanel.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayPanel.java index b3383143..04aea731 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayPanel.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayPanel.java @@ -2,14 +2,14 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; import javax.swing.border.CompoundBorder; import java.awt.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class FoodPerDayPanel extends JPanel { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayTextField.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayTextField.java index e126b49b..2831a1f9 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayTextField.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/food/FoodPerDayTextField.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class FoodPerDayTextField extends JTextField { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenCheckBox.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenCheckBox.java index f890659b..e02164ea 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenCheckBox.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenCheckBox.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class GardenOfEdenCheckBox extends JCheckBox { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanel.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanel.java index bf92ae6f..60416fe0 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanel.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanel.java @@ -2,14 +2,14 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; import javax.swing.border.CompoundBorder; import java.awt.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class GardenOfEdenPanel extends JPanel { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanelRow.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanelRow.java index 518fc9b4..774a535a 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanelRow.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenPanelRow.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class GardenOfEdenPanelRow extends JPanel { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenToggleButton.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenToggleButton.java index 12db031d..4e31febb 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenToggleButton.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/garden/GardenOfEdenToggleButton.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class GardenOfEdenToggleButton extends JToggleButton { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatistics.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatistics.java index 583f2599..f77b83ad 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatistics.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatistics.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilProperties; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionContext; import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionCanvasStatistics; @@ -16,7 +16,7 @@ import static org.woehlke.computer.kurzweil.tabs.evolution.cell.CellLifeCycleStatus.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true,exclude = {"tabCtx","border","layout","layoutSubPanel"}) @EqualsAndHashCode(callSuper=true,exclude = {"tabCtx","border","layout","layoutSubPanel"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatisticsElement.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatisticsElement.java index a3229e69..70c93bff 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatisticsElement.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/PopulationStatisticsElement.java @@ -2,12 +2,12 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.cell.CellLifeCycleStatus; import javax.swing.*; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class PopulationStatisticsElement extends JPanel { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/SimulatedEvolutionPopulationCensus.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/SimulatedEvolutionPopulationCensus.java index ff79ec51..2181deeb 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/SimulatedEvolutionPopulationCensus.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/evolution/population/SimulatedEvolutionPopulationCensus.java @@ -1,10 +1,10 @@ package org.woehlke.computer.kurzweil.tabs.evolution.population; import lombok.*; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.evolution.cell.CellLifeCycleStatus; -@Log +@Log4j2 @ToString @EqualsAndHashCode @AllArgsConstructor diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/Mandelbrot.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/Mandelbrot.java index a57a8a42..17ad0586 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/Mandelbrot.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/Mandelbrot.java @@ -4,14 +4,13 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.fractal.GaussianNumberPlaneBaseJulia; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.fractal.GaussianNumberPlaneMandelbrot; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.turing.TuringPhaseStateMachine; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.turing.TuringPositionsStateMachine; import org.woehlke.computer.kurzweil.commons.Startable; import org.woehlke.computer.kurzweil.commons.tabs.TabModel; -import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.state.ApplicationState; import static org.woehlke.computer.kurzweil.tabs.mandelbrot.model.state.ApplicationState.*; @@ -25,7 +24,7 @@ * * Created by tw on 16.12.2019. */ -@Log +@Log4j2 @Getter @ToString(callSuper = true) @EqualsAndHashCode diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotButtons.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotButtons.java index bab18248..b7b001c2 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotButtons.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotButtons.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.Setter; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.mandelbrot.widgets.PanelButtonsGroup; import org.woehlke.computer.kurzweil.tabs.mandelbrot.widgets.PanelZoomButtons; @@ -19,7 +19,7 @@ * * Created by tw on 16.12.2019. */ -@Log +@Log4j2 @Getter public class MandelbrotButtons extends JPanel { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotCanvas.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotCanvas.java index e6edc4e7..4319bc27 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotCanvas.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotCanvas.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabCanvas; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.fractal.GaussianNumberPlaneBaseJulia; @@ -13,7 +13,6 @@ import javax.swing.*; import javax.swing.border.Border; -import javax.swing.border.CompoundBorder; import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -29,7 +28,7 @@ * Date: 05.02.2006 * Time: 00:51:51 */ -@Log +@Log4j2 @Getter @ToString(callSuper = true,exclude={"tabCtx","border","preferredSize","layout","gaussianNumberPlaneBaseJulia","gaussianNumberPlaneMandelbrot"}) @EqualsAndHashCode(callSuper=true,exclude={"tabCtx","border","preferredSize","layout","gaussianNumberPlaneBaseJulia","gaussianNumberPlaneMandelbrot"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotContext.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotContext.java index cd6612f1..a77a0516 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotContext.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotContext.java @@ -2,17 +2,16 @@ import lombok.Getter; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.tabs.TabType; import org.woehlke.computer.kurzweil.commons.tabs.TabContext; -import org.woehlke.computer.kurzweil.tabs.evolution.SimulatedEvolutionController; import static java.lang.Thread.State.NEW; import static org.woehlke.computer.kurzweil.tabs.TabType.MANDELBROT_SET; -@Log +@Log4j2 @Getter public class MandelbrotContext implements TabContext { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotController.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotController.java index 88c8c6c8..adce5810 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotController.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotController.java @@ -1,10 +1,10 @@ package org.woehlke.computer.kurzweil.tabs.mandelbrot; import lombok.Getter; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabController; -@Log +@Log4j2 @Getter public class MandelbrotController extends Thread implements Runnable, TabController { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotTab.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotTab.java index 00d39e5b..81ff1271 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotTab.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/MandelbrotTab.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationTabbedPane; import org.woehlke.computer.kurzweil.commons.tabs.TabPanel; import org.woehlke.computer.kurzweil.commons.tabs.Tab; @@ -12,7 +12,7 @@ import java.awt.event.ActionEvent; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneBaseJulia.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneBaseJulia.java index 8d9984a3..fc72c933 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneBaseJulia.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneBaseJulia.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.tabs.mandelbrot.MandelbrotContext; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.state.FractalSetType; @@ -16,7 +16,7 @@ import static org.woehlke.computer.kurzweil.tabs.mandelbrot.model.numbers.ComputingPlan.startWorldDimension; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class GaussianNumberPlaneBaseJulia extends GaussianNumberPlaneBase { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneMandelbrot.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneMandelbrot.java index e7ced4c5..9ca732ea 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneMandelbrot.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/fractal/GaussianNumberPlaneMandelbrot.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.tabs.mandelbrot.MandelbrotContext; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.state.FractalSetType; @@ -14,7 +14,7 @@ import static org.woehlke.computer.kurzweil.tabs.mandelbrot.model.numbers.ComputingPlan.startCenterForMandelbrot; import static org.woehlke.computer.kurzweil.tabs.mandelbrot.model.numbers.ComputingPlan.startWorldDimension; -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class GaussianNumberPlaneMandelbrot extends GaussianNumberPlaneBase { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPhaseStateMachine.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPhaseStateMachine.java index 72e1a9f3..61e8d993 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPhaseStateMachine.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPhaseStateMachine.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.state.TuringPhase; import org.woehlke.computer.kurzweil.commons.Startable; @@ -15,7 +15,7 @@ * * Created by tw on 16.12.2019. */ -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class TuringPhaseStateMachine implements Startable { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPositionsStateMachine.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPositionsStateMachine.java index 07f35947..411af3ae 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPositionsStateMachine.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/model/turing/TuringPositionsStateMachine.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.model.LatticePoint; import org.woehlke.computer.kurzweil.tabs.mandelbrot.MandelbrotContext; import org.woehlke.computer.kurzweil.tabs.mandelbrot.model.state.TuringDirection; @@ -17,7 +17,7 @@ * * Created by tw on 16.12.2019. */ -@Log +@Log4j2 @Getter @ToString(callSuper = true) public class TuringPositionsStateMachine implements Startable { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelButtonsGroup.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelButtonsGroup.java index 367eb2b7..bd88d45b 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelButtonsGroup.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelButtonsGroup.java @@ -1,7 +1,6 @@ package org.woehlke.computer.kurzweil.tabs.mandelbrot.widgets; import lombok.Getter; -import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.tabs.mandelbrot.MandelbrotContext; import javax.swing.*; diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelZoomButtons.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelZoomButtons.java index a8381862..99b4f1d6 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelZoomButtons.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/mandelbrot/widgets/PanelZoomButtons.java @@ -7,13 +7,14 @@ import javax.swing.border.CompoundBorder; import java.awt.*; +@Getter public class PanelZoomButtons extends JPanel { private final MandelbrotContext tabCtx; - @Getter private final JLabel zoomLevelFieldLabel; - @Getter private final TextField zoomLevelField; - @Getter private final JButton zoomOutButton; + private final JLabel zoomLevelFieldLabel; + private final TextField zoomLevelField; + private final JButton zoomOutButton; public PanelZoomButtons(MandelbrotContext tabCtx) { this.tabCtx = tabCtx; diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessButtons.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessButtons.java index fb8d0844..c0ae7a29 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessButtons.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessButtons.java @@ -3,7 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import javax.swing.*; @@ -12,7 +12,7 @@ import static org.woehlke.computer.kurzweil.tabs.TabType.RANDOM_WALK_WIENER_PROCESS; -@Log +@Log4j2 @Getter @ToString(callSuper = true) @EqualsAndHashCode(callSuper=true) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessCanvas.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessCanvas.java index b4b39734..e93098ce 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessCanvas.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessCanvas.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabCanvas; import org.woehlke.computer.kurzweil.commons.tabs.TabModel; import org.woehlke.computer.kurzweil.model.LatticePoint; @@ -25,7 +25,7 @@ * Date: 05.02.2006 * Time: 00:51:51 */ -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx","border","preferredSize","layout","colorScheme","lattice"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx","border","preferredSize","layout","colorScheme","lattice"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessContext.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessContext.java index 26ff280a..3e3bd42f 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessContext.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessContext.java @@ -3,16 +3,15 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.commons.tabs.TabContext; import org.woehlke.computer.kurzweil.tabs.TabType; import static java.lang.Thread.State.NEW; -import static org.woehlke.computer.kurzweil.tabs.TabType.CYCLIC_CELLULAR_AUTOMATON; import static org.woehlke.computer.kurzweil.tabs.TabType.RANDOM_WALK_WIENER_PROCESS; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tab"}) @EqualsAndHashCode(exclude = {"tab"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessController.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessController.java index d069013f..d3cc7b69 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessController.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessController.java @@ -1,8 +1,7 @@ package org.woehlke.computer.kurzweil.tabs.randomwalk; import lombok.Getter; -import lombok.extern.java.Log; -import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.tabs.TabController; /** @@ -15,7 +14,7 @@ * Date: 05.02.2006 * Time: 00:36:20 */ -@Log +@Log4j2 @Getter public class WienerProcessController extends Thread implements TabController { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessTab.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessTab.java index 6f0b1a1c..c8027800 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessTab.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/tabs/randomwalk/WienerProcessTab.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationTabbedPane; import org.woehlke.computer.kurzweil.commons.tabs.Tab; import org.woehlke.computer.kurzweil.commons.tabs.TabPanel; @@ -13,7 +13,7 @@ import java.awt.event.ActionEvent; -@Log +@Log4j2 @Getter @ToString(callSuper = true, exclude = {"tabCtx"}) @EqualsAndHashCode(callSuper=true, exclude = {"tabCtx"}) diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/BottomButtonsPanel.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/BottomButtonsPanel.java index d0aa6044..34d96943 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/BottomButtonsPanel.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/BottomButtonsPanel.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import org.woehlke.computer.kurzweil.commons.Startable; import org.woehlke.computer.kurzweil.commons.tabs.Tab; @@ -11,7 +11,7 @@ import javax.swing.*; import javax.swing.border.CompoundBorder; -@Log +@Log4j2 @Getter @ToString(exclude={"borderBottomButtonsPanel","layoutBottomButtonsPanel"}) public class BottomButtonsPanel extends JPanel implements Startable, GuiComponentTab { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelCopyright.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelCopyright.java index 47aa695c..d507d5f6 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelCopyright.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelCopyright.java @@ -2,7 +2,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import org.woehlke.computer.kurzweil.widgets.layouts.CenterFlowLayout; @@ -10,7 +10,7 @@ import javax.swing.*; -@Log +@Log4j2 @ToString @EqualsAndHashCode(callSuper=true) public class PanelCopyright extends JPanel implements GuiComponentTab { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelSubtitle.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelSubtitle.java index c61fd8e5..61e0a8e3 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelSubtitle.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelSubtitle.java @@ -2,7 +2,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import org.woehlke.computer.kurzweil.widgets.layouts.CenterFlowLayout; @@ -10,7 +10,7 @@ import javax.swing.*; -@Log +@Log4j2 @ToString @EqualsAndHashCode(callSuper=true) public class PanelSubtitle extends JPanel implements GuiComponentTab { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelTitle.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelTitle.java index 36a19f47..d0dda6ec 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelTitle.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/PanelTitle.java @@ -3,14 +3,14 @@ import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.application.ComputerKurzweilApplicationContext; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import org.woehlke.computer.kurzweil.widgets.layouts.CenterFlowLayout; import javax.swing.*; -@Log +@Log4j2 @ToString @EqualsAndHashCode(callSuper=true) public class PanelTitle extends JPanel implements GuiComponentTab { diff --git a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/StartStopButtonsPanel.java b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/StartStopButtonsPanel.java index 85d3fd56..89579123 100644 --- a/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/StartStopButtonsPanel.java +++ b/allinone/src/main/java/org/woehlke/computer/kurzweil/widgets/StartStopButtonsPanel.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.ToString; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; import org.woehlke.computer.kurzweil.commons.GuiComponentTab; import org.woehlke.computer.kurzweil.commons.Startable; import org.woehlke.computer.kurzweil.commons.tabs.Tab; @@ -11,7 +11,7 @@ import javax.swing.*; import javax.swing.border.CompoundBorder; -@Log +@Log4j2 @Getter @ToString(exclude={"border","layout","startButton","stopButton"}) public class StartStopButtonsPanel extends JPanel implements Startable, GuiComponentTab { diff --git a/allinone/src/main/resources/log4j.xml b/allinone/src/main/resources/log4j.xml new file mode 100644 index 00000000..9f905c97 --- /dev/null +++ b/allinone/src/main/resources/log4j.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + +