From 87a58c91cd3d692983390e9dfbe2c63ec3256b31 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 18 Feb 2013 13:59:15 +0400
Subject: [PATCH] [diff] Simplify, fix warnings, fix code style.

---
 .../intellij/openapi/diff/impl/DiffSideView.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java
index 30e046c383ff..228106c03db6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java
@@ -160,12 +160,13 @@ public class DiffSideView {
 
     private final EditorMouseAdapter myMouseListener = new EditorMouseAdapter() {
       public void mouseReleased(EditorMouseEvent e) {
-        if (!isEventHandled(e.getMouseEvent())) {
+        if (!isEventHandled(e.getMouseEvent()) || !isInMyArea(e)) {
           return;
         }
-        if (!isInMyArea(e)) return;
         OpenFileDescriptor descriptor = getOpenFileDescriptor(e);
-        if (descriptor == null) return;
+        if (descriptor == null) {
+          return;
+        }
         myContainer.showSource(descriptor);
       }
     };
@@ -180,7 +181,7 @@ public class DiffSideView {
       return myContent.getOpenFileDescriptor(offset);
     }
 
-    private boolean isInMyArea(EditorMouseEvent e) {
+    private static boolean isInMyArea(EditorMouseEvent e) {
       return e.getArea() == EditorMouseEventArea.LINE_NUMBERS_AREA;
     }
 
@@ -205,7 +206,9 @@ public class DiffSideView {
     public static void install(DiffContent content, EditorSource source, DiffSidesContainer container) {
       final Editor editor = source.getEditor();
       Project project = container.getProject();
-      if (project == null) return;
+      if (project == null || editor == null) {
+        return;
+      }
       final MouseLineNumberListener listener = new MouseLineNumberListener(content, editor, container, project);
       editor.addEditorMouseListener(listener.myMouseListener);
       editor.addEditorMouseMotionListener(listener.myMouseMotionListener);