diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form index 70297f6c5e46..a236930b8592 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form @@ -13,8 +13,8 @@ - - + + @@ -31,23 +31,22 @@ - + - - + - - + + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index 889b45e23b10..8620d7396e97 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -28,6 +28,7 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.ui.components.JBLabel; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -47,7 +48,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura private JTextField myResourcePatternsField; private JCheckBox myCbClearOutputDirectory; private JCheckBox myCbAssertNotNull; - private JLabel myPatternLegendLabel; + private JBLabel myPatternLegendLabel; private JCheckBox myCbAutoShowFirstError; private JCheckBox myCbUseExternalBuild; private JCheckBox myCbEnableAutomake; diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java index ef2bebd366bb..c2c5e408904e 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java @@ -59,7 +59,7 @@ public class ConfigurationArgumentsHelpArea extends JPanel { CopyPasteManager.getInstance().setContents(contents); } }); - myToolbarPanel.add(copyButton, BorderLayout.CENTER); + myToolbarPanel.add(copyButton, BorderLayout.NORTH); myToolbarPanel.setVisible(false); } diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form index 9fff54900ceb..f3656e9f1a7a 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form @@ -267,7 +267,7 @@ - + @@ -275,7 +275,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java index e19198949998..2f3115e0e3af 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java @@ -59,7 +59,7 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor ourRetina = Ref.create(SystemInfo.isMac ? null : false); - private UIUtil() { } + private UIUtil() { + } public static boolean isRetina() { synchronized (ourRetina) { @@ -281,13 +286,15 @@ public class UIUtil { public static void drawLinePickedOut(Graphics graphics, int x, int y, int x1, int y1) { if (x == x1) { int minY = Math.min(y, y1); - int maxY = Math.max(y, y1); - graphics.drawLine(x, minY+1, x1, maxY-1); - } else if (y == y1) { + int maxY = Math.max(y, y1); + graphics.drawLine(x, minY + 1, x1, maxY - 1); + } + else if (y == y1) { int minX = Math.min(x, x1); int maxX = Math.max(x, x1); - graphics.drawLine(minX+1, y, maxX-1, y1); - } else { + graphics.drawLine(minX + 1, y, maxX - 1, y1); + } + else { drawLine(graphics, x, y, x1, y1); } } @@ -327,7 +334,6 @@ public class UIUtil { for (int i = 0; i < subComponentCount; i++) { setEnabled(container.getComponent(i), enabled, recursively); } - } } } @@ -431,7 +437,8 @@ public class UIUtil { public static Color getLabelFontColor(FontColor fontColor) { Color defColor = getLabelForeground(); if (fontColor == FontColor.BRIGHTER) { - return new Color(Math.min(defColor.getRed() + 50, 255), Math.min(defColor.getGreen() + 50, 255), Math.min(defColor.getBlue() + 50, 255)); + return new JBColor(new Color(Math.min(defColor.getRed() + 50, 255), Math.min(defColor.getGreen() + 50, 255), Math.min( + defColor.getBlue() + 50, 255)), defColor.darker()); } return defColor; } @@ -592,8 +599,13 @@ public class UIUtil { LookAndFeel.installBorder(contentPane, "PopupMenu.border"); } - /** @deprecated Motif is gone (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") public static boolean isMotifLookAndFeel() { return false; } + /** + * @deprecated Motif is gone (to remove in IDEA 13) + */ + @SuppressWarnings("UnusedDeclaration") + public static boolean isMotifLookAndFeel() { + return false; + } public static Color getTreeSelectionBorderColor() { return UIManager.getColor("Tree.selectionBorderColor"); @@ -816,11 +828,11 @@ public class UIUtil { } public static Color getTableFocusCellForeground() { - return UIManager.getColor("Table.focusCellForeground"); + return UIManager.getColor("Table.focusCellForeground"); } /** - * @deprecated use com.intellij.util.ui.UIUtil#getPanelBackground() instead + * @deprecated use com.intellij.util.ui.UIUtil#getPanelBackground() instead */ public static Color getPanelBackgound() { return getPanelBackground(); @@ -918,8 +930,13 @@ public class UIUtil { return UIManager.getColor("OptionPane.background"); } - /** @deprecated Quaqua is gone (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") public static boolean isUnderQuaquaLookAndFeel() { return false; } + /** + * @deprecated Quaqua is gone (to remove in IDEA 13) + */ + @SuppressWarnings("UnusedDeclaration") + public static boolean isUnderQuaquaLookAndFeel() { + return false; + } @SuppressWarnings({"HardCodedStringLiteral"}) public static boolean isUnderAlloyLookAndFeel() { @@ -941,8 +958,13 @@ public class UIUtil { return UIManager.getLookAndFeel().getName().equals("Windows Classic"); } - /** @deprecated Metal is gone (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") public static boolean isUnderMetalLookAndFeel() { return false; } + /** + * @deprecated Metal is gone (to remove in IDEA 13) + */ + @SuppressWarnings("UnusedDeclaration") + public static boolean isUnderMetalLookAndFeel() { + return false; + } @SuppressWarnings({"HardCodedStringLiteral"}) public static boolean isUnderNimbusLookAndFeel() { @@ -964,8 +986,13 @@ public class UIUtil { return SystemInfo.isMac && (isUnderAquaLookAndFeel() || isUnderDarcula()); } - /** @deprecated Motif is gone (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") public static boolean isUnderMotif() { return false; } + /** + * @deprecated Motif is gone (to remove in IDEA 13) + */ + @SuppressWarnings("UnusedDeclaration") + public static boolean isUnderMotif() { + return false; + } @SuppressWarnings({"HardCodedStringLiteral"}) public static boolean isUnderDarcula() { @@ -1056,8 +1083,12 @@ public class UIUtil { return !isUnderNativeMacLookAndFeel(); } - /** @deprecated Quaqua is gone (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") public static void removeQuaquaVisualMarginsIn(Component component) { } + /** + * @deprecated Quaqua is gone (to remove in IDEA 13) + */ + @SuppressWarnings("UnusedDeclaration") + public static void removeQuaquaVisualMarginsIn(Component component) { + } public static boolean isControlKeyDown(MouseEvent mouseEvent) { return SystemInfo.isMac ? mouseEvent.isMetaDown() : mouseEvent.isControlDown(); @@ -1182,9 +1213,9 @@ public class UIUtil { } public static void drawSearchMatch(final Graphics2D g, - final int startX, - final int endX, - final int height) { + final int startX, + final int endX, + final int height) { Color c1 = new Color(255, 234, 162); Color c2 = new Color(255, 208, 66); drawSearchMatch(g, startX, endX, height, c1, c2); @@ -1214,8 +1245,8 @@ public class UIUtil { } public static void drawRectPickedOut(Graphics2D g, int x, int y, int w, int h) { - g.drawLine(x+1, y, x+w-1, y); - g.drawLine(x+w, y+1, x+w, y+h-1); + g.drawLine(x + 1, y, x + w - 1, y); + g.drawLine(x + w, y + 1, x + w, y + h - 1); g.drawLine(x + w - 1, y + h, x + 1, y + h); g.drawLine(x, y + 1, x, y + h - 1); } @@ -1290,27 +1321,27 @@ public class UIUtil { g.drawLine(x, drawTopLine ? 1 : 0, width, drawTopLine ? 1 : 0); if (active) { - g.setColor(new Color(100, 150, 230, toolWindow? 50 : 30)); + g.setColor(new Color(100, 150, 230, toolWindow ? 50 : 30)); g.fillRect(x, 0, width, height); } } public static void drawDoubleSpaceDottedLine(final Graphics2D g, - final int start, - final int end, - final int xOrY, - final Color fgColor, - boolean horizontal) { + final int start, + final int end, + final int xOrY, + final Color fgColor, + boolean horizontal) { g.setColor(fgColor); - for (int dot = start; dot < end; dot+=3) { + for (int dot = start; dot < end; dot += 3) { if (horizontal) { g.drawLine(dot, xOrY, dot, xOrY); - } else { + } + else { g.drawLine(xOrY, dot, xOrY, dot); } } - } private static void drawAppleDottedLine(final Graphics2D g, @@ -1423,7 +1454,7 @@ public class UIUtil { if (isRetina()) { return RetinaImage.create(width, height, type); } - //noinspection UndesirableClassUsage + //noinspection UndesirableClassUsage return new BufferedImage(width, height, type); } @@ -1431,7 +1462,10 @@ public class UIUtil { paintWithRetina(size, g, true, paintRoutine); } - public static void paintWithRetina(@NotNull Dimension size, @NotNull Graphics g, boolean useRetinaCondition, Consumer paintRoutine) { + public static void paintWithRetina(@NotNull Dimension size, + @NotNull Graphics g, + boolean useRetinaCondition, + Consumer paintRoutine) { if (!useRetinaCondition || !isRetina() || Registry.is("ide.mac.retina.disableDrawingFix", false)) { paintRoutine.consume((Graphics2D)g); } @@ -1462,7 +1496,7 @@ public class UIUtil { * The whole idea is that XRender-based pipeline doesn't support * {@link AlphaComposite#SRC} and we should use {@link AlphaComposite#SRC_OVER} instead. * - * @param g target graphics container + * @param g target graphics container */ public static void setupComposite(@NotNull Graphics2D g) { g.setComposite(X_RENDER_ACTIVE.getValue() ? AlphaComposite.SrcOver : AlphaComposite.Src); @@ -1611,7 +1645,7 @@ public class UIUtil { @NonNls @Language("HTML") String body = "body, div, td, p {" + fontFamilyAndSize + " " + (fgColor != null ? "color:" + ColorUtil.toHex(fgColor) : "") + "}"; if (resource != null) { - body += "ul {list-style-image: " + resource.toExternalForm() +"}"; + body += "ul {list-style-image: " + resource.toExternalForm() + "}"; } @NonNls String link = linkColor != null ? "a {" + fontFamilyAndSize + " color:" + ColorUtil.toHex(linkColor) + "}" : ""; return ""; @@ -1894,13 +1928,15 @@ public class UIUtil { String each = html.substring(currentPos, currentPos + 1); if ("<".equals(each)) { braces++; - } else if (">".equals(each)) { + } + else if (">".equals(each)) { braces--; } if (" ".equals(each) && braces == 0) { result.append(" "); - } else { + } + else { result.append(each); } currentPos++; @@ -1955,12 +1991,13 @@ public class UIUtil { /** * Avoid blinking while changing background. - * @param component component. - * @param background new background. + * + * @param component component. + * @param background new background. */ public static void changeBackGround(final Component component, final Color background) { final Color oldBackGround = component.getBackground(); - if (background == null || !background.equals(oldBackGround)){ + if (background == null || !background.equals(oldBackGround)) { component.setBackground(background); } } @@ -1974,7 +2011,8 @@ public class UIUtil { ourSystemFontData = Pair.create(font.getName(), font.getSize()); } } - catch (Exception ignored) { } + catch (Exception ignored) { + } } @Nullable @@ -2024,7 +2062,7 @@ public class UIUtil { else if (component != null) { final String str = component.toString(); // skip default Component.toString and handle SimpleColoredComponent case - text = str == null || str.startsWith(component.getClass().getName()+"[")? null : str; + text = str == null || str.startsWith(component.getClass().getName() + "[") ? null : str; } else { text = null; @@ -2046,7 +2084,7 @@ public class UIUtil { try { final Field popup = BasicComboBoxUI.class.getDeclaredField("popup"); popup.setAccessible(true); - return (ComboPopup) popup.get(ui); + return (ComboPopup)popup.get(ui); } catch (NoSuchFieldException e) { return null; @@ -2107,11 +2145,12 @@ public class UIUtil { @SuppressWarnings("deprecation") public static void setComboBoxEditorBounds(int x, int y, int width, int height, JComponent editor) { - if(SystemInfo.isMac && isUnderAquaLookAndFeel()) { + if (SystemInfo.isMac && isUnderAquaLookAndFeel()) { // fix for too wide combobox editor, see AquaComboBoxUI.layoutContainer: // it adds +4 pixels to editor width. WTF?! editor.reshape(x, y, width - 4, height - 1); - } else { + } + else { editor.reshape(x, y, width, height); } } @@ -2354,7 +2393,8 @@ public class UIUtil { if (myDrawShadow) { c = g.getColor(); g.setColor(myShadowColor); - g.drawLine(x - maxBulletWidth[0] - 10, yOffset[0] + fm.getDescent() + 1, x + maxWidth[0] + 10, yOffset[0] + fm.getDescent() + 1); + g.drawLine(x - maxBulletWidth[0] - 10, yOffset[0] + fm.getDescent() + 1, x + maxWidth[0] + 10, + yOffset[0] + fm.getDescent() + 1); g.setColor(c); } } @@ -2387,7 +2427,8 @@ public class UIUtil { Component eachParent = c; while (eachParent != null) { if (eachParent instanceof JComponent) { - @SuppressWarnings({"unchecked"}) WeakReference pane = (WeakReference)((JComponent)eachParent).getClientProperty(ROOT_PANE); + @SuppressWarnings({"unchecked"}) WeakReference pane = + (WeakReference)((JComponent)eachParent).getClientProperty(ROOT_PANE); if (pane != null) return pane.get(); } eachParent = eachParent.getParent(); @@ -2407,7 +2448,7 @@ public class UIUtil { } public static Timer createNamedTimer(@NonNls @NotNull final String name, int delay, @NotNull ActionListener listener) { - return new Timer(delay, listener){ + return new Timer(delay, listener) { @Override public String toString() { return name; @@ -2424,7 +2465,7 @@ public class UIUtil { } @Nullable - public static JComponent mergeComponentsWithAnchor(PanelWithAnchor...panels) { + public static JComponent mergeComponentsWithAnchor(PanelWithAnchor... panels) { return mergeComponentsWithAnchor(Arrays.asList(panels)); } @@ -2514,7 +2555,8 @@ public class UIUtil { pixelGrabber.grabPixels(); return new Color(pixels[0]); } - catch (InterruptedException ignored) { } + catch (InterruptedException ignored) { + } } return null; @@ -2533,6 +2575,7 @@ public class UIUtil { private static final Color DECORATED_ROW_BG_COLOR = new Color(242, 245, 249); private static final Color DECORATED_ROW_BG_COLOR_DARK = Gray._75; + public static Color getDecoratedRowColor() { return isUnderDarcula() ? DECORATED_ROW_BG_COLOR_DARK : DECORATED_ROW_BG_COLOR; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java index c68f39de4839..0e66b22634f4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java @@ -22,6 +22,7 @@ import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.vcs.ChangeListColumn; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsException; @@ -159,17 +160,13 @@ public class CommittedChangesBrowser extends JPanel { myLeftPanel.add(forwardButton, new GridBagConstraints(1, 1, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2,2,2,2), 0, 0)); } - JSplitPane leftSplitter = new JSplitPane(JSplitPane.VERTICAL_SPLIT); - leftSplitter.setTopComponent(myLeftPanel); - leftSplitter.setBottomComponent(commitPanel); - leftSplitter.setDividerLocation(0.8); - leftSplitter.setResizeWeight(0.8); + Splitter leftSplitter = new Splitter(true, 0.8f); + leftSplitter.setFirstComponent(myLeftPanel); + leftSplitter.setSecondComponent(commitPanel); - JSplitPane splitter = new JSplitPane(); - splitter.setLeftComponent(leftSplitter); - splitter.setRightComponent(myChangesView); - splitter.setDividerLocation(0.5); - splitter.setResizeWeight(0.5); + Splitter splitter = new Splitter(false, 0.5f); + splitter.setFirstComponent(leftSplitter); + splitter.setSecondComponent(myChangesView); add(splitter, BorderLayout.CENTER); diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java index 4619fea620e8..65a4d454e864 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java @@ -25,7 +25,6 @@ import java.awt.*; * @author Evgeny Zakrevsky */ public class TaskCellRenderer extends DefaultListCellRenderer implements MatcherHolder { - private static final Color ISSUE_BG_COLOR = new Color(240, 240, 255); private Matcher myMatcher; private final Project myProject; @@ -47,7 +46,7 @@ public class TaskCellRenderer extends DefaultListCellRenderer implements Matcher final boolean isLocalTask = taskManager.findTask(task.getId()) != null; final boolean isClosed = task.isClosed() || (task instanceof LocalTask && taskManager.isLocallyClosed((LocalTask)task)); - final Color bg = sel ? UIUtil.getListSelectionBackground() : isLocalTask ? UIUtil.getListBackground() : ISSUE_BG_COLOR; + final Color bg = sel ? UIUtil.getListSelectionBackground() : isLocalTask ? UIUtil.getListBackground() : UIUtil.getDecoratedRowColor(); panel.setBackground(bg); SimpleTextAttributes attr = getAttributes(sel, isClosed); diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form index 595bc4f4a2d0..9a070abb8670 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form @@ -8,7 +8,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -71,10 +71,11 @@ + - + @@ -125,11 +126,11 @@ - + - + @@ -145,11 +146,11 @@ - + - + diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/assembla/AssemblaRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/assembla/AssemblaRepository.java index 2d47980a21e4..ec0e4b1a676b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/assembla/AssemblaRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/assembla/AssemblaRepository.java @@ -74,4 +74,9 @@ public class AssemblaRepository extends GenericRepository { public String getPresentableName() { return StringUtil.isEmpty(getUsername()) ? "" : getUsername() + "'s tickets"; } + + @Override + public boolean isConfigured() { + return super.isConfigured() && StringUtil.isNotEmpty(getUsername()) && StringUtil.isNotEmpty(getPassword()); + } }