Fix #139 relative config causes UI hang.

groboclown · Feb 23, 2017 · 0edd225 · 0edd225
1 parent 57e52f3
commit 0edd225
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/plugin/src/net/groboclown/idea/p4ic/config/part/RelativeConfigCompositePart.java b/plugin/src/net/groboclown/idea/p4ic/config/part/RelativeConfigCompositePart.java
@@ -64,7 +64,9 @@ public boolean equals(Object o) {
 
     public void setName(@Nullable String name) {
         this.name = name;
-        reload();
+
+        // Note: do not reload when the name is set.  This can be costly in terms
+        // of performance.  See #139.
     }
 
     @Nullable

diff --git a/plugin/src/net/groboclown/idea/p4ic/ui/config/props/RelativeConfigPartPanel.java b/plugin/src/net/groboclown/idea/p4ic/ui/config/props/RelativeConfigPartPanel.java
@@ -14,7 +14,6 @@
 
 package net.groboclown.idea.p4ic.ui.config.props;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
@@ -40,20 +39,10 @@ public class RelativeConfigPartPanel
 
     RelativeConfigPartPanel(@NotNull Project project, @NotNull final RelativeConfigCompositePart part) {
         super(project, part);
-        final String name = part.getName();
-        if (name == null) {
-            nameField.setText(DEFAULT_FILE_NAME);
-            // Setting the name will trigger a reload, so do that in the background
-            // See #139
-            ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
-                @Override
-                public void run() {
-                    part.setName(DEFAULT_FILE_NAME);
-                }
-            });
-        } else {
-            nameField.setText(name);
+        if (part.getName() != null) {
+            part.setName(DEFAULT_FILE_NAME);
         }
+        nameField.setText(part.getName());
     }
 
     @Nls
@@ -72,7 +61,7 @@ public JPanel getRootPanel() {
     @Override
     public void updateConfigPartFromUI() {
         getConfigPart().setName(nameField.getText());
-        LOG.info("Set relative config file name to " + getConfigPart().getName());
+        LOG.debug("Set relative config file name to " + getConfigPart().getName());
     }
 
     @NotNull