Manual code cleanup for base Console classes

- Moved final field inits to constructor
- Added trivial toString() implementation to the AbstractConsole
- Fixed possible NP in IOConsole

Author: iloveeclipse

debug/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java

@@ -39,17 +39,17 @@ public abstract class AbstractConsole implements IConsole {
 	/**
 	 * Console name
 	 */
-	private String fName = null;
+	private String fName;
 
 	/**
 	 * Console image descriptor
 	 */
-	private ImageDescriptor fImageDescriptor = null;
+	private ImageDescriptor fImageDescriptor;
 
 	/**
 	 * Console type identifier
 	 */
-	private String fType = null;
+	private String fType;
 
 	/**
 	 * Used to notify this console of lifecycle methods <code>init()</code>
@@ -316,4 +316,9 @@ public String getHelpContextId() {
 		return null;
 	}
 
+	@Override
+	public String toString() {
+		return "Console [" + fName + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
 }

debug/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsole.java

@@ -54,7 +54,7 @@ public class IOConsole extends TextConsole {
 	/**
 	 * A collection of open streams connected to this console.
 	 */
-	private final List<Closeable> openStreams = Collections.synchronizedList(new ArrayList<>());
+	private final List<Closeable> openStreams;
 
 	/**
 	 * The encoding used to for displaying console output.
@@ -113,10 +113,9 @@ public IOConsole(String name, String consoleType, ImageDescriptor imageDescripto
 	public IOConsole(String name, String consoleType, ImageDescriptor imageDescriptor, Charset charset, boolean autoLifecycle) {
 		super(name, consoleType, imageDescriptor, autoLifecycle);
 		this.charset = charset;
-		synchronized (openStreams) {
-			inputStream = new IOConsoleInputStream(this);
-			openStreams.add(inputStream);
-		}
+		openStreams = Collections.synchronizedList(new ArrayList<>());
+		inputStream = new IOConsoleInputStream(this);
+		openStreams.add(inputStream);
 		partitioner = new IOConsolePartitioner(this);
 		final IDocument document = getDocument();
 		if (document != null) {
@@ -313,16 +312,17 @@ protected void dispose() {
 				try {
 					closable.close();
 				} catch (IOException e) {
-					// e.printStackTrace();
+					// ignore
 				}
 			}
 			inputStream = null;
 		}
 
 		final IDocument document = partitioner.getDocument();
 		partitioner.disconnect();
-		document.setDocumentPartitioner(null);
-
+		if (document != null) {
+			document.setDocumentPartitioner(null);
+		}
 		super.dispose();
 	}
 

debug/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java

@@ -83,28 +83,27 @@ public abstract class TextConsole extends AbstractConsole {
 	/**
 	 * indication that the console's partitioner is not expecting more input
 	 */
-	private volatile boolean fPartitionerFinished = false;
+	private volatile boolean fPartitionerFinished;
 
 	/**
 	 * Indication that the console's pattern matcher has finished.
 	 * (all matches have been found and all listeners notified)
 	 */
-	private volatile boolean fMatcherFinished = false;
+	private volatile boolean fMatcherFinished;
 
 	/**
 	 * indication that the console output complete property has been fired
 	 */
-	private boolean fCompleteFired = false;
-
-	private volatile boolean fConsoleAutoScrollLock = true;
+	private boolean fCompleteFired;
 
+	private volatile boolean fConsoleAutoScrollLock;
 
 	/**
 	 * Map of client defined attributes
 	 */
-	private final HashMap<String, Object> fAttributes = new HashMap<>();
+	private final HashMap<String, Object> fAttributes;
 
-	private final IConsoleManager fConsoleManager = ConsolePlugin.getDefault().getConsoleManager();
+	private final IConsoleManager fConsoleManager;
 	private ScopedPreferenceStore store;
 	private IPropertyChangeListener propListener;
 
@@ -119,6 +118,7 @@ protected void dispose() {
 			store.removePropertyChangeListener(propListener);
 		}
 	}
+
 	/**
 	 * Constructs a console with the given name, image descriptor, and lifecycle
 	 *
@@ -130,6 +130,9 @@ protected void dispose() {
 	 */
 	public TextConsole(String name, String consoleType, ImageDescriptor imageDescriptor, boolean autoLifecycle) {
 		super(name, consoleType, imageDescriptor, autoLifecycle);
+		fConsoleAutoScrollLock = true;
+		fAttributes = new HashMap<>();
+		fConsoleManager = ConsolePlugin.getDefault().getConsoleManager();
 		fDocument = new ConsoleDocument();
 		fDocument.addPositionCategory(ConsoleHyperlinkPosition.HYPER_LINK_CATEGORY);
 		fPatternMatcher = new ConsolePatternMatcher(this);