LoggingPanel: add "Settings" to LoggingPanel's popup menu

Now LoggingPanel can be used to record and show the calling class
of the log messages.

Author: maarzt

src/main/java/org/scijava/ui/swing/console/LogFormatter.java

@@ -33,6 +33,7 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.EnumSet;
 
 import org.scijava.log.LogLevel;
 import org.scijava.log.LogMessage;
@@ -44,16 +45,46 @@
  */
 public class LogFormatter {
 
-	public String format(LogMessage message) {
+	public enum Field {
+		TIME, LEVEL, SOURCE, MESSAGE, THROWABLE, ATTACHMENT
+	}
+
+	private EnumSet<Field> visibleFields = EnumSet.of(Field.TIME,
+		Field.LEVEL, Field.SOURCE, Field.MESSAGE, Field.THROWABLE);
+
+	public boolean isVisible(Field field) {
+		return visibleFields.contains(field);
+	}
+
+	public void setVisible(Field field, boolean visible) {
+		// copy on write to enable isVisible to be used concurrently
+		EnumSet<Field> copy = EnumSet.copyOf(visibleFields);
+		if (visible) copy.add(field);
+		else copy.remove(field);
+		visibleFields = copy;
+	}
 
+	public String format(LogMessage message) {
 		final StringWriter sw = new StringWriter();
 		final PrintWriter printer = new PrintWriter(sw);
 
-		printWithBrackets(printer, message.time().toString());
-		printWithBrackets(printer, LogLevel.prefix(message.level()));
-		printWithBrackets(printer, message.source().toString());
-		printer.println(message.text());
-		if (message.throwable() != null)
+		if (isVisible(Field.TIME))
+			printWithBrackets(printer, message.time().toString());
+
+		if (isVisible(Field.LEVEL))
+			printWithBrackets(printer, LogLevel.prefix(message.level()));
+
+		if (isVisible(Field.SOURCE))
+			printWithBrackets(printer, message.source().toString());
+
+		if (isVisible(Field.ATTACHMENT)) {
+			printer.print(message.attachments());
+			printer.print(" ");
+		}
+
+		if (isVisible(Field.MESSAGE)) printer.println(message.text());
+
+		if (isVisible(Field.THROWABLE) && message.throwable() != null)
 			message.throwable().printStackTrace(printer);
 
 		return sw.toString();

src/main/java/org/scijava/ui/swing/console/LoggingPanel.java

@@ -223,9 +223,44 @@ private JPopupMenu initMenu() {
 			this::clear);
 		menu.add(newMenuItem("Log Sources",
 			this::toggleSourcesPanel));
+		menu.add(newMenuItem("update", this::updateFilter));
+		menu.add(initSettingsMenu());
 		return menu;
 	}
 
+	private JMenu initSettingsMenu() {
+		JMenu menu = new JMenu("Settings");
+		menu.add(newMenuItem("switch recording of calling class on/of",
+			this::recordCallingClassSetter));
+		menu.add(newMenuItem("show / hide time stamp",
+			toggleLogFormatterFieldVisible(LogFormatter.Field.TIME)));
+		menu.add(newMenuItem("show / hide log source",
+			toggleLogFormatterFieldVisible(LogFormatter.Field.SOURCE)));
+		menu.add(newMenuItem("show / hide log level",
+			toggleLogFormatterFieldVisible(LogFormatter.Field.LEVEL)));
+		menu.add(newMenuItem("show / hide exception",
+			toggleLogFormatterFieldVisible(LogFormatter.Field.THROWABLE)));
+		menu.add(newMenuItem("show / hide attached data",
+			toggleLogFormatterFieldVisible(LogFormatter.Field.ATTACHMENT)));
+		return menu;
+	}
+
+	private void recordCallingClassSetter() {
+		if (recorder != null) {
+			boolean enable = !recorder.isRecordCallingClass();
+			recorder.setRecordCallingClass(enable);
+			if (enable)
+				logFormatter.setVisible(LogFormatter.Field.ATTACHMENT, true);
+		}
+	}
+
+	private Runnable toggleLogFormatterFieldVisible(LogFormatter.Field item) {
+		return () -> {
+			logFormatter.setVisible(item, !logFormatter.isVisible(item));
+			updateFilter();
+		};
+	}
+
 	static private JMenuItem newMenuItem(String text, String keyStroke,
 		Runnable runnable)
 	{