github
/
darklaf
mirror of https://github.com/weisJ/darklaf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated formatting rules.

pull/142/head
weisj 5 years ago
parent
58570fbd63
commit
aac2984a6f
65 changed files with 279 additions and 383 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      core/src/main/java/com/github/weisj/darklaf/color/DarkColorModelHSL.java
  2. 4
      core/src/main/java/com/github/weisj/darklaf/components/tabframe/PanelPopup.java
  3. 4
      core/src/main/java/com/github/weisj/darklaf/components/tabframe/ToggleSplitPane.java
  4. 8
      core/src/main/java/com/github/weisj/darklaf/components/tooltip/ToolTipContext.java
  5. 18
      core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsPanel.java
  6. 6
      core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonBorder.java
  7. 6
      core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
  8. 4
      core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorValueFormatter.java
  9. 2
      core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java
  10. 4
      core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/SlideComponent.java
  11. 6
      core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
  12. 6
      core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFileChooserUIBridge.java
  13. 10
      core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFilePaneUIBridge.java
  14. 2
      core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/DarkPopupMenuUI.java
  15. 2
      core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkRootPaneUI.java
  16. 2
      core/src/main/java/com/github/weisj/darklaf/ui/scrollpane/DarkScrollPaneUI.java
  17. 6
      core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
  18. 4
      core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerBorder.java
  19. 8
      core/src/main/java/com/github/weisj/darklaf/ui/splitpane/DarkSplitPaneDivider.java
  20. 14
      core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneScrollLayout.java
  21. 26
      core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUIBridge.java
  22. 8
      core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneLayout.java
  23. 2
      core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneTransferHandler.java
  24. 4
      core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkPanelPopupUI.java
  25. 8
      core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabContainerUI.java
  26. 18
      core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabLabelUI.java
  27. 4
      core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabbedPopupUI.java
  28. 4
      core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableHeaderUI.java
  29. 4
      core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableHeaderUIBridge.java
  30. 6
      core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableUI.java
  31. 4
      core/src/main/java/com/github/weisj/darklaf/ui/table/TableUIBridge.java
  32. 2
      core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextBorder.java
  33. 8
      core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextFieldUI.java
  34. 6
      core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/StateIconUI.java
  35. 2
      core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/tristate/DarkTristateCheckBoxMenuItemUI.java
  36. 2
      core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/tristate/DarkTristateCheckBoxUI.java
  37. 2
      core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkTooltipUI.java
  38. 2
      core/src/main/java/com/github/weisj/darklaf/ui/tooltip/ToolTipUtil.java
  39. 8
      core/src/main/java/com/github/weisj/darklaf/ui/tree/DarkTreeUI.java
  40. 2
      core/src/main/java/com/github/weisj/darklaf/util/GraphicsContext.java
  41. 6
      core/src/main/java/com/github/weisj/darklaf/util/GraphicsUtil.java
  42. 4
      core/src/main/java/com/github/weisj/darklaf/util/ImageUtil.java
  43. 2
      core/src/test/java/icon/IconDemo.java
  44. 2
      core/src/test/java/ui/button/ButtonDemo.java
  45. 2
      core/src/test/java/ui/button/ToggleButtonDemo.java
  46. 2
      core/src/test/java/ui/checkBox/CheckBoxDemo.java
  47. 2
      core/src/test/java/ui/checkBox/TriCheckBoxDemo.java
  48. 5
      core/src/test/java/ui/comboBox/ComboBoxDemo.java
  49. 2
      core/src/test/java/ui/label/LabelDemo.java
  50. 5
      core/src/test/java/ui/progressBar/ProgressBarDemo.java
  51. 2
      core/src/test/java/ui/radioButton/RadioButtonDemo.java
  52. 5
      core/src/test/java/ui/scrollPane/ScrollPaneDemo.java
  53. 8
      core/src/test/java/ui/slider/SliderDemo.java
  54. 4
      core/src/test/java/ui/spinner/SpinnerDemo.java
  55. 5
      core/src/test/java/ui/tabbedPane/TabbedPaneDemo.java
  56. 2
      core/src/test/java/ui/table/TableDemo.java
  57. 5
      core/src/test/java/ui/text/PasswordFieldDemo.java
  58. 5
      core/src/test/java/ui/text/TextFieldDemo.java
  59. 2
      core/src/test/java/ui/tree/TreeDemo.java
  60. 324
      darklaf_java.eclipseformat.xml
  61. 8
      property-loader/src/main/java/com/github/weisj/darklaf/PropertyLoader.java
  62. 6
      property-loader/src/main/java/com/github/weisj/darklaf/icons/StateIcon.java
  63. 2
      theme/src/main/java/com/github/weisj/darklaf/theme/info/DefaultThemeProvider.java
  64. 2
      windows/src/main/java/com/github/weisj/darklaf/platform/windows/PointerUtil.java
  65. 8
      windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java

4
core/src/main/java/com/github/weisj/darklaf/color/DarkColorModelHSL.java
Unescape View File

@ -88,8 +88,8 @@ public class DarkColorModelHSL extends DarkColorModel {
double saturation = (max - min); double saturation = (max - min);
if (saturation > 0.0f) { if (saturation > 0.0f) {
saturation /= (summa > 1.0f) saturation /= (summa > 1.0f)
? 2.0f - summa ? 2.0f - summa
: summa; : summa;
} }
return new double[]{ return new double[]{
getHue(r / 255.0, g / 255.0, b / 255.0, max, min), getHue(r / 255.0, g / 255.0, b / 255.0, max, min),

4
core/src/main/java/com/github/weisj/darklaf/components/tabframe/PanelPopup.java
Unescape View File

@ -177,8 +177,8 @@ public class PanelPopup extends JPanel implements TabFramePopup {
public void setAlignment(final Alignment alignment) { public void setAlignment(final Alignment alignment) {
if (alignment == null || this.alignment == Alignment.CENTER) { if (alignment == null || this.alignment == Alignment.CENTER) {
throw new IllegalArgumentException("Illegal alignment: " + (alignment != null throw new IllegalArgumentException("Illegal alignment: " + (alignment != null
? alignment.toString() ? alignment.toString()
: "null")); : "null"));
} }
Alignment old = this.alignment; Alignment old = this.alignment;
this.alignment = alignment; this.alignment = alignment;

4
core/src/main/java/com/github/weisj/darklaf/components/tabframe/ToggleSplitPane.java
Unescape View File

@ -175,7 +175,7 @@ public class ToggleSplitPane extends JSplitPane {
public int getMinimumDividerLocation() { public int getMinimumDividerLocation() {
Component comp = getRightComponent(); Component comp = getRightComponent();
return comp == null ? 0 : getOrientation() == HORIZONTAL_SPLIT return comp == null ? 0 : getOrientation() == HORIZONTAL_SPLIT
? comp.getMinimumSize().width ? comp.getMinimumSize().width
: comp.getMinimumSize().height; : comp.getMinimumSize().height;
} }
} }

8
core/src/main/java/com/github/weisj/darklaf/components/tooltip/ToolTipContext.java
Unescape View File

@ -371,8 +371,8 @@ public class ToolTipContext {
if (toolTip != null) { if (toolTip != null) {
toolTip.putClientProperty(DarkTooltipUI.KEY_POINTER_LOCATION, toolTip.putClientProperty(DarkTooltipUI.KEY_POINTER_LOCATION,
alignment == Alignment.CENTER alignment == Alignment.CENTER
? centerAlignment.opposite() ? centerAlignment.opposite()
: alignInside ? alignment : alignment.opposite()); : alignInside ? alignment : alignment.opposite());
toolTip.putClientProperty(DarkTooltipUI.KEY_INSETS, insets); toolTip.putClientProperty(DarkTooltipUI.KEY_INSETS, insets);
toolTip.putClientProperty(DarkTooltipUI.KEY_STYLE, style); toolTip.putClientProperty(DarkTooltipUI.KEY_STYLE, style);
toolTip.doLayout(); toolTip.doLayout();
@ -482,9 +482,9 @@ public class ToolTipContext {
mousePoint = alignCenter(dim, mRect); mousePoint = alignCenter(dim, mRect);
} else { } else {
compPoint = alignInside ? alignInside(dim, rect) compPoint = alignInside ? alignInside(dim, rect)
: alignOutside(dim, rect); : alignOutside(dim, rect);
mousePoint = alignInside ? alignInside(dim, mRect) mousePoint = alignInside ? alignInside(dim, mRect)
: alignOutside(dim, mRect); : alignOutside(dim, mRect);
} }
return alignmentStrategy.align(compPoint, mousePoint); return alignmentStrategy.align(compPoint, mousePoint);

18
core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsPanel.java
Unescape View File

@ -156,7 +156,7 @@ public class ThemeSettingsPanel extends JPanel {
} }
if (ignoreSettings || isFontSizeFollowsSystem()) { if (ignoreSettings || isFontSizeFollowsSystem()) {
setFontSizeRule(isFontSizeFollowsSystem() ? theme.getFontSizeRule() setFontSizeRule(isFontSizeFollowsSystem() ? theme.getFontSizeRule()
: currentTheme.getFontSizeRule()); : currentTheme.getFontSizeRule());
} }
if (ignoreSettings || isAccentColorFollowsSystem()) { if (ignoreSettings || isAccentColorFollowsSystem()) {
setAccentColor(getAccentColor(isAccentColorFollowsSystem() ? theme : currentTheme, true)); setAccentColor(getAccentColor(isAccentColorFollowsSystem() ? theme : currentTheme, true));
@ -349,8 +349,8 @@ public class ThemeSettingsPanel extends JPanel {
protected Theme getTheme(final PreferredThemeStyle preferredThemeStyle) { protected Theme getTheme(final PreferredThemeStyle preferredThemeStyle) {
return isThemeFollowsSystem() return isThemeFollowsSystem()
? LafManager.themeForPreferredStyle(preferredThemeStyle) ? LafManager.themeForPreferredStyle(preferredThemeStyle)
: (Theme) themeComboBox.getSelectedItem(); : (Theme) themeComboBox.getSelectedItem();
} }
public FontSizeRule getFontSizeRule() { public FontSizeRule getFontSizeRule() {
@ -361,8 +361,8 @@ public class ThemeSettingsPanel extends JPanel {
protected FontSizeRule getFontSizeRule(final Theme theme, final PreferredThemeStyle preferredThemeStyle) { protected FontSizeRule getFontSizeRule(final Theme theme, final PreferredThemeStyle preferredThemeStyle) {
if (theme == null) return FontSizeRule.getDefault(); if (theme == null) return FontSizeRule.getDefault();
return isFontSizeFollowsSystem() return isFontSizeFollowsSystem()
? preferredThemeStyle.getFontSizeRule() ? preferredThemeStyle.getFontSizeRule()
: FontSizeRule.relativeAdjustment(fontSlider.getValue()); : FontSizeRule.relativeAdjustment(fontSlider.getValue());
} }
public AccentColorRule getAccentColorRule() { public AccentColorRule getAccentColorRule() {
@ -379,14 +379,14 @@ public class ThemeSettingsPanel extends JPanel {
protected Color getAccentColor(final Theme theme, final boolean useThemeColor) { protected Color getAccentColor(final Theme theme, final boolean useThemeColor) {
return theme.supportsCustomAccentColor() ? useThemeColor ? theme.getAccentColorRule().getAccentColor() return theme.supportsCustomAccentColor() ? useThemeColor ? theme.getAccentColorRule().getAccentColor()
: getSelectedColor(bgAccent, defaultAccent) : getSelectedColor(bgAccent, defaultAccent)
: null; : null;
} }
protected Color getSelectionColor(final Theme theme, final boolean useThemeColor) { protected Color getSelectionColor(final Theme theme, final boolean useThemeColor) {
return theme.supportsCustomSelectionColor() ? useThemeColor ? theme.getAccentColorRule().getSelectionColor() return theme.supportsCustomSelectionColor() ? useThemeColor ? theme.getAccentColorRule().getSelectionColor()
: getSelectedColor(bgSelection, defaultSelection) : getSelectedColor(bgSelection, defaultSelection)
: null; : null;
} }
public void setEnabledSystemPreferences(final boolean enabled) { public void setEnabledSystemPreferences(final boolean enabled) {

6
core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonBorder.java
Unescape View File

@ -279,9 +279,9 @@ public class DarkButtonBorder implements Border, UIResource {
int shadow = shadowVariant ? 0 : getShadowSize(); int shadow = shadowVariant ? 0 : getShadowSize();
boolean square = ButtonConstants.isSquare(c); boolean square = ButtonConstants.isSquare(c);
Insets pad = ButtonConstants.isThin(c) ? square ? squareThinInsets Insets pad = ButtonConstants.isThin(c) ? square ? squareThinInsets
: thinInsets : thinInsets
: square ? squareInsets : square ? squareInsets
: insets; : insets;
return maskInsets(new InsetsUIResource(pad.top, pad.left, pad.bottom, pad.right), c, shadow); return maskInsets(new InsetsUIResource(pad.top, pad.left, pad.bottom, pad.right), c, shadow);
} }

6
core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
Unescape View File

@ -371,7 +371,7 @@ public class DarkButtonUI extends BasicButtonUI implements ButtonConstants {
Object colorClick = c.getClientProperty(KEY_CLICK_COLOR); Object colorClick = c.getClientProperty(KEY_CLICK_COLOR);
boolean armed = c.getModel().isArmed(); boolean armed = c.getModel().isArmed();
return armed ? colorClick instanceof Color ? (Color) colorClick : borderlessClick return armed ? colorClick instanceof Color ? (Color) colorClick : borderlessClick
: colorHover instanceof Color ? (Color) colorHover : borderlessHover; : colorHover instanceof Color ? (Color) colorHover : borderlessHover;
} }
protected Color getBorderlessOutline(final AbstractButton c) { protected Color getBorderlessOutline(final AbstractButton c) {
@ -409,8 +409,8 @@ public class DarkButtonUI extends BasicButtonUI implements ButtonConstants {
b.getVerticalTextPosition(), b.getHorizontalTextPosition(), b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
viewRect, iconRect, textRect, viewRect, iconRect, textRect,
b.getText() == null || ButtonConstants.isIconOnly(b) b.getText() == null || ButtonConstants.isIconOnly(b)
? 0 ? 0
: b.getIconTextGap()); : b.getIconTextGap());
} }
@Override @Override

4
core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorValueFormatter.java
Unescape View File

@ -218,8 +218,8 @@ public final class ColorValueFormatter extends JFormattedTextField.AbstractForma
int b = Integer.valueOf(hexStr.substring(4, 6), 16); int b = Integer.valueOf(hexStr.substring(4, 6), 16);
checkRange(b, 0, 255); checkRange(b, 0, 255);
int alpha = hexStr.length() >= 8 int alpha = hexStr.length() >= 8
? Integer.valueOf(hexStr.substring(6, 8), 16) ? Integer.valueOf(hexStr.substring(6, 8), 16)
: 255; : 255;
checkRange(alpha, 0, 255); checkRange(alpha, 0, 255);
return new Color(r, g, b, alpha); return new Color(r, g, b, alpha);
} else { } else {

2
core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java
Unescape View File

@ -127,7 +127,7 @@ public class DarkColorChooserPanel extends AbstractColorChooserPanel implements
try { try {
String hexStr = String.format("%1$-" + 8 + "s", textHex.getText()).replaceAll(" ", "F"); String hexStr = String.format("%1$-" + 8 + "s", textHex.getText()).replaceAll(" ", "F");
int alpha = isColorTransparencySelectionEnabled() int alpha = isColorTransparencySelectionEnabled()
? Integer.valueOf(hexStr.substring(6, 8), 16) : 255; ? Integer.valueOf(hexStr.substring(6, 8), 16) : 255;
return new Color(Integer.valueOf(hexStr.substring(0, 2), 16), return new Color(Integer.valueOf(hexStr.substring(0, 2), 16),
Integer.valueOf(hexStr.substring(2, 4), 16), Integer.valueOf(hexStr.substring(2, 4), 16),
Integer.valueOf(hexStr.substring(4, 6), 16), Integer.valueOf(hexStr.substring(4, 6), 16),

4
core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/SlideComponent.java
Unescape View File

@ -261,13 +261,13 @@ class SlideComponent extends JComponent implements ColorListener {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return vertical ? new Dimension(22, 100) return vertical ? new Dimension(22, 100)
: new Dimension(100, 22); : new Dimension(100, 22);
} }
@Override @Override
public Dimension getMinimumSize() { public Dimension getMinimumSize() {
return vertical ? new Dimension(22, 50) return vertical ? new Dimension(22, 50)
: new Dimension(50, 22); : new Dimension(50, 22);
} }
@Override @Override

6
core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
Unescape View File

@ -305,9 +305,9 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements ComboBoxConstants
// calculate the width and height of the button // calculate the width and height of the button
int buttonHeight = size.height; int buttonHeight = size.height;
int buttonWidth = squareButton int buttonWidth = squareButton
? buttonHeight ? buttonHeight
: arrowButton.getPreferredSize().width : arrowButton.getPreferredSize().width
+ arrowButton.getInsets().left + arrowButton.getInsets().right; + arrowButton.getInsets().left + arrowButton.getInsets().right;
// adjust the size based on the button width // adjust the size based on the button width
size.height += insets.top + insets.bottom; size.height += insets.top + insets.bottom;
size.width += insets.left + insets.right + buttonWidth; size.width += insets.left + insets.right + buttonWidth;

6
core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFileChooserUIBridge.java
Unescape View File

@ -926,8 +926,8 @@ public abstract class DarkFileChooserUIBridge extends BasicFileChooserUI {
directories.clear(); directories.clear();
File[] baseFolders = (useShellFolder) File[] baseFolders = (useShellFolder)
? (File[]) ShellFolder.get("fileChooserComboBoxFolders") ? (File[]) ShellFolder.get("fileChooserComboBoxFolders")
: fsv.getRoots(); : fsv.getRoots();
directories.addAll(Arrays.asList(baseFolders)); directories.addAll(Arrays.asList(baseFolders));
// Get the canonical (full) path. This has the side // Get the canonical (full) path. This has the side
@ -944,7 +944,7 @@ public abstract class DarkFileChooserUIBridge extends BasicFileChooserUI {
// create File instances of each directory leading up to the top // create File instances of each directory leading up to the top
try { try {
File sf = useShellFolder ? ShellFolder.getShellFolder(canonical) File sf = useShellFolder ? ShellFolder.getShellFolder(canonical)
: canonical; : canonical;
File f = sf; File f = sf;
Vector<File> path = new Vector<>(10); Vector<File> path = new Vector<>(10);
do { do {

10
core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFilePaneUIBridge.java
Unescape View File

@ -350,7 +350,7 @@ public abstract class DarkFilePaneUIBridge extends JPanel implements PropertyCha
Boolean prop = (Boolean) chooser.getClientProperty("FileChooser.useShellFolder"); Boolean prop = (Boolean) chooser.getClientProperty("FileChooser.useShellFolder");
return prop == null ? chooser.getFileSystemView().equals(FileSystemView.getFileSystemView()) return prop == null ? chooser.getFileSystemView().equals(FileSystemView.getFileSystemView())
: prop; : prop;
} }
public void uninstallUI() { public void uninstallUI() {
@ -1275,8 +1275,8 @@ public abstract class DarkFilePaneUIBridge extends JPanel implements PropertyCha
return f.isDirectory() ? null : f.length(); return f.isDirectory() ? null : f.length();
} }
return (col == COLUMN_FILENAME) return (col == COLUMN_FILENAME)
? f // always return the file itself for the 1st column ? f // always return the file itself for the 1st column
: ShellFolder.getFolderColumnValue(f, columnMap[col]); : ShellFolder.getFolderColumnValue(f, columnMap[col]);
} }
public void intervalAdded(final ListDataEvent e) { public void intervalAdded(final ListDataEvent e) {
@ -1453,8 +1453,8 @@ public abstract class DarkFilePaneUIBridge extends JPanel implements PropertyCha
Integer alignment = columnInfo.getAlignment(); Integer alignment = columnInfo.getAlignment();
if (alignment == null) { if (alignment == null) {
alignment = (value instanceof Number) alignment = (value instanceof Number)
? SwingConstants.RIGHT ? SwingConstants.RIGHT
: SwingConstants.LEADING; : SwingConstants.LEADING;
} }
setHorizontalAlignment(alignment); setHorizontalAlignment(alignment);

2
core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/DarkPopupMenuUI.java
Unescape View File

@ -168,7 +168,7 @@ public class DarkPopupMenuUI extends BasicPopupMenuUI {
invoker = ((JPopupMenu) invoker).getInvoker(); invoker = ((JPopupMenu) invoker).getInvoker();
} }
grabbedWindow = (invoker == null) ? null : ((invoker instanceof Window) ? (Window) invoker grabbedWindow = (invoker == null) ? null : ((invoker instanceof Window) ? (Window) invoker
: SwingUtilities.getWindowAncestor(invoker)); : SwingUtilities.getWindowAncestor(invoker));
if (grabbedWindow != null) { if (grabbedWindow != null) {
if (tk instanceof sun.awt.SunToolkit) { if (tk instanceof sun.awt.SunToolkit) {
((sun.awt.SunToolkit) tk).grab(grabbedWindow); ((sun.awt.SunToolkit) tk).grab(grabbedWindow);

2
core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkRootPaneUI.java
Unescape View File

@ -144,7 +144,7 @@ public class DarkRootPaneUI extends BasicRootPaneUI implements HierarchyListener
private void installClientDecorations(final JRootPane root) { private void installClientDecorations(final JRootPane root) {
updateWindow(rootPane.getParent()); updateWindow(rootPane.getParent());
int style = decorationsStyleFromWindow(window, windowDecorationsStyle < 0 ? root.getWindowDecorationStyle() int style = decorationsStyleFromWindow(window, windowDecorationsStyle < 0 ? root.getWindowDecorationStyle()
: windowDecorationsStyle); : windowDecorationsStyle);
CustomTitlePane titlePane = DecorationsHandler.getSharedInstance().createTitlePane(root, style, window); CustomTitlePane titlePane = DecorationsHandler.getSharedInstance().createTitlePane(root, style, window);
installLayout(root); installLayout(root);
setTitlePane(root, titlePane); setTitlePane(root, titlePane);

2
core/src/main/java/com/github/weisj/darklaf/ui/scrollpane/DarkScrollPaneUI.java
Unescape View File

@ -65,7 +65,7 @@ public class DarkScrollPaneUI extends BasicScrollPaneUI {
return; return;
} }
JScrollBar scrollbar = e.isShiftDown() ? scrollpane.getHorizontalScrollBar() JScrollBar scrollbar = e.isShiftDown() ? scrollpane.getHorizontalScrollBar()
: scrollpane.getVerticalScrollBar(); : scrollpane.getVerticalScrollBar();
scrollbar.setValueIsAdjusting(true); scrollbar.setValueIsAdjusting(true);
ScrollBarUtil.doScroll(scrollbar, scrollpane.getViewport(), e, ScrollBarUtil.doScroll(scrollbar, scrollpane.getViewport(), e,
scrollpane.getComponentOrientation().isLeftToRight()); scrollpane.getComponentOrientation().isLeftToRight());

6
core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
Unescape View File

@ -340,8 +340,8 @@ public class DarkSliderUI extends BasicSliderUI implements PropertyChangeListene
return new Dimension(plainThumbRadius + 6, plainThumbRadius + 6); return new Dimension(plainThumbRadius + 6, plainThumbRadius + 6);
} }
return isHorizontal() return isHorizontal()
? new Dimension(thumbSize.width, thumbSize.height) ? new Dimension(thumbSize.width, thumbSize.height)
: new Dimension(thumbSize.height, thumbSize.width); : new Dimension(thumbSize.height, thumbSize.width);
} }
@Override @Override
@ -818,7 +818,7 @@ public class DarkSliderUI extends BasicSliderUI implements PropertyChangeListene
private int getSnappedValue(final MouseEvent e) { private int getSnappedValue(final MouseEvent e) {
int value = isHorizontal() ? valueForXPosition(e.getX()) int value = isHorizontal() ? valueForXPosition(e.getX())
: valueForYPosition(e.getY()); : valueForYPosition(e.getY());
return DarkSliderUI.this.getSnappedValue(value); return DarkSliderUI.this.getSnappedValue(value);
} }
} }

4
core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerBorder.java
Unescape View File

@ -78,8 +78,8 @@ public class DarkSpinnerBorder implements Border, UIResource {
JComponent editor = spinner.getEditor(); JComponent editor = spinner.getEditor();
if (editor != null) { if (editor != null) {
int off = spinner.getComponentOrientation().isLeftToRight() int off = spinner.getComponentOrientation().isLeftToRight()
? editor.getBounds().x + editor.getWidth() ? editor.getBounds().x + editor.getWidth()
: editor.getBounds().x - 1 - borderSize; : editor.getBounds().x - 1 - borderSize;
g.setColor(getBorderColor(spinner)); g.setColor(getBorderColor(spinner));
if (!treeCellEditor) { if (!treeCellEditor) {
g.fillRect(off, size, 1, height - 2 * size); g.fillRect(off, size, 1, height - 2 * size);

8
core/src/main/java/com/github/weisj/darklaf/ui/splitpane/DarkSplitPaneDivider.java
Unescape View File

@ -149,8 +149,8 @@ public class DarkSplitPaneDivider extends BasicSplitPaneDivider {
public Icon getIcon() { public Icon getIcon() {
if (splitPane != null) { if (splitPane != null) {
return splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT return splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT
? getRightOneTouchIcon() ? getRightOneTouchIcon()
: getBottomOneTouchIcon(); : getBottomOneTouchIcon();
} }
return EmptyIcon.create(0); return EmptyIcon.create(0);
} }
@ -161,8 +161,8 @@ public class DarkSplitPaneDivider extends BasicSplitPaneDivider {
public Icon getIcon() { public Icon getIcon() {
if (splitPane != null) { if (splitPane != null) {
return splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT return splitPane.getOrientation() == JSplitPane.HORIZONTAL_SPLIT
? getLeftOneTouchIcon() ? getLeftOneTouchIcon()
: getTopOneTouchIcon(); : getTopOneTouchIcon();
} }
return EmptyIcon.create(0); return EmptyIcon.create(0);
} }

14
core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneScrollLayout.java
Unescape View File

@ -146,12 +146,12 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
int vw = tw; int vw = tw;
int vh = th; int vh = th;
Dimension butSize = moreTabs.isVisible() Dimension butSize = moreTabs.isVisible()
? moreTabs.getPreferredSize() ? moreTabs.getPreferredSize()
: new Dimension(0, 0); : new Dimension(0, 0);
boolean showNewTabButton = newTab.isVisible() && newTab.getParent() == ui.tabPane; boolean showNewTabButton = newTab.isVisible() && newTab.getParent() == ui.tabPane;
Dimension butSize2 = showNewTabButton Dimension butSize2 = showNewTabButton
? newTab.getPreferredSize() ? newTab.getPreferredSize()
: new Dimension(0, 0); : new Dimension(0, 0);
boolean leftToRight = ui.tabPane.getComponentOrientation().isLeftToRight(); boolean leftToRight = ui.tabPane.getComponentOrientation().isLeftToRight();
if (tabPlacement == SwingConstants.LEFT || tabPlacement == SwingConstants.RIGHT) { if (tabPlacement == SwingConstants.LEFT || tabPlacement == SwingConstants.RIGHT) {
vh = th - butSize.height - butSize2.height; vh = th - butSize.height - butSize2.height;
@ -311,8 +311,8 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
JButton tabsButton = ui.scrollableTabSupport.moreTabsButton; JButton tabsButton = ui.scrollableTabSupport.moreTabsButton;
Rectangle selectedBounds = ui.tabPane.getSelectedIndex() > 0 Rectangle selectedBounds = ui.tabPane.getSelectedIndex() > 0
? new Rectangle(ui.rects[ui.tabPane.getSelectedIndex()]) ? new Rectangle(ui.rects[ui.tabPane.getSelectedIndex()])
: new Rectangle(0, 0, 0, 0); : new Rectangle(0, 0, 0, 0);
if (!verticalTabRuns) { if (!verticalTabRuns) {
int rightMargin = size.width - (insets.right + tabAreaInsets.right int rightMargin = size.width - (insets.right + tabAreaInsets.right
+ insets.left + tabAreaInsets.left); + insets.left + tabAreaInsets.left);
@ -663,7 +663,7 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
int maxStart = ui.maxVisible < 0 || ui.maxVisible >= tabCount ? tabCount - 1 : ui.maxVisible; int maxStart = ui.maxVisible < 0 || ui.maxVisible >= tabCount ? tabCount - 1 : ui.maxVisible;
int currShift = isX ? ui.currentShiftXTmp + shift : ui.currentShiftYTmp + shift; int currShift = isX ? ui.currentShiftXTmp + shift : ui.currentShiftYTmp + shift;
Function<Integer, Boolean> isVisible = isX ? (i -> isVisibleX(i, currShift, minVal, returnAt)) Function<Integer, Boolean> isVisible = isX ? (i -> isVisibleX(i, currShift, minVal, returnAt))
: (i -> isVisibleY(i, currShift, minVal, returnAt)); : (i -> isVisibleY(i, currShift, minVal, returnAt));
if (isVisible.apply(minStart)) { if (isVisible.apply(minStart)) {
// Descent to find minimum. // Descent to find minimum.
min = minStart; min = minStart;

26
core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUIBridge.java
Unescape View File

@ -639,7 +639,7 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
*/ */
protected Icon getIconForTab(final int tabIndex) { protected Icon getIconForTab(final int tabIndex) {
return (!tabPane.isEnabled() || !tabPane.isEnabledAt(tabIndex)) ? tabPane.getDisabledIconAt(tabIndex) return (!tabPane.isEnabled() || !tabPane.isEnabledAt(tabIndex)) ? tabPane.getDisabledIconAt(tabIndex)
: tabPane.getIconAt(tabIndex); : tabPane.getIconAt(tabIndex);
} }
/** /**
@ -840,7 +840,7 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
protected int getTabLabelShiftY(final int tabPlacement, final int tabIndex, final boolean isSelected) { protected int getTabLabelShiftY(final int tabPlacement, final int tabIndex, final boolean isSelected) {
Rectangle tabRect = rects[tabIndex]; Rectangle tabRect = rects[tabIndex];
int nudge = (isSelected ? DefaultLookup.getInt(tabPane, this, "TabbedPane.selectedLabelShift", -1) int nudge = (isSelected ? DefaultLookup.getInt(tabPane, this, "TabbedPane.selectedLabelShift", -1)
: DefaultLookup.getInt(tabPane, this, "TabbedPane.labelShift", 1)); : DefaultLookup.getInt(tabPane, this, "TabbedPane.labelShift", 1));
switch (tabPlacement) { switch (tabPlacement) {
case BOTTOM : case BOTTOM :
@ -1621,7 +1621,7 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
int tabRunOverlay = getTabRunOverlay(tabPlacement); int tabRunOverlay = getTabRunOverlay(tabPlacement);
return (horizRunCount > 0 ? horizRunCount * (maxTabHeight - tabRunOverlay) + tabRunOverlay + return (horizRunCount > 0 ? horizRunCount * (maxTabHeight - tabRunOverlay) + tabRunOverlay +
tabAreaInsets.top + tabAreaInsets.bottom tabAreaInsets.top + tabAreaInsets.bottom
: 0); : 0);
} }
/** /**
@ -1637,7 +1637,7 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
int tabRunOverlay = getTabRunOverlay(tabPlacement); int tabRunOverlay = getTabRunOverlay(tabPlacement);
return (vertRunCount > 0 ? vertRunCount * (maxTabWidth - tabRunOverlay) + tabRunOverlay + return (vertRunCount > 0 ? vertRunCount * (maxTabWidth - tabRunOverlay) + tabRunOverlay +
tabAreaInsets.left + tabAreaInsets.right tabAreaInsets.left + tabAreaInsets.right
: 0); : 0);
} }
/** /**
@ -1719,7 +1719,7 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
int tabPlacement = tabPane.getTabPlacement(); int tabPlacement = tabPane.getTabPlacement();
int current = DefaultLookup.getBoolean(tabPane, this, int current = DefaultLookup.getBoolean(tabPane, this,
"TabbedPane.selectionFollowsFocus", true) ? tabPane.getSelectedIndex() "TabbedPane.selectionFollowsFocus", true) ? tabPane.getSelectedIndex()
: getFocusIndex(); : getFocusIndex();
int tabCount = tabPane.getTabCount(); int tabCount = tabPane.getTabCount();
boolean leftToRight = tabPane.getComponentOrientation().isLeftToRight(); boolean leftToRight = tabPane.getComponentOrientation().isLeftToRight();
@ -2046,11 +2046,11 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
case LEFT : { case LEFT : {
if (run == 0) { if (run == 0) {
offset = (forward ? -(calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth) offset = (forward ? -(calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth)
: -maxTabWidth); : -maxTabWidth);
} else if (run == runCount - 1) { } else if (run == runCount - 1) {
offset = (forward ? maxTabWidth offset = (forward ? maxTabWidth
: calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth); : calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth);
} else { } else {
offset = (forward ? maxTabWidth : -maxTabWidth); offset = (forward ? maxTabWidth : -maxTabWidth);
} }
@ -2059,10 +2059,10 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
case RIGHT : { case RIGHT : {
if (run == 0) { if (run == 0) {
offset = (forward ? maxTabWidth offset = (forward ? maxTabWidth
: calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth); : calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth);
} else if (run == runCount - 1) { } else if (run == runCount - 1) {
offset = (forward ? -(calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth) offset = (forward ? -(calculateTabAreaWidth(tabPlacement, runCount, maxTabWidth) - maxTabWidth)
: -maxTabWidth); : -maxTabWidth);
} else { } else {
offset = (forward ? maxTabWidth : -maxTabWidth); offset = (forward ? maxTabWidth : -maxTabWidth);
} }
@ -2071,10 +2071,10 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
case BOTTOM : { case BOTTOM : {
if (run == 0) { if (run == 0) {
offset = (forward ? maxTabHeight offset = (forward ? maxTabHeight
: calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight); : calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight);
} else if (run == runCount - 1) { } else if (run == runCount - 1) {
offset = (forward ? -(calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight) offset = (forward ? -(calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight)
: -maxTabHeight); : -maxTabHeight);
} else { } else {
offset = (forward ? maxTabHeight : -maxTabHeight); offset = (forward ? maxTabHeight : -maxTabHeight);
} }
@ -2084,10 +2084,10 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
default : { default : {
if (run == 0) { if (run == 0) {
offset = (forward ? -(calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight) offset = (forward ? -(calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight)
: -maxTabHeight); : -maxTabHeight);
} else if (run == runCount - 1) { } else if (run == runCount - 1) {
offset = (forward ? maxTabHeight offset = (forward ? maxTabHeight
: calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight); : calculateTabAreaHeight(tabPlacement, runCount, maxTabHeight) - maxTabHeight);
} else { } else {
offset = (forward ? maxTabHeight : -maxTabHeight); offset = (forward ? maxTabHeight : -maxTabHeight);
} }

8
core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneLayout.java
Unescape View File

@ -150,11 +150,11 @@ public abstract class TabbedPaneLayout implements LayoutManager {
if (child == ui.tabContainer) { if (child == ui.tabContainer) {
int tabContainerWidth = totalTabWidth == 0 ? bounds.width int tabContainerWidth = totalTabWidth == 0 ? bounds.width
: totalTabWidth + insets.left + insets.right + : totalTabWidth + insets.left + insets.right +
contentInsets.left + contentInsets.right; contentInsets.left + contentInsets.right;
int tabContainerHeight = totalTabHeight == 0 ? bounds.height int tabContainerHeight = totalTabHeight == 0 ? bounds.height
: totalTabHeight + insets.top + insets.bottom + : totalTabHeight + insets.top + insets.bottom +
contentInsets.top + contentInsets.bottom; contentInsets.top + contentInsets.bottom;
int tabContainerX = 0; int tabContainerX = 0;
int tabContainerY = 0; int tabContainerY = 0;

2
core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneTransferHandler.java
Unescape View File

@ -169,7 +169,7 @@ public class TabbedPaneTransferHandler extends TransferHandler implements DropTa
protected void createDragImage(final JTabbedPane tabbedPane, final DarkTabbedPaneUI ui) { protected void createDragImage(final JTabbedPane tabbedPane, final DarkTabbedPaneUI ui) {
Color color = ui != null ? ui.getDragBorderColor() Color color = ui != null ? ui.getDragBorderColor()
: tabbedPane.getBackgroundAt(currentTransferable.transferData.tabIndex); : tabbedPane.getBackgroundAt(currentTransferable.transferData.tabIndex);
Image tabImage = ImageUtil.createDragImage(tabbedPane, currentTransferable.transferData.tabBounds, 2, color); Image tabImage = ImageUtil.createDragImage(tabbedPane, currentTransferable.transferData.tabBounds, 2, color);
int w = tabImage.getWidth(null); int w = tabImage.getWidth(null);
int h = tabImage.getHeight(null); int h = tabImage.getHeight(null);

4
core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkPanelPopupUI.java
Unescape View File

@ -378,9 +378,9 @@ public class DarkPanelPopupUI extends DarkPanelUI implements PropertyChangeListe
public void setFocus(final boolean focus) { public void setFocus(final boolean focus) {
putClientProperty(DarkButtonUI.KEY_HOVER_COLOR, focus ? ui.headerButtonFocusHoverBackground putClientProperty(DarkButtonUI.KEY_HOVER_COLOR, focus ? ui.headerButtonFocusHoverBackground
: ui.headerButtonHoverBackground); : ui.headerButtonHoverBackground);
putClientProperty(DarkButtonUI.KEY_CLICK_COLOR, focus ? ui.headerButtonFocusClickBackground putClientProperty(DarkButtonUI.KEY_CLICK_COLOR, focus ? ui.headerButtonFocusClickBackground
: ui.headerButtonClickBackground); : ui.headerButtonClickBackground);
} }
} }
} }

8
core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabContainerUI.java
Unescape View File

@ -209,9 +209,9 @@ public class DarkTabFrameTabContainerUI extends DarkPanelUI implements PropertyC
public Color getBackground(final TabFrameTabContainer tab) { public Color getBackground(final TabFrameTabContainer tab) {
if (printing) return tab.getBackground(); if (printing) return tab.getBackground();
return tab.isSelected() return tab.isSelected()
? selectedColor ? selectedColor
: hoverListener.isHover() && !tab.getTabFrame().isInTransfer() : hoverListener.isHover() && !tab.getTabFrame().isInTransfer()
? hoverColor ? hoverColor
: tab.getBackground(); : tab.getBackground();
} }
} }

18
core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabLabelUI.java
Unescape View File

@ -183,7 +183,7 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
String key = e.getPropertyName(); String key = e.getPropertyName();
if (TabFrameTab.KEY_SELECTED.equals(key)) { if (TabFrameTab.KEY_SELECTED.equals(key)) {
tabComponent.setForeground(Boolean.TRUE.equals(e.getNewValue()) tabComponent.setForeground(Boolean.TRUE.equals(e.getNewValue())
? selectedFontColor : defaultFontColor); ? selectedFontColor : defaultFontColor);
tabComponent.repaint(); tabComponent.repaint();
} else if (TabFrameTab.KEY_TITLE.equals(key)) { } else if (TabFrameTab.KEY_TITLE.equals(key)) {
updateText(); updateText();
@ -259,19 +259,19 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
public Color getBackground(final TabFrameTabLabel tab) { public Color getBackground(final TabFrameTabLabel tab) {
if (printing || !tab.isEnabled()) return tab.getBackground(); if (printing || !tab.isEnabled()) return tab.getBackground();
return tab.isSelected() return tab.isSelected()
? selectedColor ? selectedColor
: hoverListener.isHover() && !tab.getTabFrame().isInTransfer() : hoverListener.isHover() && !tab.getTabFrame().isInTransfer()
? hoverColor ? hoverColor
: tab.getBackground(); : tab.getBackground();
} }
public Color getForeground(final TabFrameTabLabel tab) { public Color getForeground(final TabFrameTabLabel tab) {
if (printing) return tab.getForeground(); if (printing) return tab.getForeground();
return tab.isSelected() return tab.isSelected()
? selectedFontColor ? selectedFontColor
: hoverListener.isHover() && !tab.getTabFrame().isInTransfer() : hoverListener.isHover() && !tab.getTabFrame().isInTransfer()
? fontHoverColor ? fontHoverColor
: tab.getForeground(); : tab.getForeground();
} }
protected Icon getIcon() { protected Icon getIcon() {

4
core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabbedPopupUI.java
Unescape View File

@ -127,9 +127,9 @@ public class DarkTabbedPopupUI extends DarkPanelPopupUI implements TabFrameTabbe
if (oldFocus != focus) { if (oldFocus != focus) {
if (newTabButton != null) { if (newTabButton != null) {
newTabButton.putClientProperty(DarkButtonUI.KEY_HOVER_COLOR, focus ? headerButtonFocusHoverBackground newTabButton.putClientProperty(DarkButtonUI.KEY_HOVER_COLOR, focus ? headerButtonFocusHoverBackground
: headerButtonHoverBackground); : headerButtonHoverBackground);
newTabButton.putClientProperty(DarkButtonUI.KEY_CLICK_COLOR, focus ? headerButtonFocusClickBackground newTabButton.putClientProperty(DarkButtonUI.KEY_CLICK_COLOR, focus ? headerButtonFocusClickBackground
: headerButtonClickBackground); : headerButtonClickBackground);
newTabButton.repaint(); newTabButton.repaint();
} }
holder.setBackground(focus ? headerFocusBackground : headerBackground); holder.setBackground(focus ? headerFocusBackground : headerBackground);

4
core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableHeaderUI.java
Unescape View File

@ -116,8 +116,8 @@ public class DarkTableHeaderUI extends DarkTableHeaderUIBridge {
} }
Color borderColor = c.getBorder() instanceof DarkTableScrollPaneBorder Color borderColor = c.getBorder() instanceof DarkTableScrollPaneBorder
? ((DarkTableScrollPaneBorder) c.getBorder()).getBorderColor() ? ((DarkTableScrollPaneBorder) c.getBorder()).getBorderColor()
: getBorderColor(); : getBorderColor();
g.setColor(borderColor); g.setColor(borderColor);
TableColumn draggedColumn = header.getDraggedColumn(); TableColumn draggedColumn = header.getDraggedColumn();

4
core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableHeaderUIBridge.java
Unescape View File

@ -713,10 +713,10 @@ public class DarkTableHeaderUIBridge extends BasicTableHeaderUI {
if (th.getComponentOrientation().isLeftToRight()) { if (th.getComponentOrientation().isLeftToRight()) {
newIndex = leftArrow ? ui.selectPreviousColumn(doIt) newIndex = leftArrow ? ui.selectPreviousColumn(doIt)
: ui.selectNextColumn(doIt); : ui.selectNextColumn(doIt);
} else { } else {
newIndex = leftArrow ? ui.selectNextColumn(doIt) newIndex = leftArrow ? ui.selectNextColumn(doIt)
: ui.selectPreviousColumn(doIt); : ui.selectPreviousColumn(doIt);
} }
if (newIndex != oldIndex) { if (newIndex != oldIndex) {

6
core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableUI.java
Unescape View File

@ -304,7 +304,7 @@ public class DarkTableUI extends DarkTableUIBridge implements FocusListener {
int dist = header != null ? adjustDistance(header.getDraggedDistance(), int dist = header != null ? adjustDistance(header.getDraggedDistance(),
table.getCellRect(0, draggedIndex, true), table.getCellRect(0, draggedIndex, true),
table) table)
: 0; : 0;
boolean isDragged = column == draggedIndex && dist != 0; boolean isDragged = column == draggedIndex && dist != 0;
if (!scrollVisible) { if (!scrollVisible) {
if (ltr) { if (ltr) {
@ -539,11 +539,11 @@ public class DarkTableUI extends DarkTableUIBridge implements FocusListener {
JTableHeader header = table.getTableHeader(); JTableHeader header = table.getTableHeader();
int draggedIndex = header != null ? viewIndexForColumn(header.getDraggedColumn()) int draggedIndex = header != null ? viewIndexForColumn(header.getDraggedColumn())
: -1; : -1;
int dist = header != null ? adjustDistance(header.getDraggedDistance(), int dist = header != null ? adjustDistance(header.getDraggedDistance(),
table.getCellRect(row, draggedIndex, true), table.getCellRect(row, draggedIndex, true),
table) table)
: 0; : 0;
boolean isDragged = column == draggedIndex && dist != 0; boolean isDragged = column == draggedIndex && dist != 0;
Rectangle rectWithSpacing = table.getCellRect(row, cMin, true); Rectangle rectWithSpacing = table.getCellRect(row, cMin, true);
Rectangle r = new Rectangle(cellRect); Rectangle r = new Rectangle(cellRect);

4
core/src/main/java/com/github/weisj/darklaf/ui/table/TableUIBridge.java
Unescape View File

@ -240,7 +240,7 @@ public abstract class TableUIBridge extends TableUI {
*/ */
protected static int getAdjustedLead(final JTable table, final boolean row) { protected static int getAdjustedLead(final JTable table, final boolean row) {
return row ? getAdjustedLead(table, row, table.getSelectionModel()) return row ? getAdjustedLead(table, row, table.getSelectionModel())
: getAdjustedLead(table, row, table.getColumnModel().getSelectionModel()); : getAdjustedLead(table, row, table.getColumnModel().getSelectionModel());
} }
/** /**
@ -1452,7 +1452,7 @@ public abstract class TableUIBridge extends TableUI {
boolean ltr = table.getComponentOrientation().isLeftToRight(); boolean ltr = table.getComponentOrientation().isLeftToRight();
newColumn = forwards ? (ltr ? table.getColumnCount() : 0) newColumn = forwards ? (ltr ? table.getColumnCount() : 0)
: (ltr ? 0 : table.getColumnCount()); : (ltr ? 0 : table.getColumnCount());
} }
this.dx = newColumn - leadColumn; this.dx = newColumn - leadColumn;

2
core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextBorder.java
Unescape View File

@ -117,7 +117,7 @@ public class DarkTextBorder implements Border, UIResource {
final boolean editable, final boolean enabled) { final boolean editable, final boolean enabled) {
if (focus) { if (focus) {
return error ? focusErrorBorderColor return error ? focusErrorBorderColor
: enabled && editable ? focusBorderColor : inactiveFocusBorderColor; : enabled && editable ? focusBorderColor : inactiveFocusBorderColor;
} else if (error) { } else if (error) {
return errorBorderColor; return errorBorderColor;
} else { } else {

8
core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextFieldUI.java
Unescape View File

@ -118,15 +118,15 @@ public class DarkTextFieldUI extends DarkTextFieldUIBridge implements PropertyCh
Rectangle drawRect = getDrawingRect(getComponent()); Rectangle drawRect = getDrawingRect(getComponent());
Rectangle textRect = getTextRect(getComponent()); Rectangle textRect = getTextRect(getComponent());
int rightBoundary = getComponent().getText().isEmpty() int rightBoundary = getComponent().getText().isEmpty()
? drawRect.x + drawRect.width ? drawRect.x + drawRect.width
: getClearIconCoord().x; : getClearIconCoord().x;
boolean insideTextArea = drawRect.contains(p) && p.x >= textRect.x && p.x < rightBoundary; boolean insideTextArea = drawRect.contains(p) && p.x >= textRect.x && p.x < rightBoundary;
if (insideTextArea) { if (insideTextArea) {
getComponent().setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR)); getComponent().setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
} else { } else {
Cursor cursor = action == ClickAction.NONE Cursor cursor = action == ClickAction.NONE
? Cursor.getDefaultCursor() ? Cursor.getDefaultCursor()
: Cursor.getPredefinedCursor(Cursor.HAND_CURSOR); : Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
getComponent().setCursor(cursor); getComponent().setCursor(cursor);
} }
} }

6
core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/StateIconUI.java
Unescape View File

@ -44,8 +44,8 @@ public interface StateIconUI {
boolean enabled = b.isEnabled(); boolean enabled = b.isEnabled();
boolean hasFocus = b.hasFocus(); boolean hasFocus = b.hasFocus();
return selected ? enabled ? hasFocus ? ui.getSelectedFocusedIcon() : ui.getSelectedIcon() return selected ? enabled ? hasFocus ? ui.getSelectedFocusedIcon() : ui.getSelectedIcon()
: ui.getSelectedDisabledIcon() : ui.getSelectedDisabledIcon()
: enabled ? hasFocus ? ui.getFocusedIcon() : ui.getIcon() : enabled ? hasFocus ? ui.getFocusedIcon() : ui.getIcon()
: ui.getDisabledIcon(); : ui.getDisabledIcon();
} }
} }

2
core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/tristate/DarkTristateCheckBoxMenuItemUI.java
Unescape View File

@ -63,7 +63,7 @@ public class DarkTristateCheckBoxMenuItemUI extends DarkCheckBoxMenuItemUI {
if (((TristateCheckBoxMenuItem) b).getTristateModel().isIndeterminate()) { if (((TristateCheckBoxMenuItem) b).getTristateModel().isIndeterminate()) {
if (b.isEnabled()) { if (b.isEnabled()) {
return b.hasFocus() ? checkBoxIndeterminateFocusedIcon return b.hasFocus() ? checkBoxIndeterminateFocusedIcon
: checkBoxIndeterminateIcon; : checkBoxIndeterminateIcon;
} else { } else {
return checkBoxIndeterminateDisabledIcon; return checkBoxIndeterminateDisabledIcon;
} }

2
core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/tristate/DarkTristateCheckBoxUI.java
Unescape View File

@ -57,7 +57,7 @@ public class DarkTristateCheckBoxUI extends DarkCheckBoxUI {
if (((TristateCheckBox) b).getTristateModel().isIndeterminate()) { if (((TristateCheckBox) b).getTristateModel().isIndeterminate()) {
if (b.isEnabled()) { if (b.isEnabled()) {
return b.hasFocus() ? checkBoxIndeterminateFocusedIcon return b.hasFocus() ? checkBoxIndeterminateFocusedIcon
: checkBoxIndeterminateIcon; : checkBoxIndeterminateIcon;
} else { } else {
return checkBoxIndeterminateDisabledIcon; return checkBoxIndeterminateDisabledIcon;
} }

2
core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkTooltipUI.java
Unescape View File

@ -309,7 +309,7 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe
ToolTipStyle style = getStyle(comp.getClientProperty(KEY_STYLE)); ToolTipStyle style = getStyle(comp.getClientProperty(KEY_STYLE));
ToolTipStyle tooltipStyle = getStyle(toolTip.getClientProperty(KEY_STYLE)); ToolTipStyle tooltipStyle = getStyle(toolTip.getClientProperty(KEY_STYLE));
toolTip.putClientProperty(KEY_STYLE, style != null ? style : tooltipStyle != null ? tooltipStyle toolTip.putClientProperty(KEY_STYLE, style != null ? style : tooltipStyle != null ? tooltipStyle
: ToolTipStyle.PLAIN_BALLOON); : ToolTipStyle.PLAIN_BALLOON);
} }
} }

2
core/src/main/java/com/github/weisj/darklaf/ui/tooltip/ToolTipUtil.java
Unescape View File

@ -69,7 +69,7 @@ public class ToolTipUtil {
Alignment[] alignments = getAlignments(isCenter ? originalCenter : original); Alignment[] alignments = getAlignments(isCenter ? originalCenter : original);
Point pos = null; Point pos = null;
BiConsumer<ToolTipContext, Alignment> setter = isCenter ? ToolTipContext::setCenterAlignment BiConsumer<ToolTipContext, Alignment> setter = isCenter ? ToolTipContext::setCenterAlignment
: ToolTipContext::setAlignment; : ToolTipContext::setAlignment;
// Check if a position keeps the tooltip inside the window. // Check if a position keeps the tooltip inside the window.
for (Alignment a : alignments) { for (Alignment a : alignments) {
pos = tryPosition(a, context, p, tooltipBounds, windowBounds, screenBounds, setter); pos = tryPosition(a, context, p, tooltipBounds, windowBounds, screenBounds, setter);

8
core/src/main/java/com/github/weisj/darklaf/ui/tree/DarkTreeUI.java
Unescape View File

@ -510,11 +510,11 @@ public class DarkTreeUI extends BasicTreeUI implements PropertyChangeListener {
final int row, final boolean isExpanded, final int row, final boolean isExpanded,
final boolean hasBeenExpanded, final boolean isLeaf) { final boolean hasBeenExpanded, final boolean isLeaf) {
final int containerWidth = tree.getParent() instanceof JViewport final int containerWidth = tree.getParent() instanceof JViewport
? tree.getParent().getWidth() ? tree.getParent().getWidth()
: tree.getWidth(); : tree.getWidth();
final int xOffset = tree.getParent() instanceof JViewport final int xOffset = tree.getParent() instanceof JViewport
? ((JViewport) tree.getParent()).getViewPosition().x ? ((JViewport) tree.getParent()).getViewPosition().x
: 0; : 0;
if (path != null) { if (path != null) {
boolean selected = tree.isPathSelected(path); boolean selected = tree.isPathSelected(path);

2
core/src/main/java/com/github/weisj/darklaf/util/GraphicsContext.java
Unescape View File

@ -55,7 +55,7 @@ public class GraphicsContext {
public GraphicsContext setAntialiasing(final boolean on) { public GraphicsContext setAntialiasing(final boolean on) {
graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
on ? RenderingHints.VALUE_ANTIALIAS_ON on ? RenderingHints.VALUE_ANTIALIAS_ON
: RenderingHints.VALUE_ANTIALIAS_OFF); : RenderingHints.VALUE_ANTIALIAS_OFF);
return this; return this;
} }

6
core/src/main/java/com/github/weisj/darklaf/util/GraphicsUtil.java
Unescape View File

@ -51,8 +51,8 @@ public final class GraphicsUtil {
} else { } else {
g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
enableAA enableAA
? RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HBGR ? RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HBGR
: RenderingHints.VALUE_TEXT_ANTIALIAS_OFF); : RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
} }
} }
return config; return config;
@ -81,7 +81,7 @@ public final class GraphicsUtil {
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL,
useQuartz() ? RenderingHints.VALUE_STROKE_PURE useQuartz() ? RenderingHints.VALUE_STROKE_PURE
: RenderingHints.VALUE_STROKE_NORMALIZE); : RenderingHints.VALUE_STROKE_NORMALIZE);
return context; return context;
} }

4
core/src/main/java/com/github/weisj/darklaf/util/ImageUtil.java
Unescape View File

@ -145,8 +145,8 @@ public final class ImageUtil {
public static BufferedImage createCompatibleTranslucentImage(final int width, public static BufferedImage createCompatibleTranslucentImage(final int width,
final int height) { final int height) {
return isHeadless() ? new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB) return isHeadless() ? new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB)
: getGraphicsConfiguration().createCompatibleImage(width, height, : getGraphicsConfiguration().createCompatibleImage(width, height,
Transparency.TRANSLUCENT); Transparency.TRANSLUCENT);
} }
private static boolean isHeadless() { private static boolean isHeadless() {

2
core/src/test/java/icon/IconDemo.java
Unescape View File

@ -74,7 +74,7 @@ public class IconDemo implements ComponentDemo {
{ {
putClientProperty("JToggleButton.variant", "slider"); putClientProperty("JToggleButton.variant", "slider");
addActionListener(e -> LafManager.installTheme(isSelected() ? new DarculaTheme() addActionListener(e -> LafManager.installTheme(isSelected() ? new DarculaTheme()
: new IntelliJTheme())); : new IntelliJTheme()));
} }
}); });
controlPanel.add(new QuickColorChooser("Themed icon color", UIManager.getColor("TestIcon.color"), controlPanel.add(new QuickColorChooser("Themed icon color", UIManager.getColor("TestIcon.color"),

2
core/src/test/java/ui/button/ButtonDemo.java
Unescape View File

@ -71,7 +71,7 @@ public class ButtonDemo implements ComponentDemo {
{ {
setSelected(button.getComponentOrientation().isLeftToRight()); setSelected(button.getComponentOrientation().isLeftToRight());
addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("Rollover") { controlPanel.add(new JCheckBox("Rollover") {

2
core/src/test/java/ui/button/ToggleButtonDemo.java
Unescape View File

@ -58,7 +58,7 @@ public class ToggleButtonDemo implements ComponentDemo {
{ {
setSelected(button.getComponentOrientation().isLeftToRight()); setSelected(button.getComponentOrientation().isLeftToRight());
addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox(DarkToggleButtonUI.KEY_IS_TREE_EDITOR) { controlPanel.add(new JCheckBox(DarkToggleButtonUI.KEY_IS_TREE_EDITOR) {

2
core/src/test/java/ui/checkBox/CheckBoxDemo.java
Unescape View File

@ -55,7 +55,7 @@ public class CheckBoxDemo implements ComponentDemo {
{ {
setSelected(button.getComponentOrientation().isLeftToRight()); setSelected(button.getComponentOrientation().isLeftToRight());
addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("Rollover") { controlPanel.add(new JCheckBox("Rollover") {

2
core/src/test/java/ui/checkBox/TriCheckBoxDemo.java
Unescape View File

@ -57,7 +57,7 @@ public class TriCheckBoxDemo implements ComponentDemo {
{ {
setSelected(button.getComponentOrientation().isLeftToRight()); setSelected(button.getComponentOrientation().isLeftToRight());
addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("Rollover") { controlPanel.add(new JCheckBox("Rollover") {

5
core/src/test/java/ui/comboBox/ComboBoxDemo.java
Unescape View File

@ -64,8 +64,9 @@ public class ComboBoxDemo implements ComponentDemo {
controlPanel.add(new JCheckBox("LeftToRight") { controlPanel.add(new JCheckBox("LeftToRight") {
{ {
setSelected(comboBox.getComponentOrientation().isLeftToRight()); setSelected(comboBox.getComponentOrientation().isLeftToRight());
addActionListener(e -> comboBox.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> comboBox.setComponentOrientation(isSelected()
: ComponentOrientation.RIGHT_TO_LEFT)); ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox(ComboBoxConstants.KEY_IS_TREE_EDITOR) { controlPanel.add(new JCheckBox(ComboBoxConstants.KEY_IS_TREE_EDITOR) {

2
core/src/test/java/ui/label/LabelDemo.java
Unescape View File

@ -55,7 +55,7 @@ public class LabelDemo implements ComponentDemo {
{ {
setSelected(label.getComponentOrientation().isLeftToRight()); setSelected(label.getComponentOrientation().isLeftToRight());
addActionListener(e -> label.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> label.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
return panel; return panel;

5
core/src/test/java/ui/progressBar/ProgressBarDemo.java
Unescape View File

@ -64,8 +64,9 @@ public class ProgressBarDemo implements ComponentDemo {
controlPanel.add(new JCheckBox("LeftToRight") { controlPanel.add(new JCheckBox("LeftToRight") {
{ {
setSelected(progressBar.getComponentOrientation().isLeftToRight()); setSelected(progressBar.getComponentOrientation().isLeftToRight());
addActionListener(e -> progressBar.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> progressBar.setComponentOrientation(isSelected()
: ComponentOrientation.RIGHT_TO_LEFT)); ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("String painted") { controlPanel.add(new JCheckBox("String painted") {

2
core/src/test/java/ui/radioButton/RadioButtonDemo.java
Unescape View File

@ -55,7 +55,7 @@ public class RadioButtonDemo implements ComponentDemo {
{ {
setSelected(button.getComponentOrientation().isLeftToRight()); setSelected(button.getComponentOrientation().isLeftToRight());
addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> button.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("Rollover") { controlPanel.add(new JCheckBox("Rollover") {

5
core/src/test/java/ui/scrollPane/ScrollPaneDemo.java
Unescape View File

@ -63,8 +63,9 @@ public final class ScrollPaneDemo implements ComponentDemo {
controlPanel.add(new JCheckBox("LeftToRight") { controlPanel.add(new JCheckBox("LeftToRight") {
{ {
setSelected(scrollPane.getComponentOrientation().isLeftToRight()); setSelected(scrollPane.getComponentOrientation().isLeftToRight());
addActionListener(e -> scrollPane.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> scrollPane.setComponentOrientation(isSelected()
: ComponentOrientation.RIGHT_TO_LEFT)); ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT));
} }
}, "span"); }, "span");

8
core/src/test/java/ui/slider/SliderDemo.java
Unescape View File

@ -55,7 +55,7 @@ public class SliderDemo implements ComponentDemo {
addItem("Vertical"); addItem("Vertical");
setSelectedItem("Horizontal"); setSelectedItem("Horizontal");
addItemListener(e -> slider.setOrientation(e.getItem() == "Vertical" ? JSlider.VERTICAL addItemListener(e -> slider.setOrientation(e.getItem() == "Vertical" ? JSlider.VERTICAL
: JSlider.HORIZONTAL)); : JSlider.HORIZONTAL));
} }
}); });
controlPanel = panel.addControls(); controlPanel = panel.addControls();
@ -69,7 +69,7 @@ public class SliderDemo implements ComponentDemo {
{ {
setSelected(slider.getComponentOrientation().isLeftToRight()); setSelected(slider.getComponentOrientation().isLeftToRight());
addActionListener(e -> slider.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> slider.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("inverted") { controlPanel.add(new JCheckBox("inverted") {
@ -105,8 +105,8 @@ public class SliderDemo implements ComponentDemo {
controlPanel.add(new JCheckBox(DarkSliderUI.KEY_VARIANT + " = " + DarkSliderUI.VARIANT_VOLUME) { controlPanel.add(new JCheckBox(DarkSliderUI.KEY_VARIANT + " = " + DarkSliderUI.VARIANT_VOLUME) {
{ {
addActionListener(e -> slider.putClientProperty(DarkSliderUI.KEY_VARIANT, isSelected() addActionListener(e -> slider.putClientProperty(DarkSliderUI.KEY_VARIANT, isSelected()
? DarkSliderUI.VARIANT_VOLUME ? DarkSliderUI.VARIANT_VOLUME
: null)); : null));
} }
}); });
controlPanel.add(new JCheckBox(DarkSliderUI.KEY_INSTANT_SCROLL) { controlPanel.add(new JCheckBox(DarkSliderUI.KEY_INSTANT_SCROLL) {

4
core/src/test/java/ui/spinner/SpinnerDemo.java
Unescape View File

@ -55,14 +55,14 @@ public class SpinnerDemo implements ComponentDemo {
{ {
setSelected(spinner.getComponentOrientation().isLeftToRight()); setSelected(spinner.getComponentOrientation().isLeftToRight());
addActionListener(e -> spinner.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> spinner.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox(SpinnerConstants.KEY_VARIANT + " = " + SpinnerConstants.VARIANT_PLUS_MINUS) { controlPanel.add(new JCheckBox(SpinnerConstants.KEY_VARIANT + " = " + SpinnerConstants.VARIANT_PLUS_MINUS) {
{ {
addActionListener(e -> spinner.putClientProperty(SpinnerConstants.KEY_VARIANT, addActionListener(e -> spinner.putClientProperty(SpinnerConstants.KEY_VARIANT,
isSelected() ? SpinnerConstants.VARIANT_PLUS_MINUS isSelected() ? SpinnerConstants.VARIANT_PLUS_MINUS
: null)); : null));
} }
}); });
controlPanel.add(new JCheckBox(SpinnerConstants.KEY_IS_TREE_EDITOR) { controlPanel.add(new JCheckBox(SpinnerConstants.KEY_IS_TREE_EDITOR) {

5
core/src/test/java/ui/tabbedPane/TabbedPaneDemo.java
Unescape View File

@ -99,8 +99,9 @@ public class TabbedPaneDemo implements ComponentDemo {
controlPanel.add(new JCheckBox("LeftToRight") { controlPanel.add(new JCheckBox("LeftToRight") {
{ {
setSelected(tabbedPane.getComponentOrientation().isLeftToRight()); setSelected(tabbedPane.getComponentOrientation().isLeftToRight());
addActionListener(e -> tabbedPane.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> tabbedPane.setComponentOrientation(isSelected()
: ComponentOrientation.RIGHT_TO_LEFT)); ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox(DarkTabbedPaneUI.KEY_CENTER_TABS) { controlPanel.add(new JCheckBox(DarkTabbedPaneUI.KEY_CENTER_TABS) {

2
core/src/test/java/ui/table/TableDemo.java
Unescape View File

@ -107,7 +107,7 @@ public class TableDemo implements ComponentDemo {
{ {
setSelected(table.getComponentOrientation().isLeftToRight()); setSelected(table.getComponentOrientation().isLeftToRight());
addActionListener(e -> table.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> table.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox(DarkTableUI.KEY_ALTERNATE_ROW_COLOR) { controlPanel.add(new JCheckBox(DarkTableUI.KEY_ALTERNATE_ROW_COLOR) {

5
core/src/test/java/ui/text/PasswordFieldDemo.java
Unescape View File

@ -60,8 +60,9 @@ public class PasswordFieldDemo implements ComponentDemo {
controlPanel.add(new JCheckBox("LeftToRight") { controlPanel.add(new JCheckBox("LeftToRight") {
{ {
setEnabled(true); setEnabled(true);
addActionListener(e -> textField.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> textField.setComponentOrientation(isSelected()
: ComponentOrientation.RIGHT_TO_LEFT)); ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("JTextComponent.roundedSelection") { controlPanel.add(new JCheckBox("JTextComponent.roundedSelection") {

5
core/src/test/java/ui/text/TextFieldDemo.java
Unescape View File

@ -60,8 +60,9 @@ public class TextFieldDemo implements ComponentDemo {
controlPanel.add(new JCheckBox("LeftToRight") { controlPanel.add(new JCheckBox("LeftToRight") {
{ {
setEnabled(true); setEnabled(true);
addActionListener(e -> textField.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> textField.setComponentOrientation(isSelected()
: ComponentOrientation.RIGHT_TO_LEFT)); ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("JTextComponent.roundedSelection") { controlPanel.add(new JCheckBox("JTextComponent.roundedSelection") {

2
core/src/test/java/ui/tree/TreeDemo.java
Unescape View File

@ -85,7 +85,7 @@ public class TreeDemo implements ComponentDemo {
{ {
setSelected(tree.getComponentOrientation().isLeftToRight()); setSelected(tree.getComponentOrientation().isLeftToRight());
addActionListener(e -> tree.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT addActionListener(e -> tree.setComponentOrientation(isSelected() ? ComponentOrientation.LEFT_TO_RIGHT
: ComponentOrientation.RIGHT_TO_LEFT)); : ComponentOrientation.RIGHT_TO_LEFT));
} }
}); });
controlPanel.add(new JCheckBox("show root handles") { controlPanel.add(new JCheckBox("show root handles") {

324
darklaf_java.eclipseformat.xml
Unescape View File

@ -27,34 +27,26 @@
<profile kind="CodeFormatterProfile" name="Darklaf" version="18"> <profile kind="CodeFormatterProfile" name="Darklaf" version="18">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/> <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
@ -64,51 +56,40 @@
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/> <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/> <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_if_empty"/> <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_if_empty"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
@ -118,61 +99,46 @@
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/> <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/> <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/> <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_if_empty"/> <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_if_empty"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_if_empty"/>
value="one_line_if_empty"/>
<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/> <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_single_item"/> <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_single_item"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_single_item"/>
value="one_line_if_single_item"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
@ -181,23 +147,19 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="52"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
@ -212,15 +174,13 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/> <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
@ -228,20 +188,16 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_if_empty"/> <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_if_empty"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/> <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
@ -250,33 +206,27 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/> <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/> <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="82"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="82"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
@ -284,19 +234,15 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/> <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_if_empty"/> <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_if_empty"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
@ -306,145 +252,102 @@
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="52"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_if_single_item"/>
value="one_line_if_single_item"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="-2"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="-2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="18"/>
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/> <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="-1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="-1"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/> <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/> <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
@ -454,46 +357,33 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="18"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="18"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
</profile> </profile>
</profiles> </profiles>

8
property-loader/src/main/java/com/github/weisj/darklaf/PropertyLoader.java
Unescape View File

@ -214,8 +214,8 @@ public final class PropertyLoader {
final Color color = ColorUtil.fromHex(value, null); final Color color = ColorUtil.fromHex(value, null);
final Integer invVal = getInteger(value); final Integer invVal = getInteger(value);
final Boolean boolVal = PropertyValue.TRUE.equalsIgnoreCase(value) final Boolean boolVal = PropertyValue.TRUE.equalsIgnoreCase(value)
? Boolean.TRUE ? Boolean.TRUE
: PropertyValue.FALSE.equalsIgnoreCase(value) ? Boolean.FALSE : null; : PropertyValue.FALSE.equalsIgnoreCase(value) ? Boolean.FALSE : null;
if (color != null && (value.length() == 6 || value.length() == 8)) { if (color != null && (value.length() == 6 || value.length() == 8)) {
return new ColorUIResource(color); return new ColorUIResource(color);
} else if (invVal != null) { } else if (invVal != null) {
@ -257,11 +257,11 @@ public final class PropertyLoader {
"Maybe is a forward reference"); "Maybe is a forward reference");
} }
Object returnVal = accumulatorContainsKey ? accumulator.get(val) Object returnVal = accumulatorContainsKey ? accumulator.get(val)
: currentDefault.get(val); : currentDefault.get(val);
if (addReferenceInfo) { if (addReferenceInfo) {
if (returnVal == null) { if (returnVal == null) {
returnVal = accumulatorContainsKey ? accumulator.get(referenceFreeKey) returnVal = accumulatorContainsKey ? accumulator.get(referenceFreeKey)
: currentDefault.get(val); : currentDefault.get(val);
} }
returnVal = new Pair<>(value, returnVal); returnVal = new Pair<>(value, returnVal);
} }

6
property-loader/src/main/java/com/github/weisj/darklaf/icons/StateIcon.java
Unescape View File

@ -81,9 +81,9 @@ public class StateIcon implements Icon {
boolean enabled = b.isEnabled(); boolean enabled = b.isEnabled();
boolean hasFocus = b.hasFocus(); boolean hasFocus = b.hasFocus();
Icon icn = selected ? enabled ? hasFocus ? selectedFocusedIcon : selectedIcon Icon icn = selected ? enabled ? hasFocus ? selectedFocusedIcon : selectedIcon
: selectedDisabledIcon : selectedDisabledIcon
: enabled ? hasFocus ? focusedIcon : icon : enabled ? hasFocus ? focusedIcon : icon
: disabledIcon; : disabledIcon;
return icn != null ? icn : EmptyIcon.create(0); return icn != null ? icn : EmptyIcon.create(0);
} }

2
theme/src/main/java/com/github/weisj/darklaf/theme/info/DefaultThemeProvider.java
Unescape View File

@ -85,7 +85,7 @@ public class DefaultThemeProvider implements ThemeProvider {
boolean dark = themeStyle.getColorToneRule() == ColorToneRule.DARK; boolean dark = themeStyle.getColorToneRule() == ColorToneRule.DARK;
boolean highContrast = themeStyle.getContrastRule() == ContrastRule.HIGH_CONTRAST; boolean highContrast = themeStyle.getContrastRule() == ContrastRule.HIGH_CONTRAST;
Theme theme = dark ? highContrast ? darkHighContrastTheme : darkTheme Theme theme = dark ? highContrast ? darkHighContrastTheme : darkTheme
: highContrast ? lightHighContrastTheme : lightTheme; : highContrast ? lightHighContrastTheme : lightTheme;
return theme.derive(themeStyle.getFontSizeRule(), themeStyle.getAccentColorRule()); return theme.derive(themeStyle.getFontSizeRule(), themeStyle.getAccentColorRule());
} }

2
windows/src/main/java/com/github/weisj/darklaf/platform/windows/PointerUtil.java
Unescape View File

@ -40,7 +40,7 @@ public class PointerUtil {
*/ */
public static long getHWND(final Component component) { public static long getHWND(final Component component) {
Window window = component instanceof Window ? (Window) component Window window = component instanceof Window ? (Window) component
: SwingUtilities.getWindowAncestor(component); : SwingUtilities.getWindowAncestor(component);
return Native.getComponentID(window); return Native.getComponentID(window);
} }
} }

8
windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java
Unescape View File

@ -173,8 +173,8 @@ public class WindowsTitlePane extends CustomTitlePane {
public Insets getWindowSizeAdjustment() { public Insets getWindowSizeAdjustment() {
// Compensate for the insets of the native window peer that include the decorations. // Compensate for the insets of the native window peer that include the decorations.
Insets insets = window != null && windowHandle != 0 Insets insets = window != null && windowHandle != 0
? window.getInsets() ? window.getInsets()
: new Insets(0, 0, 0, 0); : new Insets(0, 0, 0, 0);
insets.set(-insets.top, -insets.left, -insets.bottom, -insets.right); insets.set(-insets.top, -insets.left, -insets.bottom, -insets.right);
return insets; return insets;
} }
@ -566,7 +566,7 @@ public class WindowsTitlePane extends CustomTitlePane {
protected boolean isLeftToRight(final Window window) { protected boolean isLeftToRight(final Window window) {
return (window == null) ? getRootPane().getComponentOrientation().isLeftToRight() return (window == null) ? getRootPane().getComponentOrientation().isLeftToRight()
: window.getComponentOrientation().isLeftToRight(); : window.getComponentOrientation().isLeftToRight();
} }
private void updateSystemIcon() { private void updateSystemIcon() {
@ -703,7 +703,7 @@ public class WindowsTitlePane extends CustomTitlePane {
.getIconHeight(), .getIconHeight(),
windowIconButton.getIcon() windowIconButton.getIcon()
.getIconWidth()) .getIconWidth())
: ICON_WIDTH; : ICON_WIDTH;
windowButtonWidth = Math.min(ICON_WIDTH, windowButtonWidth); windowButtonWidth = Math.min(ICON_WIDTH, windowButtonWidth);
windowIconButton.setBounds(start + PAD, y, windowButtonWidth, height); windowIconButton.setBounds(start + PAD, y, windowButtonWidth, height);
start += windowButtonWidth + 2 * PAD; start += windowButtonWidth + 2 * PAD;

Write Preview
Loading…
Cancel
Save