Skip to content

Commit 9ad3761

Browse files
m-dzianishchytsm-dzianishchyts
committed
wip
1 parent c6153b0 commit 9ad3761

7 files changed

Lines changed: 20 additions & 235 deletions

File tree

‎modeler/cayenne-modeler/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<artifactId>forms</artifactId>
7272
</dependency>
7373
<dependency>
74-
<groupId>com.jgoodies</groupId>
75-
<artifactId>jgoodies-looks</artifactId>
74+
<groupId>com.formdev</groupId>
75+
<artifactId>flatlaf</artifactId>
7676
</dependency>
7777
<dependency>
7878
<groupId>com.fifesoft</groupId>

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericButtonUI.java‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericUIInitializer.java‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,49 +18,25 @@
1818
****************************************************************/
1919
package org.apache.cayenne.modeler.platform.generic;
2020

21-
import com.jgoodies.looks.plastic.PlasticLookAndFeel;
22-
import com.jgoodies.looks.plastic.PlasticTheme;
23-
import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
21+
import com.formdev.flatlaf.FlatLightLaf;
2422
import org.apache.cayenne.modeler.platform.UIInitializer;
2523
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
2824

2925
import javax.swing.*;
3026
import java.awt.*;
3127

3228
public class GenericUIInitializer implements UIInitializer {
3329

34-
private static final Logger LOGGER = LoggerFactory.getLogger(GenericUIInitializer.class);
35-
36-
private static final String DEFAULT_LAF_NAME = PlasticXPLookAndFeel.class.getName();
37-
38-
// note that another theme - "Desert Blue" doesn't support Chinese and Japanese chars
39-
private static final String DEFAULT_THEME_NAME = "Sky Bluer";
40-
4130
@Override
4231
public void beforeSwingLaunch() {
43-
44-
PlasticTheme theme = findTheme();
45-
46-
if (theme != null) {
47-
PlasticLookAndFeel.setCurrentTheme(theme);
48-
}
49-
50-
try {
51-
UIManager.setLookAndFeel(DEFAULT_LAF_NAME);
52-
// override some default styles and colors
53-
overrideUIDefaults();
54-
} catch (Exception e) {
55-
LOGGER.warn("Error installing L&F: " + DEFAULT_LAF_NAME, e);
56-
}
32+
FlatLightLaf.setup();
33+
// override some default styles and colors
34+
overrideUIDefaults();
5735
}
5836

5937
private void overrideUIDefaults() {
6038
Color greyHighlight = new Color(0xCBCBCB);
6139

62-
UIManager.put("ButtonUI", GenericButtonUI.class.getName());
63-
UIManager.put("HiResGrayFilterEnabled", Boolean.TRUE);
6440
UIManager.put("Tree.expandedIcon", IconFactory.buildIcon("icon-arrow-open.png"));
6541
UIManager.put("Tree.collapsedIcon", IconFactory.buildIcon("icon-arrow-closed.png"));
6642
UIManager.put("Tree.paintLines", Boolean.FALSE);
@@ -81,18 +57,11 @@ private void overrideUIDefaults() {
8157
UIManager.put("MenuItem.selectionForeground", Color.BLACK);
8258
UIManager.put("CheckBoxMenuItem.selectionForeground", Color.BLACK);
8359
UIManager.put("RadioButtonMenuItem.selectionForeground", Color.BLACK);
60+
UIManager.put("ToolBar.buttonMargin", new Insets(4, 4, 4, 4));
61+
UIManager.put("Table.showHorizontalLines", Boolean.TRUE);
62+
UIManager.put("Table.showVerticalLines", Boolean.TRUE);
8463
// this one is custom for MainToolBar
8564
UIManager.put("MainToolBar.border", BorderFactory.createLineBorder(Color.GRAY));
8665
}
8766

88-
private PlasticTheme findTheme() {
89-
90-
for (Object object : PlasticLookAndFeel.getInstalledThemes()) {
91-
PlasticTheme theme = (PlasticTheme) object;
92-
if (DEFAULT_THEME_NAME.equals(theme.getName())) {
93-
return theme;
94-
}
95-
}
96-
return null;
97-
}
9867
}

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinCustomTextFieldUI.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,25 @@
1818
****************************************************************/
1919
package org.apache.cayenne.modeler.platform.win;
2020

21-
import com.jgoodies.looks.windows.WindowsLookAndFeel;
21+
import com.formdev.flatlaf.FlatLightLaf;
2222
import org.apache.cayenne.modeler.platform.UIInitializer;
2323
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
2624

2725
import javax.swing.*;
2826
import java.awt.*;
2927

3028
public class WinUIInitializer implements UIInitializer {
3129

32-
private static final Logger LOGGER = LoggerFactory.getLogger(WinUIInitializer.class);
33-
3430
@Override
3531
public void beforeSwingLaunch() {
36-
try {
37-
UIManager.setLookAndFeel(WindowsLookAndFeel.class.getName());
38-
// override some default styles and colors
39-
overrideUIDefaults();
40-
} catch (Exception e) {
41-
LOGGER.warn("Error installing L&F: " + WindowsLookAndFeel.class.getName(), e);
42-
}
32+
FlatLightLaf.setup();
33+
// override some default styles and colors
34+
overrideUIDefaults();
4335
}
4436

4537
private void overrideUIDefaults() {
4638
Color darkGrey = new Color(203, 203, 203);
4739

48-
UIManager.put("TextFieldUI", WinCustomTextFieldUI.class.getName());
4940
UIManager.put("Tree.expandedIcon", IconFactory.buildIcon("icon-arrow-open.png"));
5041
UIManager.put("Tree.collapsedIcon", IconFactory.buildIcon("icon-arrow-closed.png"));
5142
UIManager.put("Tree.paintLines", Boolean.FALSE);
@@ -70,10 +61,8 @@ private void overrideUIDefaults() {
7061
UIManager.put("MenuItem.selectionForeground", Color.BLACK);
7162
UIManager.put("CheckBoxMenuItem.selectionForeground", Color.BLACK);
7263
UIManager.put("RadioButtonMenuItem.selectionForeground", Color.BLACK);
73-
UIManager.put("MenuItem.opaque", Boolean.TRUE);
74-
UIManager.put("CheckBoxMenuItem.opaque", Boolean.TRUE);
75-
UIManager.put("RadioButtonMenuItem.opaque", Boolean.TRUE);
76-
UIManager.put("Button.border", BorderFactory.createEmptyBorder());
77-
UIManager.put("ToolBar.buttonMargin", new Insets(4, 4, 4, 4));
64+
UIManager.put("ToolBar.buttonMargin", new Insets(4, 4, 4, 4));
65+
UIManager.put("Table.showHorizontalLines", Boolean.TRUE);
66+
UIManager.put("Table.showVerticalLines", Boolean.TRUE);
7867
}
7968
}

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ private void initLayout() {
111111
add(toolBar, BorderLayout.NORTH);
112112

113113
tableLabel.setBorderPainted(false);
114+
tableLabel.setContentAreaFilled(false);
114115
tableLabel.setHorizontalAlignment(SwingConstants.LEFT);
115116
tableLabel.setFocusPainted(false);
116117
tableLabel.setMargin(new Insets(0, 0, 0, 0));

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,9 @@
366366
<version>1.2.1</version>
367367
</dependency>
368368
<dependency>
369-
<groupId>com.jgoodies</groupId>
370-
<artifactId>jgoodies-looks</artifactId>
371-
<version>2.7.0</version>
369+
<groupId>com.formdev</groupId>
370+
<artifactId>flatlaf</artifactId>
371+
<version>3.7.1</version>
372372
</dependency>
373373
<dependency>
374374
<groupId>org.apache.velocity</groupId>

0 commit comments

Comments
 (0)