2 new revisions: Revision: 059490d787e8 Branch: mwhapples_slf4j Author: Michael Whapples Date: Thu Jul 17 13:44:55 2014 UTC Log: Some code cleanup http://code.google.com/p/brailleblaster/source/detail?r=059490d787e8 Revision: d75598af8378 Branch: mwhapples_slf4j Author: Michael Whapples Date: Thu Jul 17 14:18:39 2014 UTC Log: More clean up http://code.google.com/p/brailleblaster/source/detail?r=d75598af8378 ============================================================================== Revision: 059490d787e8 Branch: mwhapples_slf4j Author: Michael Whapples Date: Thu Jul 17 13:44:55 2014 UTC Log: Some code cleanup http://code.google.com/p/brailleblaster/source/detail?r=059490d787e8 Modified: /src/main/org/brailleblaster/BBIni.java ======================================= --- /src/main/org/brailleblaster/BBIni.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/BBIni.java Thu Jul 17 13:44:55 2014 UTC @@ -217,18 +217,7 @@ if (!logPath.exists()) { logPath.mkdirs(); } - // try { - // logFile = new FileHandler(logFilesPath + fileSep + "log.xml"); - // } - // catch (IOException e) { - // e.printStackTrace(); - // logger.error("cannot open logfile", e); - // } - // if (logFile != null) { - // logger.addHandler(logFile); - // } - // disable output to console - // logger.setUseParentHandlers(false); + if (args.length > 0) { int i = 0; while (i < args.length) { ============================================================================== Revision: d75598af8378 Branch: mwhapples_slf4j Author: Michael Whapples Date: Thu Jul 17 14:18:39 2014 UTC Log: More clean up http://code.google.com/p/brailleblaster/source/detail?r=d75598af8378 Modified: /src/main/org/brailleblaster/abstractClasses/AbstractView.java /src/main/org/brailleblaster/document/Normalizer.java /src/main/org/brailleblaster/logback/LogFileFinder.java /src/main/org/brailleblaster/mathml/ImageCreator.java /src/main/org/brailleblaster/perspectives/braille/ui/BrailleMenu.java /src/main/org/brailleblaster/printers/PrintersManager.java =======================================--- /src/main/org/brailleblaster/abstractClasses/AbstractView.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/abstractClasses/AbstractView.java Thu Jul 17 14:18:39 2014 UTC
@@ -30,20 +30,18 @@ package org.brailleblaster.abstractClasses; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import nu.xom.Element; import nu.xom.Node; import nu.xom.Text; -import org.brailleblaster.BBIni; import org.brailleblaster.perspectives.braille.Manager; import org.brailleblaster.perspectives.braille.messages.Message; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormAttachment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractView { public boolean hasFocus = false; =======================================--- /src/main/org/brailleblaster/document/Normalizer.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/document/Normalizer.java Thu Jul 17 14:18:39 2014 UTC
@@ -7,19 +7,8 @@ import java.net.URL; import java.net.UnknownHostException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.brailleblaster.BBIni; -import org.brailleblaster.util.Notify; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; -import org.w3c.dom.NodeList; -import org.w3c.dom.Element; -import org.w3c.dom.Text; -import org.xml.sax.SAXException; - +import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; @@ -29,6 +18,16 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.brailleblaster.util.Notify; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; +import org.xml.sax.SAXException; + public class Normalizer { File f; Document doc; =======================================--- /src/main/org/brailleblaster/logback/LogFileFinder.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/logback/LogFileFinder.java Thu Jul 17 14:18:39 2014 UTC
@@ -2,12 +2,10 @@ import java.io.File; -import ch.qos.logback.core.Context; +import org.eclipse.swt.SWT; + import ch.qos.logback.core.PropertyDefinerBase; import ch.qos.logback.core.spi.PropertyDefiner; -import ch.qos.logback.core.status.Status; - -import org.eclipse.swt.SWT;public class LogFileFinder extends PropertyDefinerBase implements PropertyDefiner {
=======================================--- /src/main/org/brailleblaster/mathml/ImageCreator.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/mathml/ImageCreator.java Thu Jul 17 14:18:39 2014 UTC
@@ -1,8 +1,5 @@ package org.brailleblaster.mathml; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.io.StringReader; @@ -10,21 +7,21 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import net.sourceforge.jeuclid.MutableLayoutContext; +import net.sourceforge.jeuclid.context.LayoutContextImpl; +import net.sourceforge.jeuclid.context.Parameter; +import net.sourceforge.jeuclid.swt.MathRenderer; import nu.xom.Element; -import org.brailleblaster.BBIni; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.widgets.Display; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Node; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import net.sourceforge.jeuclid.MutableLayoutContext; -import net.sourceforge.jeuclid.context.LayoutContextImpl; -import net.sourceforge.jeuclid.context.Parameter; -import net.sourceforge.jeuclid.swt.MathRenderer; - public class ImageCreator {private final static Logger logger = LoggerFactory.getLogger(ImageCreator.class);
public static Image createImage(Display d, Element e, int fontHeight){ =======================================--- /src/main/org/brailleblaster/perspectives/braille/ui/BrailleMenu.java Fri Jul 11 17:01:11 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/ui/BrailleMenu.java Thu Jul 17 14:18:39 2014 UTC
@@ -1,12 +1,10 @@ package org.brailleblaster.perspectives.braille.ui; -import org.brailleblaster.BBIni; import org.brailleblaster.perspectives.Controller; import org.brailleblaster.perspectives.braille.Manager; import org.brailleblaster.perspectives.braille.views.tree.BookTree; import org.brailleblaster.perspectives.braille.views.tree.XMLTree; import org.brailleblaster.settings.SettingsDialog; -import org.brailleblaster.util.YesNoChoice; import org.brailleblaster.wordprocessor.BBMenu; import org.brailleblaster.wordprocessor.WPManager; import org.eclipse.swt.SWT; =======================================--- /src/main/org/brailleblaster/printers/PrintersManager.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/printers/PrintersManager.java Thu Jul 17 14:18:39 2014 UTC
@@ -33,14 +33,19 @@ package org.brailleblaster.printers; -import org.brailleblaster.BBIni; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.printing.PrintDialog; +import org.eclipse.swt.printing.Printer; +import org.eclipse.swt.printing.PrinterData; +import org.eclipse.swt.widgets.Shell; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.eclipse.swt.*; -import org.eclipse.swt.graphics.*; -import org.eclipse.swt.widgets.*; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.printing.*; public class PrintersManager {