Skip to content

Commit

Permalink
Remove slf4j Logger dependency
Browse files Browse the repository at this point in the history 
Eliminate all uses of the slf4j logger classes, and remove the jar
dependency. This logger was used very inconsistently, and in the places
where it was used, it was not used in any particularly useful way. In
amny cases, it was used simply to print fatal errors before dying.
  • Loading branch information
@kevinawalsh
kevinawalsh committed Jan 23, 2019
1 parent 91dbbde commit fd2e823
Show file tree
Hide file tree
Showing 35 changed files with 101 additions and 324 deletions.
2 changes: 1 addition & 1 deletion build.xml
View file
Expand Up @@ -28,7 +28,7 @@
toFile="src/com/cburch/logisim/gui/start/MacOsAdapter.java">
</copy>
<depend srcdir="src" destdir="bin" cache="depcache" closure="no"/>
<javac srcdir="src" includeantruntime="false" destdir="bin" debug="true" source="8" target="8" classpath="libs/xswingx.jar:libs/lablib-checkboxtree-3.3.jar:libs/colorpicker.jar:libs/fontchooser.jar:libs/jh.jar:libs/MRJAdapter.jar:libs/rsyntaxtextarea-stripped.jar:libs/slf4j-api-1.7.8.jar" />
<javac srcdir="src" includeantruntime="false" destdir="bin" debug="true" source="8" target="8" classpath="libs/xswingx.jar:libs/lablib-checkboxtree-3.3.jar:libs/colorpicker.jar:libs/fontchooser.jar:libs/jh.jar:libs/MRJAdapter.jar:libs/rsyntaxtextarea-stripped.jar" />
</target>

<target name="jar" depends="compile">
Expand Down
0 libs/slf4j-api-1.7.8.jar → dead-libs/slf4j-api-1.7.8.jar
View file
File renamed without changes.
0 libs/slf4j-simple-1.7.8.jar → dead-libs/slf4j-simple-1.7.8.jar
View file
File renamed without changes.
9 changes: 2 additions & 7 deletions src/com/bfh/logisim/fpgaboardeditor/BoardReaderClass.java
View file
Expand Up @@ -45,8 +45,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
Expand All @@ -56,9 +54,6 @@

public class BoardReaderClass {

final static Logger logger = LoggerFactory
.getLogger(BoardReaderClass.class);

private String myfilename;
private DocumentBuilderFactory factory;
private DocumentBuilder parser;
Expand Down Expand Up @@ -188,8 +183,8 @@ public BoardInformation GetBoardInformation() {
ProcessComponentList(CompList, result);
return result;
} catch (Exception e) {
logger.error(
"Exceptions not handled yet in GetBoardInformation(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in GetBoardInformation(), but got an exception: %s\n",
e.getMessage());
/* TODO: handle exceptions */
return null;
Expand Down
19 changes: 7 additions & 12 deletions src/com/bfh/logisim/fpgaboardeditor/BoardWriterClass.java
View file
Expand Up @@ -44,18 +44,13 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

class BoardWriterClass {

final static Logger logger = LoggerFactory
.getLogger(BoardWriterClass.class);

public static String BoardInformationSectionString = "BoardInformation";
public static String ClockInformationSectionString = "ClockInformation";
public static String[] ClockSectionStrings = { "Frequency", "FPGApin",
Expand Down Expand Up @@ -177,8 +172,8 @@ public BoardWriterClass(BoardInformation BoardInfo, Image BoardImage) {
PixelData.setAttribute("PixelRGB", writer.GetCompressedString());
} catch (Exception e) {
/* TODO: handle exceptions */
logger.error(
"Exceptions not handled yet in BoardWriterClass(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in BoardWriterClass(), but got an exception: %s\n",
e.getMessage());
}
}
Expand All @@ -191,11 +186,11 @@ public void PrintXml() {
Source src = new DOMSource(boardInfo);
StreamResult dest = new StreamResult(new StringWriter());
aTransformer.transform(src, dest);
logger.info(dest.getWriter().toString());
System.out.println(dest.getWriter().toString());
} catch (Exception e) {
/* TODO: handle exceptions */
logger.error(
"Exceptions not handled yet in PrintXml(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in PrintXml(), but got an exception: %s\n",
e.getMessage());
}
}
Expand All @@ -211,8 +206,8 @@ public void PrintXml(String filename) {
Result dest = new StreamResult(file);
aTransformer.transform(src, dest);
} catch (Exception e) {
logger.error(
"Exceptions not handled yet in PrintXml(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in PrintXml(), but got an exception: %s\n",
e.getMessage());
}
}
Expand Down
11 changes: 3 additions & 8 deletions src/com/bfh/logisim/fpgaboardeditor/FPGAIOInformationContainer.java
View file
Expand Up @@ -47,8 +47,6 @@
import javax.swing.JLabel;
import javax.swing.JTextField;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down Expand Up @@ -173,9 +171,6 @@ public static LinkedList<String> GetComponentTypes() {
return result;
};

final static Logger logger = LoggerFactory
.getLogger(FPGAIOInformationContainer.class);

private IOComponentTypes MyType;
private long MyIdentifier;
private BoardRectangle MyRectangle;
Expand Down Expand Up @@ -314,7 +309,7 @@ public FPGAIOInformationContainer(Node DocumentInfo) {
boolean PinsComplete = true;
for (int i = 0; i < NrOfPins; i++) {
if (!MyPinLocations.containsKey(i)) {
logger.warn("Bizar missing pin {} of component!", i);
System.err.printf("Bizar missing pin %s of component!n", i);
PinsComplete = false;
}
}
Expand Down Expand Up @@ -440,8 +435,8 @@ public Element GetDocumentElement(Document doc) {
return result;
} catch (Exception e) {
/* TODO: handle exceptions */
logger.error(
"Exceptions not handled yet in GetDocumentElement(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in GetDocumentElement(), but got an exception: %s\n",
e.getMessage());
}
return null;
Expand Down
9 changes: 2 additions & 7 deletions src/com/bfh/logisim/fpgaboardeditor/ImageXmlFactory.java
View file
Expand Up @@ -46,13 +46,8 @@

import javax.imageio.ImageIO;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class ImageXmlFactory {

final static Logger logger = LoggerFactory.getLogger(ImageXmlFactory.class);

private String[] CodeTable;
private StringBuffer AsciiStream;
private String[] InitialCodeTable = { "a", "b", "c", "d", "e", "f", "g",
Expand Down Expand Up @@ -124,7 +119,7 @@ public void CreateStream(Image BoardPicture) {
pixelGrabber.grabPixels();
} catch (Exception e) {
/* TODO: handle exceptions */
logger.error("PixelGrabber exception: {}", e.getMessage());
System.err.printf("PixelGrabber exception: %s\n", e.getMessage());
}
ColorModel color_model = pixelGrabber.getColorModel();
if (pixelGrabber.getPixels() instanceof byte[]) {
Expand Down Expand Up @@ -159,7 +154,7 @@ public void CreateStream(Image BoardPicture) {
ImageIO.write(result, "jpg", blaat);
} catch (IOException e) {
// TODO Auto-generated catch block
logger.error("JPEG Writer exception: {}", e.getMessage());
System.err.printf("JPEG Writer exception: %s\n", e.getMessage());
}
byte data[] = blaat.toByteArray();
CodeTable = CreateCodeTable(data);
Expand Down
13 changes: 4 additions & 9 deletions src/com/bfh/logisim/fpgagui/ComponentMapDialog.java
View file
Expand Up @@ -69,8 +69,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down Expand Up @@ -312,9 +310,6 @@ public String getDescription() {
}
}

final static Logger logger = LoggerFactory
.getLogger(ComponentMapDialog.class);

private JDialog panel;
private boolean doneAssignment = false;
private JButton UnMapButton = new JButton();
Expand Down Expand Up @@ -723,8 +718,8 @@ private void Load() {
BoardPic.getHeight());
} catch (Exception e) {
/* TODO: handle exceptions */
logger.error(
"Exceptions not handled yet in Load(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in Load(), but got an exception: %s\n",
e.getMessage());
}
}
Expand Down Expand Up @@ -829,8 +824,8 @@ private void Save() {
aTransformer.transform(src, dest);
} catch (Exception e) {
/* TODO: handle exceptions */
logger.error(
"Exceptions not handled yet in Save(), but got an exception: {}",
System.err.printf(
"Exceptions not handled yet in Save(), but got an exception: %s\n",
e.getMessage());
}
}
Expand Down
39 changes: 0 additions & 39 deletions src/com/bfh/logisim/fpgagui/FPGASettingsDialog.java
View file
Expand Up @@ -30,24 +30,15 @@

package com.bfh.logisim.fpgagui;

import java.awt.Color;
import java.awt.Font;
import java.awt.Dialog.ModalityType;
import java.awt.Dimension;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.Insets;
import java.io.File;
import java.util.ArrayList;
import java.util.Set;

import javax.swing.JOptionPane;
import javax.swing.JButton;
Expand All @@ -58,37 +49,7 @@
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.filechooser.FileFilter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import com.bfh.logisim.designrulecheck.CorrectLabel;
import com.bfh.logisim.fpgaboardeditor.BoardInformation;
import com.bfh.logisim.fpgaboardeditor.BoardRectangle;
import com.bfh.logisim.fpgaboardeditor.FPGAIOInformationContainer;
import com.bfh.logisim.fpgaboardeditor.Strings;
import com.bfh.logisim.settings.Settings;

public class FPGASettingsDialog implements ActionListener {
Expand Down
22 changes: 8 additions & 14 deletions src/com/bfh/logisim/fpgagui/MappableResourcesContainer.java
View file
Expand Up @@ -41,9 +41,6 @@
import java.util.SortedSet;
import java.util.TreeSet;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.bfh.logisim.designrulecheck.Netlist;
import com.bfh.logisim.designrulecheck.NetlistComponent;
import com.bfh.logisim.fpgaboardeditor.BoardInformation;
Expand All @@ -57,9 +54,6 @@

public class MappableResourcesContainer {

final static Logger logger = LoggerFactory
.getLogger(MappableResourcesContainer.class);

private Map<ArrayList<String>, NetlistComponent> myMappableResources;
public String currentBoardName;
private BoardInformation currentUsedBoard;
Expand Down Expand Up @@ -165,7 +159,7 @@ public void BuildIOMappingInformation() {
private String DisplayNametoMapName(String item) {
String[] parts = item.split(" ");
if (parts.length != 2) {
logger.error("Internal error");
System.err.println("Internal error");
return "";
}
return currentBoardName + ":" + parts[1];
Expand Down Expand Up @@ -232,7 +226,7 @@ public ArrayList<String> GetFPGAPinLocs(int FPGAVendor) {
for (String Map : fpgaInputsList.keySet()) {
int InputId = fpgaInputsList.get(Map);
if (!mappedList.containsKey(Map)) {
logger.warn("No mapping found for {}", Map);
System.err.printf("No mapping found for %s\n", Map);
return Contents;
}
BoardRectangle rect = mappedList.get(Map);
Expand All @@ -243,7 +237,7 @@ public ArrayList<String> GetFPGAPinLocs(int FPGAVendor) {
for (String Map : fpgaInOutsList.keySet()) {
int InOutId = fpgaInOutsList.get(Map);
if (!mappedList.containsKey(Map)) {
logger.warn("No mapping found for {}", Map);
System.err.printf("No mapping found for %s\n", Map);
return Contents;
}
BoardRectangle rect = mappedList.get(Map);
Expand All @@ -254,7 +248,7 @@ public ArrayList<String> GetFPGAPinLocs(int FPGAVendor) {
for (String Map : fpgaOutputsList.keySet()) {
int OutputId = fpgaOutputsList.get(Map);
if (!mappedList.containsKey(Map)) {
logger.warn("No mapping found for {}", Map);
System.err.printf("No mapping found for %s\n", Map);
return Contents;
}
BoardRectangle rect = mappedList.get(Map);
Expand All @@ -281,7 +275,7 @@ public BoardRectangle GetMap(String id) {
ArrayList<String> key = GetHierarchyKey(id);
NetlistComponent MapComp = myMappableResources.get(key);
if (MapComp == null) {
logger.error("Internal error!");
System.err.println("Internal error!");
return null;
}
return MapComp.getMap(DisplayNametoMapName(id));
Expand Down Expand Up @@ -502,7 +496,7 @@ public void Map(String comp, BoardRectangle item, String Maptype) {
ArrayList<String> key = GetHierarchyKey(comp);
NetlistComponent MapComp = myMappableResources.get(key);
if (MapComp == null) {
logger.error("Internal error! comp: {}, key: {}", comp, key);
System.err.printf("Internal error! comp: %s, key: %s\n", comp, key);
return;
}
MapComp.addMap(DisplayNametoMapName(comp), item, Maptype);
Expand All @@ -512,7 +506,7 @@ public void Map(String comp, BoardRectangle item, String Maptype) {
private String MapNametoDisplayName(String item) {
String[] parts = item.split(":");
if (parts.length != 2) {
logger.error("Internal error!");
System.err.println("Internal error!");
return "";
}
ArrayList<String> key = GetHierarchyKey(parts[1]);
Expand Down Expand Up @@ -647,7 +641,7 @@ public void UnMap(String comp) {
ArrayList<String> key = GetHierarchyKey(comp);
NetlistComponent MapComp = myMappableResources.get(key);
if (MapComp == null) {
logger.error("Internal error!");
System.err.println("Internal error!");
return;
}
MapComp.removeMap(DisplayNametoMapName(comp));
Expand Down
5 changes: 0 additions & 5 deletions src/com/cburch/logisim/Main.java
View file
Expand Up @@ -36,9 +36,6 @@

import javax.swing.JOptionPane;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.cburch.logisim.gui.start.Startup;

public class Main {
Expand All @@ -65,8 +62,6 @@ public static void main(String[] args) throws Exception {
public static boolean headless = false;
public static boolean MacOS = false;

final static Logger logger = LoggerFactory.getLogger(Main.class);

public static final LogisimVersion VERSION = LogisimVersion.get(4, 0, 0, "HC"); // candidate
public static final String VERSION_NAME = VERSION.toString();
public static final int COPYRIGHT_YEAR = 2018;
Expand Down

0 comments on commit fd2e823

Please sign in to comment.