From 354751f0c5ebce9ea6e173b202609fb638abbe29 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Wed, 4 Apr 2012 14:46:20 +0400
Subject: [PATCH] Restore state: change editor, undo, redo, external psi update

---
 .../designer/actions/ProfileAction.java       |  3 ++
 .../AndroidDesignerEditorPanel.java           |  7 ++--
 .../ExternalPSIChangeListener.java            | 36 +++++++++++++++++--
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/plugins/android-designer/src/com/intellij/android/designer/actions/ProfileAction.java b/plugins/android-designer/src/com/intellij/android/designer/actions/ProfileAction.java
index 63d0fd11a555..35838e38e0f0 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/actions/ProfileAction.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/actions/ProfileAction.java
@@ -55,6 +55,7 @@ public class ProfileAction {
       @Override
       public void run() {
         myProfileList.addVersion();
+        myVersion = myProfileList.getVersion();
       }
     });
 
@@ -78,6 +79,8 @@ public class ProfileAction {
           editProfiles();
         }
         else {
+          myProfileList.addVersion();
+          myVersion = myProfileList.getVersion();
           updateActions(item);
         }
         return item != EDIT_PROFILE;
diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
index 7f6306451176..f99533f6836d 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
@@ -81,7 +81,6 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel {
     myPSIChangeListener = new ExternalPSIChangeListener(this, myXmlFile, 100, new Runnable() {
       @Override
       public void run() {
-        System.out.println("=== Full update ===");
         reparseFile();
       }
     });
@@ -92,14 +91,13 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel {
       public void run() {
         myActionPanel.update();
         if (myRootComponent == null) {
-          myPSIChangeListener.start();
+          myPSIChangeListener.activate();
           myPSIChangeListener.addRequest();
         }
         else if (myProfileLastVersion != myProfileAction.getVersion()) {
           myPSIChangeListener.addRequest(new Runnable() {
             @Override
             public void run() {
-              System.out.println("=== Light update ===");
               updateRenderer(true);
             }
           });
@@ -403,11 +401,12 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel {
   @Override
   public void activate() {
     myProfileAction.externalUpdate();
+    myPSIChangeListener.activate();
   }
 
   @Override
   public void deactivate() {
-    // TODO: Auto-generated method stub
+    myPSIChangeListener.deactivate();
   }
 
   @Override
diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java
index 27050d13a41e..7a448d25f5ff 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java
@@ -15,11 +15,16 @@
  */
 package com.intellij.android.designer.designSurface;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
-import com.intellij.psi.*;
+import com.intellij.openapi.util.Computable;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.PsiTreeChangeAdapter;
+import com.intellij.psi.PsiTreeChangeEvent;
 import com.intellij.util.Alarm;
+import com.intellij.util.containers.ComparatorUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -33,6 +38,7 @@ public class ExternalPSIChangeListener extends PsiTreeChangeAdapter {
   private final int myDelayMillis;
   private final Runnable myRunnable;
   private volatile boolean myRunState;
+  private String myContent;
 
   public ExternalPSIChangeListener(JComponent component, PsiFile file, int delayMillis, Runnable runnable) {
     myComponent = component;
@@ -56,6 +62,32 @@ public class ExternalPSIChangeListener extends PsiTreeChangeAdapter {
     }
   }
 
+  public void activate() {
+    if (!myRunState) {
+      start();
+      if (!ComparatorUtil.equalsNullable(myContent, getContent())) {
+        addRequest();
+      }
+      myContent = null;
+    }
+  }
+
+  public void deactivate() {
+    if (myRunState) {
+      stop();
+      myContent = getContent();
+    }
+  }
+
+  private String getContent() {
+    return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
+      @Override
+      public String compute() {
+        return myFile.getText();
+      }
+    });
+  }
+
   private void updatePsi(PsiTreeChangeEvent event) {
     if (myRunState && myFile == event.getFile()) {
       addRequest();