Removed compile time dependency on logback.

immortius · immortius · commit 4f204c8071f9 · 2014-04-29T19:33:34.000+10:00
diff --git a/engine/build.gradle b/engine/build.gradle
@@ -99,14 +99,12 @@ dependencies {
     compile group: 'org.abego.treelayout', name: 'org.abego.treelayout.core', version: '1.0.1'
     compile group: 'com.miglayout', name: 'miglayout-core', version: '4.2'
 
-	// CrashReporter
-	compile group: 'brianbb', name: 'jpastebin', version: '1.0.0'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.13'
-	
     // Wildcard dependency to catch any libs provided with the project (remote repo preferred instead)
     compile fileTree(dir: 'libs', include: '*.jar')
 
 	// TODO: These could be moved into facade
+	compile group: 'brianbb', name: 'jpastebin', version: '1.0.0'
+	runtime group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.13'
 	runtime group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.5'
     // And here is Groovy to read the config file
     runtime group: 'org.codehaus.groovy', name: 'groovy', version: '2.1.7'
diff --git a/facades/PC/src/main/java/org/terasology/engine/CrashReporter.java b/facades/PC/src/main/java/org/terasology/engine/CrashReporter.java
@@ -16,11 +16,19 @@
 
 package org.terasology.engine;
 
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.GridLayout;
+import com.google.common.base.Joiner;
+import org.jpaste.exceptions.PasteException;
+import org.jpaste.pastebin.PasteExpireDate;
+import org.jpaste.pastebin.Pastebin;
+import org.jpaste.pastebin.PastebinLink;
+import org.jpaste.pastebin.PastebinPaste;
+import org.terasology.engine.paths.PathManager;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -33,46 +41,12 @@
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.LookAndFeel;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.jpaste.exceptions.PasteException;
-import org.jpaste.pastebin.PasteExpireDate;
-import org.jpaste.pastebin.Pastebin;
-import org.jpaste.pastebin.PastebinLink;
-import org.jpaste.pastebin.PastebinPaste;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.FileAppender;
-
-import com.google.common.base.Joiner;
+import java.nio.file.Path;
 
 /**
  * Displays a detailed error message and provides some options to communicate with devs.
  * Errors are reported to {@link System#err}
+ *
  * @author Martin Steiger
  */
 public final class CrashReporter {
@@ -89,15 +63,15 @@ public final class CrashReporter {
     private CrashReporter() {
         // don't create any instances
     }
-    
+
     public static void report(final Throwable t) {
 
         // Swing element methods must be called in the swing thread
         try {
             final String logFileContent = getLogFileContent();
 
             SwingUtilities.invokeAndWait(new Runnable() {
-                
+
                 @Override
                 public void run() {
                     LookAndFeel oldLaF = UIManager.getLookAndFeel();
@@ -120,16 +94,16 @@ public void run() {
     }
 
     private static void showModalDialog(Throwable exception, final String logFileContent) {
-     
+
         JPanel mainPanel = new JPanel();
         mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
-        
+
         // Replace newline chars. with html newline elements (not needed in most cases)
         String text = exception.toString().replaceAll("\\r?\\n", "<br/>");
         JLabel message = new JLabel("<html><h3>A fatal error occurred</h3><br/>" + text + "</html>");
         mainPanel.add(message);
         message.setAlignmentX(Component.LEFT_ALIGNMENT);
-        
+
         mainPanel.add(Box.createRigidArea(new Dimension(0, 10)));
 
         // Tab pane
@@ -159,7 +133,7 @@ private static void showModalDialog(Throwable exception, final String logFileCon
         final JButton pastebinUpload = new JButton("Upload log file to PasteBin");
         pastebinUpload.setIcon(loadIcon("icons/pastebin.png"));
         pastebinUpload.addActionListener(new ActionListener() {
-            
+
             @Override
             public void actionPerformed(ActionEvent event) {
 
@@ -172,17 +146,17 @@ public void actionPerformed(ActionEvent event) {
         });
         // disable upload if log area text field is empty
         logArea.getDocument().addDocumentListener(new DocumentListener() {
-            
+
             @Override
             public void removeUpdate(DocumentEvent e) {
                 update();
             }
-            
+
             @Override
             public void insertUpdate(DocumentEvent e) {
                 update();
             }
-            
+
             @Override
             public void changedUpdate(DocumentEvent e) {
                 update();
@@ -193,12 +167,12 @@ private void update() {
             }
         });
         pastebinUpload.setEnabled(!logArea.getText().isEmpty());        // initial update of the button
-        
+
         buttonPanel.add(pastebinUpload);
         JButton githubIssueButton = new JButton("File an issue on GitHub");
         githubIssueButton.setIcon(loadIcon("icons/github.png"));
         githubIssueButton.addActionListener(new ActionListener() {
-            
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 openInBrowser(REPORT_ISSUE_LINK);
@@ -208,7 +182,7 @@ public void actionPerformed(ActionEvent e) {
         JButton enterIrc = new JButton("Enter IRC channel");
         enterIrc.setIcon(loadIcon("icons/irc.png"));
         enterIrc.addActionListener(new ActionListener() {
-            
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 openInBrowser(JOIN_IRC_LINK);
@@ -218,20 +192,20 @@ public void actionPerformed(ActionEvent e) {
 
         mainPanel.add(buttonPanel);
         mainPanel.add(Box.createRigidArea(new Dimension(0, 10)));
-        
+
         // Custom close button
         JButton closeButton = new JButton("Close", loadIcon("icons/close.png"));
-        
+
         showDialog(mainPanel, closeButton, "Fatal Error", JOptionPane.ERROR_MESSAGE);
     }
-    
+
     private static void showDialog(Component mainPanel, JButton closeButton, String title, int messageType) {
-        Object[] opts = new Object[] { closeButton };
-        
+        Object[] opts = new Object[]{closeButton};
+
         // The error-message pane
         final JOptionPane pane = new JOptionPane(mainPanel, messageType, JOptionPane.DEFAULT_OPTION, null, opts, opts[0]);
         closeButton.addActionListener(new ActionListener() {
-            
+
             @Override
             public void actionPerformed(ActionEvent e) {
                 // calling setValue() closes the dialog
@@ -274,7 +248,7 @@ protected static void uploadPaste(final PastebinPaste paste) {
             public void run() {
                 try {
                     final PastebinLink link = paste.paste();
-                    
+
                     SwingUtilities.invokeLater(new Runnable() {
 
                         @Override
@@ -286,7 +260,9 @@ public void run() {
                             label.addMouseListener(new MouseAdapter() {
                                 public void mouseClicked(java.awt.event.MouseEvent e) {
                                     openInBrowser(url);
-                                };
+                                }
+
+                                ;
                             });
                         }
                     });
@@ -302,7 +278,7 @@ public void run() {
                 }
             }
         };
-        
+
         Thread thread = new Thread(runnable, "Upload paste");
         thread.start();
 
@@ -325,52 +301,23 @@ private static void openInBrowser(String url) {
 
     private static String getLogFileContent() {
         StringBuilder builder = new StringBuilder();
-        
-        List<String> lines;
-        try {
-            String logFile = getLogFilename();
 
-            lines = Files.readAllLines(Paths.get(logFile), Charset.defaultCharset());
-            for (String line : lines) {
-                builder.append(line);
-                builder.append(System.lineSeparator());
+        try {
+            Path logDirectory = PathManager.getInstance().getLogPath();
+            if (logDirectory != null) {
+                Path logPath = PathManager.getInstance().getLogPath().resolve("Terasology.log");
+                if (Files.exists(logPath)) {
+                    for (String line : Files.readAllLines(logPath, Charset.defaultCharset())) {
+                        builder.append(line);
+                        builder.append(System.lineSeparator());
+                    }
+                }
             }
         } catch (Exception e) {
             // we catch all here, because we want to continue execution in all cases 
             e.printStackTrace(System.err);
         }
-        
-        return builder.toString();
-    }
 
-    private static String getLogFilename() {
-        String logFile = null;
-        
-        org.slf4j.Logger logger = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-
-        // We try to get log filename directly from the Logback system
-        // PathManager only knows the path, and determining the file name is not 
-        // straightforward for RollingFileAppenders
-        
-        if (logger instanceof Logger) {
-            Logger logbackLogger = (Logger) logger;
-            Iterator<Appender<ILoggingEvent>> it = logbackLogger.iteratorForAppenders();
-            while (it.hasNext()) {
-                Appender<ILoggingEvent> app = it.next();
-                
-                if (app instanceof FileAppender) {
-                    FileAppender<ILoggingEvent> fileApp = (FileAppender<ILoggingEvent>) app;
-                    if (logFile == null) {
-                        logFile = fileApp.getFile();
-                    } else {
-                        System.err.println("Multiple log files found!");
-                    }
-                }
-            }
-        } else {
-            System.err.println("Logger ist not a Logback logger, but " + logger.getClass().getName());
-        }
-        
-        return logFile;
+        return builder.toString();
     }
 }
diff --git a/facades/PC/src/main/java/org/terasology/engine/Terasology.java b/facades/PC/src/main/java/org/terasology/engine/Terasology.java
@@ -15,11 +15,7 @@
  */
 package org.terasology.engine;
 
-import java.awt.GraphicsEnvironment;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collection;
-
+import com.google.common.collect.Lists;
 import org.terasology.engine.modes.StateMainMenu;
 import org.terasology.engine.paths.PathManager;
 import org.terasology.engine.subsystem.EngineSubsystem;
@@ -33,7 +29,10 @@
 import org.terasology.engine.subsystem.lwjgl.LwjglInput;
 import org.terasology.engine.subsystem.lwjgl.LwjglTimer;
 
-import com.google.common.collect.Lists;
+import java.awt.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
 
 /**
  * Main method for launching Terasology
@@ -42,7 +41,7 @@
  * @author Kireev   Anton   <adeon.k87@gmail.com>
  */
 public final class Terasology {
-    
+
     private static final String HOME_ARG = "-homedir=";
     private static final String LOCAL_ARG = "-homedir";
     private static final String HEADLESS_ARG = "-headless";
@@ -68,14 +67,14 @@ public static void main(String[] args) {
             } else {
                 PathManager.getInstance().useDefaultHomePath();
             }
-            
+
             Collection<EngineSubsystem> subsystemList;
             if (isHeadless) {
                 subsystemList = Lists.newArrayList(new HeadlessGraphics(), new HeadlessTimer(), new HeadlessAudio(), new HeadlessInput());
             } else {
                 subsystemList = Lists.<EngineSubsystem>newArrayList(new LwjglGraphics(), new LwjglTimer(), new LwjglAudio(), new LwjglInput());
             }
-            
+
             TerasologyEngine engine = new TerasologyEngine(subsystemList);
             engine.init();
             if (isHeadless) {
@@ -85,7 +84,7 @@ public static void main(String[] args) {
             }
             engine.dispose();
         } catch (Throwable t) {
-            
+
             if (!GraphicsEnvironment.isHeadless()) {
                 CrashReporter.report(t);
             }
