diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/AbstractRefreshablePanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/AbstractRefreshablePanel.java index 93192c6f897a..7eca447bc921 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/AbstractRefreshablePanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/AbstractRefreshablePanel.java @@ -59,7 +59,6 @@ public abstract class AbstractRefreshablePanel implements RefreshablePanel { myTicket = new Ticket(); myDetailsPanel = new DetailsPanel(); myDetailsPanel.loading(); - myDetailsPanel.layout(); } @CalledInAwt @@ -77,7 +76,6 @@ public abstract class AbstractRefreshablePanel implements RefreshablePanel { } myDetailsPanel.loading(); - myDetailsPanel.layout(); } else { refreshPresentation(); } @@ -93,9 +91,7 @@ public abstract class AbstractRefreshablePanel implements RefreshablePanel { @CalledInAwt private void acceptData(final T t) { - final JPanel panel = dataToPresentation(t); - myDetailsPanel.data(panel); - myDetailsPanel.layout(); + myDetailsPanel.data(dataToPresentation(t)); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DetailsPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DetailsPanel.java index 0c41d231298a..e067e6012ae0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DetailsPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DetailsPanel.java @@ -15,68 +15,34 @@ */ package com.intellij.openapi.vcs.changes; +import com.intellij.util.ui.JBUI; import com.intellij.vcsUtil.UIVcsUtil; import javax.swing.*; import java.awt.*; -/** -* Created by IntelliJ IDEA. -* User: Irina.Chernushina -* Date: 9/7/11 -* Time: 2:43 PM -*/ public class DetailsPanel { private CardLayout myLayout; private JPanel myPanel; - private Layer myCurrentLayer; public DetailsPanel() { myPanel = new JPanel(); myLayout = new CardLayout(); myPanel.setLayout(myLayout); - JPanel dataPanel = new JPanel(new BorderLayout()); - - myPanel.add(UIVcsUtil.errorPanel("No details available", false), Layer.notAvailable.name()); - myPanel.add(UIVcsUtil.errorPanel("Nothing selected", false), Layer.nothingSelected.name()); - myPanel.add(UIVcsUtil.errorPanel("Changes content is not loaded yet", false), Layer.notLoadedInitial.name()); myPanel.add(UIVcsUtil.errorPanel("Loading...", false), Layer.loading.name()); - myPanel.add(dataPanel, Layer.data.name()); - } - - public void nothingSelected() { - myCurrentLayer = Layer.nothingSelected; - } - - public void notAvailable() { - myCurrentLayer = Layer.notAvailable; + myPanel.add(JBUI.Panels.simplePanel(), Layer.data.name()); } public void loading() { - myCurrentLayer = Layer.loading; + myLayout.show(myPanel, Layer.loading.name()); } - public void loadingInitial() { - myCurrentLayer = Layer.notLoadedInitial; - } - - public void data(final JPanel panel) { - myCurrentLayer = Layer.data; + public void data(JPanel panel) { myPanel.add(panel, Layer.data.name()); + myLayout.show(myPanel, Layer.data.name()); } - public void layout() { - myLayout.show(myPanel, myCurrentLayer.name()); - } - - public void clear() { - myPanel.removeAll(); - } - - private static enum Layer { - notAvailable, - nothingSelected, - notLoadedInitial, + private enum Layer { loading, data, }