diff --git a/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java index a70254639ba7..94a02fc00993 100644 --- a/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java +++ b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java @@ -102,7 +102,7 @@ public class BreadcrumbsComponent extends JComponent final int offset = myBuffer.getPageOffset(); for (final Crumb each : myCrumbs) { - if (((p.x + offset) >= each.getOffset()) && ((p.x + offset) < (each.getOffset() + each.getWidth()))) { + if (p.x + offset >= each.getOffset() && p.x + offset < each.getOffset() + each.getWidth()) { return each; } } @@ -151,12 +151,12 @@ public class BreadcrumbsComponent extends JComponent @Override public void paint(final Graphics g) { - final Graphics2D g2 = ((Graphics2D)g); + final Graphics2D g2 = (Graphics2D)g; final Dimension d = getSize(); final FontMetrics fm = g2.getFontMetrics(); if (myItems != null) { - final boolean veryDirty = (myCrumbs == null) || (myBuffer != null && !myBuffer.isValid(d.width)); + final boolean veryDirty = myCrumbs == null || myBuffer != null && !myBuffer.isValid(d.width); final List crumbList = veryDirty ? createCrumbList(fm, myItems, d.width) : myCrumbs; if (crumbList != null) { @@ -275,7 +275,7 @@ public class BreadcrumbsComponent extends JComponent screenWidth += first.getWidth(); } - rightmostCrumb = (first != null) ? first : crumb; + rightmostCrumb = first != null ? first : crumb; } result.addFirst(crumb); @@ -675,7 +675,7 @@ public class BreadcrumbsComponent extends JComponent @Override @Nullable Color getBorderColor(@NotNull final Crumb c) { - return (c.isLight() && !c.isHovered() && !(c instanceof NavigationCrumb)) ? LIGHT_BORDER_COLOR : DEFAULT_BORDER_COLOR; + return c.isLight() && !c.isHovered() && !(c instanceof NavigationCrumb) ? LIGHT_BORDER_COLOR : DEFAULT_BORDER_COLOR; } } @@ -757,7 +757,7 @@ public class BreadcrumbsComponent extends JComponent } UIUtil.applyRenderingHints(g2); - g2.drawString(string, offset + ROUND_VALUE, height - fm.getDescent() - 2); + g2.drawString(string, offset + ROUND_VALUE, height - fm.getDescent() - 4); g2.setFont(oldFont); } @@ -765,7 +765,7 @@ public class BreadcrumbsComponent extends JComponent @Override @NotNull Dimension getSize(@NotNull @NonNls final String s, @NotNull final FontMetrics fm, final int maxWidth) { - final int width = fm.stringWidth(s) + (ROUND_VALUE * 2); + final int width = fm.stringWidth(s) + ROUND_VALUE * 2; return new Dimension(width > maxWidth ? maxWidth : width, fm.getHeight() + 4); } }