Fixed plugin ID, renaming 'FindBugs' to 'SpotBugs' in UI, borders, warnings

amaembo · amaembo · commit fab23336a009 · 2020-03-27T14:33:36.000+07:00
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/actions/HelpAction.java b/src/main/java/org/jetbrains/plugins/spotbugs/actions/HelpAction.java
@@ -52,7 +52,6 @@
 public final class HelpAction extends AbstractAction {
 	// TODO: fill proper values
 	private static final String DOWNLOADS_WEBSITE = "www.google.com";
-	private static final String SUPPORT_EMAIL = "s@s.com";
 
 	private static final String A_HREF_COPY = "#copy";
 
@@ -108,15 +107,13 @@ private static StringBuilder createHelpInfo() {
 		ret.append("<br>");
 		ret.append("Download: <a href='").append(VersionManager.getDownloadWebsite()).append("'>").append(VersionManager.getDownloadWebsite()).append("</a>");
 		ret.append("<br>");
-		ret.append("Email: ").append(VersionManager.getSupportEmail());
+		ret.append("Issue tracker: ").append(VersionManager.getIssueTracker());
 		ret.append("</p>");
 		ret.append("<p>");
 		ret.append("<h3>Findbugs ").append(FindBugsUtil.getFindBugsFullVersion()).append("</h3>");
 		ret.append("Website: <a href='").append(Version.WEBSITE).append("'>").append(Version.WEBSITE).append("</a>");
 		ret.append("<br>");
 		ret.append("Download: <a href='").append(DOWNLOADS_WEBSITE).append("'>").append(DOWNLOADS_WEBSITE).append("</a>");
-		ret.append("<br>");
-		ret.append("Email: ").append(SUPPORT_EMAIL);
 		ret.append("</p>");
 		ret.append("<p>");
 		ret.append("The name FindBugs&trade; and the FindBugs logo are trademarked by The University of Maryland.");
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/common/FindBugsPluginConstants.java b/src/main/java/org/jetbrains/plugins/spotbugs/common/FindBugsPluginConstants.java
@@ -24,8 +24,8 @@
 @SuppressWarnings({"HardCodedStringLiteral"})
 public final class FindBugsPluginConstants {
 
-	public static final String PLUGIN_NAME = "SpotBugs-IDEA";
-	public static final String TOOL_WINDOW_ID = PLUGIN_NAME; // see plugin.xml
+	public static final String PLUGIN_NAME = "IntelliJ SpotBugs plugin";
+	public static final String TOOL_WINDOW_ID = "SpotBugs"; // see plugin.xml
 	public static final String DEFAULT_EXPORT_DIR = System.getProperty("user.home") + File.separatorChar + TOOL_WINDOW_ID;
 
 	public static final String PLUGIN_ID = "org.jetbrains.plugins.spotbugs";
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/common/FindBugsPluginUtil.java b/src/main/java/org/jetbrains/plugins/spotbugs/common/FindBugsPluginUtil.java
@@ -31,9 +31,9 @@ private FindBugsPluginUtil() {
 
 	@NotNull
 	public static IdeaPluginDescriptor getIdeaPluginDescriptor() {
-		final IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId(FindBugsPluginConstants.PLUGIN_NAME));
+		final IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId(FindBugsPluginConstants.PLUGIN_ID));
 		if (plugin == null) {
-			throw new IllegalStateException(FindBugsPluginConstants.PLUGIN_NAME + " could not be instantiated! PluginManager returned null!");
+			throw new IllegalStateException(FindBugsPluginConstants.PLUGIN_ID + " could not be instantiated! PluginManager returned null!");
 		}
 		return plugin;
 	}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/common/VersionManager.java b/src/main/java/org/jetbrains/plugins/spotbugs/common/VersionManager.java
@@ -25,7 +25,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.*;
 
 
 /**
@@ -42,18 +42,15 @@ public class VersionManager {
 
 	private static final long _major = 1;
 	private static final long _minor = 0;
-	private static final long _build = 1;
-
-	private static final String _branch = "trunk";
-
+	private static final long _build = 0;
 
 	private static final String NAME = FindBugsPluginConstants.PLUGIN_NAME;
-
-	private static final String WEBSITE = "http://andrepdo.github.io/findbugs-idea";
+	
+	private static final String WEBSITE = "https://github.com/JetBrains/spotbugs-intellij-plugin/";
 
 	private static final String DOWNLOAD_WEBSITE = "http://plugins.intellij.net/plugin/?id=3847";
 
-	private static final String SUPPORT_EMAIL = "andre.pfeiler@gmail.com";
+	private static final String ISSUE_TRACKER = "https://github.com/JetBrains/spotbugs-intellij-plugin/issues";
 
 	private static final long REVISION;
 
@@ -74,23 +71,18 @@ public class VersionManager {
 			}
 		}
 		REVISION = parsedRevision;
-		//noinspection StringEqualsEmptyString,SingleCharacterStringConcatenation
 		FULL_VERSION = NAME + ' ' + MAJOR_MINOR_BUILD;
 	}
 
 
-	/** e.g. "0.9.21".
-	 * @return*/
+	/**
+	 * @return version number, e.g. "1.0.0"
+	 */
 	public static String getVersion() {
 		return MAJOR_MINOR_BUILD;
 	}
 
 
-	public static String getBranch() {
-		return _branch;
-	}
-
-
 	public static String getFullVersion() {
 		return FULL_VERSION;
 	}
@@ -116,8 +108,8 @@ public static String getDownloadWebsite() {
 	}
 
 
-	public static String getSupportEmail() {
-		return SUPPORT_EMAIL;
+	public static String getIssueTracker() {
+		return ISSUE_TRACKER;
 	}
 
 
@@ -129,7 +121,7 @@ public static void main(final String[] args) {
 			OutputStreamWriter writer = null;
 			try {
 				//noinspection IOResourceOpenedButNotSafelyClosed
-				writer = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF-8").newEncoder());
+				writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
 				writer.write(getVersion());
 				writer.flush();
 			} catch (final IOException e) {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/common/util/WithPluginClassloader.java b/src/main/java/org/jetbrains/plugins/spotbugs/common/util/WithPluginClassloader.java
@@ -28,7 +28,7 @@
  * This must be used when FindBugs will create a SAXReader because this use the default DocumentFactory instance
  * (org.dom4j.DocumentFactory#getInstance) which is created by createSingleton which uses Class.forName.
  * <p>
- * Note that all our classes (incl transitive) must be loaded by the PluginClassLoader instance of FindBugs-IDEA plugin.
+ * Note that all our classes (incl transitive) must be loaded by the PluginClassLoader instance of SpotBugs-IDEA plugin.
  * Check: DebugUtil.dumpClasses(TheClass.class);
  */
 public final class WithPluginClassloader {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/ToolWindowFactoryImpl.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/ToolWindowFactoryImpl.java
@@ -29,7 +29,7 @@
 public final class ToolWindowFactoryImpl implements ToolWindowFactory {
 	@Override
 	public void createToolWindowContent(@NotNull final Project project, @NotNull final ToolWindow toolWindow) {
-		final ToolWindowPanel win = new ToolWindowPanel(project, toolWindow);
+		final ToolWindowPanel win = new ToolWindowPanel(project);
 		toolWindow.getContentManager().addContent(ContentFactory.SERVICE.getInstance().createContent(win, "", false));
 	}
 }
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/common/AnalysisRunDetailsDialog.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/common/AnalysisRunDetailsDialog.java
@@ -22,6 +22,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogBuilder;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.plugins.spotbugs.common.VersionManager;
 import org.jetbrains.plugins.spotbugs.common.util.FindBugsUtil;
 import org.jetbrains.plugins.spotbugs.common.util.New;
@@ -60,7 +61,7 @@ public static DialogBuilder create(
 		final StringBuilder html = new StringBuilder();
 		html.append("<html><body>");
 		html.append("<p><h2>").append(VersionManager.getName()).append(": <b>found ").append(bugCount).append(" bugs in ").append(numClasses).append(numClasses > 1 ? " classes" : " class").append("</b>").append("</h2></p>");
-		html.append("<p>").append("<font size='10px'>using ").append(VersionManager.getFullVersion()).append(" with Findbugs version ").append(FindBugsUtil.getFindBugsFullVersion()).append("</font>").append("</p>");
+		html.append("<p>").append("<font size='10px'>using ").append(VersionManager.getFullVersion()).append(" with SpotBugs version ").append(FindBugsUtil.getFindBugsFullVersion()).append("</font>").append("</p>");
 
 		for (final edu.umd.cs.findbugs.Project bugsProject : result.getProjects()) {
 
@@ -131,7 +132,7 @@ public static DialogBuilder create(
 		dialogBuilder.addCloseButton();
 		dialogBuilder.setTitle(StringUtil.capitalizeWords("SpotBugs analysis settings", true));
 		final JComponent panel = new JPanel(new BorderLayout());
-		panel.setBorder(new EmptyBorder(10, 10, 10, 10));
+		panel.setBorder(JBUI.Borders.empty(10));
 
 		final HTMLEditorKit htmlEditorKit = GuiResources.createHtmlEditorKit();
 		final JEditorPane jEditorPane = new JEditorPane() {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/common/MultiSplitLayout.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/common/MultiSplitLayout.java
@@ -127,7 +127,7 @@ public PropertyChangeListener[] getPropertyChangeListeners() {
 
 
 	private void firePCS(final String propertyName, final Object oldValue, final Object newValue) {
-		if (!(oldValue != null && newValue != null && oldValue.equals(newValue))) {
+		if (!(oldValue != null && oldValue.equals(newValue))) {
 			pcs.firePropertyChange(propertyName, oldValue, newValue);
 		}
 	}
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/BugDetailsComponents.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/BugDetailsComponents.java
@@ -22,57 +22,26 @@
 import com.intellij.ide.BrowserUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBTabbedPane;
-import com.intellij.util.ui.UIUtil;
-import edu.umd.cs.findbugs.BugAnnotation;
-import edu.umd.cs.findbugs.BugInstance;
-import edu.umd.cs.findbugs.BugPattern;
-import edu.umd.cs.findbugs.DetectorFactory;
-import edu.umd.cs.findbugs.FieldAnnotation;
-import edu.umd.cs.findbugs.MethodAnnotation;
-import edu.umd.cs.findbugs.Plugin;
-import edu.umd.cs.findbugs.SortedBugCollection;
+import com.intellij.util.ui.*;
+import edu.umd.cs.findbugs.*;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import icons.PluginIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.spotbugs.common.util.BugInstanceUtil;
-import org.jetbrains.plugins.spotbugs.gui.common.CustomLineBorder;
-import org.jetbrains.plugins.spotbugs.gui.common.MultiSplitLayout;
-import org.jetbrains.plugins.spotbugs.gui.common.MultiSplitPane;
-import org.jetbrains.plugins.spotbugs.gui.common.ScrollPaneFacade;
-import org.jetbrains.plugins.spotbugs.gui.common.VerticalTextIcon;
+import org.jetbrains.plugins.spotbugs.gui.common.*;
 import org.jetbrains.plugins.spotbugs.gui.tree.view.BugTree;
 import org.jetbrains.plugins.spotbugs.resources.GuiResources;
 
-import javax.swing.BorderFactory;
-import javax.swing.JEditorPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.border.EmptyBorder;
+import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 import javax.swing.text.html.HTMLEditorKit;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.awt.event.KeyEvent;
-import java.io.IOException;
-import java.io.StringReader;
+import java.io.*;
 import java.net.URL;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("MagicNumber")
 public final class BugDetailsComponents {
@@ -108,6 +77,7 @@ JTabbedPane getTabbedPane() {
 				_jTabbedPane = new JTabbedPane(SwingConstants.RIGHT);
 			} else {
 				_jTabbedPane = new JBTabbedPane(SwingConstants.RIGHT);
+				((JBTabbedPane) _jTabbedPane).setTabComponentInsets(JBUI.insets(0, 0, 0, 5));
 			}
 
 			_jTabbedPane.setFocusable(false);
@@ -144,7 +114,7 @@ private Component getBugDetailsSplitPane() {
 			final String layoutDef = "(ROW weight=1.0 (COLUMN weight=1.0 top bottom))";
 			final MultiSplitLayout.Node modelRoot = MultiSplitLayout.parseModel(layoutDef);
 			final MultiSplitLayout multiSplitLayout = _bugDetailsSplitPane.getMultiSplitLayout();
-			multiSplitLayout.setDividerSize(6);
+			multiSplitLayout.setDividerSize(3);
 			multiSplitLayout.setModel(modelRoot);
 			multiSplitLayout.setFloatingDividers(true);
 			_bugDetailsSplitPane.add(getBugDetailsPanel(), "top");
@@ -155,17 +125,13 @@ private Component getBugDetailsSplitPane() {
 		return _bugDetailsSplitPane;
 	}
 
-	@SuppressWarnings("MagicNumber")
 	private JPanel getBugDetailsPanel() {
 		if (_bugDetailsPanel == null) {
 			final JScrollPane scrollPane = ScrollPaneFacade.createScrollPane(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 			scrollPane.setViewportView(getBugDetailsPane());
-			//scrollPane.setBorder(BorderFactory.createCompoundBorder(new EmptyBorder(0, 0, 0, 3), new CustomLineBorder(new Color(98, 95, 89), 0, 0, 1, 1)));
-			scrollPane.setBorder(new CustomLineBorder(new JBColor(new Color(98, 95, 89), new Color(53, 51, 48)), 0, 0, 1, 0));
-			//scrollPane.setBorder(new EmptyBorder(0, 0, 0, 0));
 
 			_bugDetailsPanel = new JPanel();
-			_bugDetailsPanel.setBorder(new EmptyBorder(3, 2, 0, 3));
+			_bugDetailsPanel.setBorder(JBUI.Borders.empty());
 			_bugDetailsPanel.setLayout(new BorderLayout());
 			_bugDetailsPanel.add(scrollPane, BorderLayout.CENTER);
 		}
@@ -176,16 +142,13 @@ private JPanel getBugDetailsPanel() {
 	private JEditorPane getBugDetailsPane() {
 		if (_bugDetailsPane == null) {
 			_bugDetailsPane = new BugDetailsEditorPane();
-			_bugDetailsPane.setBorder(new EmptyBorder(10, 10, 10, 10));
+			_bugDetailsPane.setBorder(JBUI.Borders.empty(5));
 			_bugDetailsPane.setEditable(false);
 			_bugDetailsPane.setContentType(UIUtil.HTML_MIME);
 			_bugDetailsPane.setEditorKit(_htmlEditorKit);
-			_bugDetailsPane.addHyperlinkListener(new HyperlinkListener() {
-				@Override
-				public void hyperlinkUpdate(final HyperlinkEvent evt) {
-					if (_parent != null) {
-						handleDetailsClick(evt);
-					}
+			_bugDetailsPane.addHyperlinkListener(evt -> {
+				if (_parent != null) {
+					handleDetailsClick(evt);
 				}
 			});
 		}
@@ -197,10 +160,10 @@ private JPanel getBugExplanationPanel() {
 		if (_explanationPanel == null) {
 			final JScrollPane scrollPane = ScrollPaneFacade.createScrollPane(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 			scrollPane.setViewportView(getExplanationPane());
-			scrollPane.setBorder(BorderFactory.createCompoundBorder(new CustomLineBorder(new JBColor(new Color(208, 206, 203), new Color(170, 168, 165)), 1, 0, 0, 0), new CustomLineBorder(new JBColor(new Color(98, 95, 89), new Color(71, 68, 62)), 1, 0, 0, 0)));
+			//scrollPane.setBorder(BorderFactory.createCompoundBorder(new CustomLineBorder(new JBColor(new Color(208, 206, 203), new Color(170, 168, 165)), 1, 0, 0, 0), new CustomLineBorder(new JBColor(new Color(98, 95, 89), new Color(71, 68, 62)), 1, 0, 0, 0)));
 
 			_explanationPanel = new JPanel();
-			_explanationPanel.setBorder(new EmptyBorder(0, 2, 0, 3));
+			_explanationPanel.setBorder(JBUI.Borders.empty());
 			_explanationPanel.setLayout(new BorderLayout());
 			_explanationPanel.add(scrollPane, BorderLayout.CENTER);
 		}
@@ -212,16 +175,11 @@ private JPanel getBugExplanationPanel() {
 	private JEditorPane getExplanationPane() {
 		if (_explanationPane == null) {
 			_explanationPane = new ExplanationEditorPane();
-			_explanationPane.setBorder(new EmptyBorder(10, 10, 10, 10));
+			_explanationPane.setBorder(JBUI.Borders.empty(10));
 			_explanationPane.setEditable(false);
 			_explanationPane.setContentType("text/html");
 			_explanationPane.setEditorKit(_htmlEditorKit);
-			_explanationPane.addHyperlinkListener(new HyperlinkListener() {
-				@Override
-				public void hyperlinkUpdate(final HyperlinkEvent evt) {
-					editorPaneHyperlinkUpdate(evt);
-				}
-			});
+			_explanationPane.addHyperlinkListener(this::editorPaneHyperlinkUpdate);
 		}
 
 		return _explanationPane;
@@ -389,27 +347,22 @@ void setBugExplanation(final SortedBugCollection bugCollection, final BugInstanc
 
 	private void refreshDetailsShown() {
 		final String html = BugInstanceUtil.getDetailHtml(_lastBugInstance);
-		final StringReader reader = new StringReader(html); // no need for BufferedReader
-		try {
-			_explanationPane.setToolTipText(edu.umd.cs.findbugs.L10N.getLocalString("tooltip.longer_description", "This gives a longer description of the detected bug pattern"));
+		// no need for BufferedReader
+		try (StringReader reader = new StringReader(html)) {
+			_explanationPane.setToolTipText(edu.umd.cs.findbugs.L10N
+					.getLocalString("tooltip.longer_description", "This gives a longer description of the detected bug " +
+																												"pattern"));
 			_explanationPane.read(reader, "html bug description");
 		} catch (final IOException e) {
 			_explanationPane.setText("Could not find bug description: " + e.getMessage());
 			LOGGER.warn(e.getMessage(), e);
-		} finally {
-			reader.close(); // polite, but doesn't do much in StringReader
 		}
 		scrollRectToVisible(_bugDetailsPane);
 	}
 
 	@SuppressWarnings({"AnonymousInnerClass"})
 	private static void scrollRectToVisible(final JEditorPane pane) {
-		SwingUtilities.invokeLater(new Runnable() {
-			@Override
-			public void run() {
-				pane.scrollRectToVisible(new Rectangle(0, 0, 0, 0));
-			}
-		});
+		SwingUtilities.invokeLater(() -> pane.scrollRectToVisible(new Rectangle(0, 0, 0, 0)));
 	}
 
 	void adaptSize(final int width, final int height) {
@@ -460,22 +413,9 @@ public void clear() {
 	}
 
 	public static String createBugsAbbreviation(final DetectorFactory factory) {
-		final StringBuilder sb = new StringBuilder();
 		final Collection<BugPattern> patterns = factory.getReportedBugPatterns();
-		final HashSet<String> abbrs = new LinkedHashSet<String>();
-		for (final BugPattern pattern : patterns) {
-			final String abbr = pattern.getAbbrev();
-			abbrs.add(abbr);
-		}
-		//noinspection ForLoopWithMissingComponent
-		for (final Iterator<String> iter = abbrs.iterator(); iter.hasNext(); ) {
-			final String element = iter.next();
-			sb.append(element);
-			if (iter.hasNext()) {
-				sb.append('|');
-			}
-		}
-		return sb.toString();
+		return patterns.stream().map(BugPattern::getAbbrev)
+				.distinct().collect(Collectors.joining("|"));
 	}
 
 	private static class BugDetailsEditorPane extends JEditorPane {
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/ToolWindowPanel.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/toolwindow/view/ToolWindowPanel.java
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ private FindBugsPluginUtil() {`
`31`	`31`
`32`	`32`	`@NotNull`
`33`	`33`	`public static IdeaPluginDescriptor getIdeaPluginDescriptor() {`
`34`		`- final IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId(FindBugsPluginConstants.PLUGIN_NAME));`
	`34`	`+ final IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId(FindBugsPluginConstants.PLUGIN_ID));`
`35`	`35`	`if (plugin == null) {`
`36`		`- throw new IllegalStateException(FindBugsPluginConstants.PLUGIN_NAME + " could not be instantiated! PluginManager returned null!");`
	`36`	`+ throw new IllegalStateException(FindBugsPluginConstants.PLUGIN_ID + " could not be instantiated! PluginManager returned null!");`
`37`	`37`	`}`
`38`	`38`	`return plugin;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`public final class ToolWindowFactoryImpl implements ToolWindowFactory {`
`30`	`30`	`@Override`
`31`	`31`	`public void createToolWindowContent(@NotNull final Project project, @NotNull final ToolWindow toolWindow) {`
`32`		`- final ToolWindowPanel win = new ToolWindowPanel(project, toolWindow);`
	`32`	`+ final ToolWindowPanel win = new ToolWindowPanel(project);`
`33`	`33`	`toolWindow.getContentManager().addContent(ContentFactory.SERVICE.getInstance().createContent(win, "", false));`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public PropertyChangeListener[] getPropertyChangeListeners() {`
`127`	`127`
`128`	`128`
`129`	`129`	`private void firePCS(final String propertyName, final Object oldValue, final Object newValue) {`
`130`		`- if (!(oldValue != null && newValue != null && oldValue.equals(newValue))) {`
	`130`	`+ if (!(oldValue != null && oldValue.equals(newValue))) {`
`131`	`131`	`pcs.firePropertyChange(propertyName, oldValue, newValue);`
`132`	`132`	`}`
`133`	`133`	`}`