Skip to content
Snippets Groups Projects
Commit 1a7a7846 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

Bensikin uses common logging UI (fr.soleil.lib.project.application.logging.LogManager)

parent a9492e15
No related branches found
No related tags found
No related merge requests found
...@@ -75,6 +75,7 @@ import fr.soleil.bensikin.options.Options; ...@@ -75,6 +75,7 @@ import fr.soleil.bensikin.options.Options;
import fr.soleil.bensikin.options.manager.IOptionsManager; import fr.soleil.bensikin.options.manager.IOptionsManager;
import fr.soleil.bensikin.options.manager.OptionsManagerFactory; import fr.soleil.bensikin.options.manager.OptionsManagerFactory;
import fr.soleil.bensikin.tools.Messages; import fr.soleil.bensikin.tools.Messages;
import fr.soleil.comete.swing.image.ImageJManager;
import fr.soleil.lib.project.application.user.manager.AccountManager; import fr.soleil.lib.project.application.user.manager.AccountManager;
import fr.soleil.lib.project.swing.Splash; import fr.soleil.lib.project.swing.Splash;
...@@ -86,6 +87,7 @@ import fr.soleil.lib.project.swing.Splash; ...@@ -86,6 +87,7 @@ import fr.soleil.lib.project.swing.Splash;
public class Bensikin { public class Bensikin {
private final static Logger LOGGER = LoggerFactory.getLogger(Bensikin.class); private final static Logger LOGGER = LoggerFactory.getLogger(Bensikin.class);
public static final String DEFAULT_LOG_ID = ImageJManager.generateApplicationId(Bensikin.class.getName());
private static String pathToResources; private static String pathToResources;
private static boolean hires; private static boolean hires;
......
...@@ -33,31 +33,27 @@ ...@@ -33,31 +33,27 @@
package fr.soleil.bensikin.containers; package fr.soleil.bensikin.containers;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.Rectangle;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSplitPane; import javax.swing.JSplitPane;
import javax.swing.JViewport;
import javax.swing.ScrollPaneConstants;
import fr.soleil.archiving.gui.messages.MessagesPanel;
import fr.soleil.bensikin.Bensikin; import fr.soleil.bensikin.Bensikin;
import fr.soleil.bensikin.components.BensikinToolbar; import fr.soleil.bensikin.components.BensikinToolbar;
import fr.soleil.bensikin.containers.context.ContextPanel; import fr.soleil.bensikin.containers.context.ContextPanel;
import fr.soleil.bensikin.containers.snapshot.SnapshotPanel; import fr.soleil.bensikin.containers.snapshot.SnapshotPanel;
import fr.soleil.lib.project.application.logging.LogManager;
import fr.soleil.lib.project.application.logging.LogViewer;
/** /**
* The container directly under the top-level container. Contains everything * The container directly under the top-level container. Contains everything on screen except for popup dialogs. A
* onscreen except for popup dialogs. A singleton class. * singleton class.
* *
* @author CLAISSE * @author CLAISSE
*/ */
public class BensikinMainPanel extends JPanel { public class BensikinMainPanel extends JPanel {
private static final long serialVersionUID = -2492766171667913609L; private static final long serialVersionUID = -8285056630882222623L;
private static final int INITIAL_MESSAGE_SPLIT_POSITION_HIRES = 840; private static final int INITIAL_MESSAGE_SPLIT_POSITION_HIRES = 840;
private static final int INITIAL_CONTEXT_SPLIT_POSITION_HIRES = 540; private static final int INITIAL_CONTEXT_SPLIT_POSITION_HIRES = 540;
...@@ -78,7 +74,7 @@ public class BensikinMainPanel extends JPanel { ...@@ -78,7 +74,7 @@ public class BensikinMainPanel extends JPanel {
private static final double CONTEXT_SPLIT_RESIZE_WEIGHT = 0.5; private static final double CONTEXT_SPLIT_RESIZE_WEIGHT = 0.5;
private static BensikinMainPanel bensikinMainPanelInstance = null; private static BensikinMainPanel bensikinMainPanelInstance = null;
private final JScrollPane messageScrollPane; private final LogViewer logViewer;
/** /**
* Instantiates itself if necessary, returns the instance. * Instantiates itself if necessary, returns the instance.
...@@ -115,9 +111,8 @@ public class BensikinMainPanel extends JPanel { ...@@ -115,9 +111,8 @@ public class BensikinMainPanel extends JPanel {
messageSplit.setDividerLocation(initialMessageSplitPosition); messageSplit.setDividerLocation(initialMessageSplitPosition);
messageSplit.setTopComponent(contextSplit); messageSplit.setTopComponent(contextSplit);
messageScrollPane = new JScrollPane(MessagesPanel.getInstance()); logViewer = LogManager.getLogViewerInstance(Bensikin.DEFAULT_LOG_ID, true);
messageScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); messageSplit.setBottomComponent(logViewer);
messageSplit.setBottomComponent(messageScrollPane);
// END VERTICAL SPLIT // END VERTICAL SPLIT
// START MAIN PART // START MAIN PART
...@@ -147,15 +142,4 @@ public class BensikinMainPanel extends JPanel { ...@@ -147,15 +142,4 @@ public class BensikinMainPanel extends JPanel {
} }
} }
/**
* Scrolls down the log message area to make the latest log visible.
*/
public void scrollDownToLatestMessage() {
final JViewport viewport = messageScrollPane.getViewport();
final Point point = new Point(0, 2000);
final Dimension dim = new Dimension();
final Rectangle contentRect = new Rectangle(point, dim);
viewport.scrollRectToVisible(contentRect);
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment