MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

wrap content to JBUI.Panels

Browse Source
This commit is contained in:
Konstantin Bulenkov
2015-06-29 15:29:17 +02:00
parent 962a8853f4
commit 67eda1b686
4 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/ErrorDiffTool.java
+2 -3
View File
@@ -31,12 +31,12 @@ import com.intellij.openapi.vcs.changes.issueLinks.LinkMouseListenerBase;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.List;
public class ErrorDiffTool implements FrameDiffTool {
@@ -69,8 +69,7 @@ public class ErrorDiffTool implements FrameDiffTool {
myContext = context;
myRequest = request;
myPanel = new JPanel(new BorderLayout());
myPanel.add(createComponent(request), BorderLayout.CENTER);
myPanel = JBUI.Panels.simplePanel(createComponent(request));
}
@NotNull
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffPanel.java
+2 -7
View File
@@ -21,11 +21,11 @@ import com.intellij.diff.tools.util.base.DiffPanelBase;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.project.Project;
import com.intellij.util.ui.AsyncProcessIcon;
import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import static com.intellij.diff.util.DiffUtil.createMessagePanel;
@@ -43,13 +43,8 @@ public class UnifiedDiffPanel extends DiffPanelBase {
@NotNull DataProvider provider,
@NotNull DiffContext context) {
super(project, provider, context);
myBusyIcon = new AsyncProcessIcon.Big("UnifiedDiff");
JPanel centerPanel = new JPanel(new BorderLayout());
centerPanel.add(myNotificationsPanel, BorderLayout.NORTH);
centerPanel.add(content, BorderLayout.CENTER);
JPanel centerPanel = JBUI.Panels.simplePanel(content).addToTop(myNotificationsPanel);
myContentPanel.add(centerPanel, GOOD_CONTENT);
myContentPanel.add(myBusyIcon, LOADING_CONTENT);
myContentPanel.add(createMessagePanel("Can not calculate diff. " + DiffTooBigException.MESSAGE), TOO_BIG_CONTENT);
platform/diff-impl/src/com/intellij/diff/tools/util/SimpleDiffPanel.java
+2 -5
View File
@@ -19,10 +19,10 @@ import com.intellij.diff.DiffContext;
import com.intellij.diff.tools.util.base.DiffPanelBase;
import com.intellij.diff.util.DiffUtil;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
public class SimpleDiffPanel extends DiffPanelBase {
private static final String GOOD_CONTENT = "GoodContent";
@@ -32,10 +32,7 @@ public class SimpleDiffPanel extends DiffPanelBase {
@NotNull DataProvider dataProvider,
@NotNull DiffContext context) {
super(context.getProject(), dataProvider, context);
JPanel centerPanel = new JPanel(new BorderLayout());
centerPanel.add(myNotificationsPanel, BorderLayout.NORTH);
centerPanel.add(editorPanel, BorderLayout.CENTER);
JPanel centerPanel = JBUI.Panels.simplePanel(editorPanel).addToTop(myNotificationsPanel);
myContentPanel.add(centerPanel, GOOD_CONTENT);
myContentPanel.add(DiffUtil.createMessagePanel("Error"), ERROR_CONTENT);
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
+7 -12
View File
@@ -27,12 +27,12 @@ import com.intellij.openapi.ui.OptionAction;
import com.intellij.openapi.ui.ValidationInfo;
import com.intellij.ui.components.labels.ActionLink;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.components.BorderLayoutPanel;
import net.miginfocom.swing.MigLayout;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.List;
@@ -66,20 +66,18 @@ public class VcsPushDialog extends DialogWrapper {
@Override
protected JComponent createCenterPanel() {
JComponent rootPanel = new JPanel(new BorderLayout(0, JBUI.scale(2)));
rootPanel.add(myListPanel, BorderLayout.CENTER);
JPanel optionsPanel = new JPanel(new MigLayout("ins 0 0, flowx"));
for (VcsPushOptionsPanel panel : myAdditionalPanels.values()) {
optionsPanel.add(panel);
}
optionsPanel.setBorder(JBUI.Borders.emptyTop(6));
JPanel panel = new JPanel(new BorderLayout());
panel.add(optionsPanel);
BorderLayoutPanel panel = JBUI.Panels.simplePanel(optionsPanel);
if (!myController.isForcePushEnabled()) {
panel.add(createForcePushInfoLabel(), BorderLayout.NORTH);
panel.addToTop(createForcePushInfoLabel());
}
rootPanel.add(panel, BorderLayout.SOUTH);
return rootPanel;
return JBUI.Panels.simplePanel(0, 2)
.addToCenter(myListPanel)
.addToBottom(panel);
}
@NotNull
@@ -100,10 +98,7 @@ public class VcsPushDialog extends DialogWrapper {
});
here.setFont(JBUI.Fonts.smallFont());
text.add(here);
JPanel wrap = new JPanel(new BorderLayout());
wrap.add(text, BorderLayout.EAST);
wrap.setBorder(JBUI.Borders.emptyBottom(4));
return wrap;
return JBUI.Panels.simplePanel().addToRight(text).withBorder(JBUI.Borders.emptyBottom(4));
}
@Override