From cddf9d27028ce5f1c25ca9736552d6ada7385b03 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Sat, 30 Apr 2022 10:03:40 -0400 Subject: [PATCH] renaming for better forward-consistency --- app/src/processing/app/contrib/ListPanel.java | 6 +++--- .../{ThemeScrollBarUI.java => PdeScrollBarUI.java} | 8 ++++---- app/src/processing/app/syntax/PdeTextArea.java | 12 ++++++------ app/src/processing/app/ui/EditorConsole.java | 14 +++++++------- 4 files changed, 20 insertions(+), 20 deletions(-) rename app/src/processing/app/laf/{ThemeScrollBarUI.java => PdeScrollBarUI.java} (94%) diff --git a/app/src/processing/app/contrib/ListPanel.java b/app/src/processing/app/contrib/ListPanel.java index 0b1e1b9d5..31423d8c8 100644 --- a/app/src/processing/app/contrib/ListPanel.java +++ b/app/src/processing/app/contrib/ListPanel.java @@ -33,7 +33,7 @@ import javax.swing.table.*; import processing.app.Base; import processing.app.Util; import processing.app.ui.Theme; -import processing.app.laf.ThemeScrollBarUI; +import processing.app.laf.PdeScrollBarUI; import processing.app.ui.Toolkit; @@ -137,7 +137,7 @@ public class ListPanel extends JPanel implements Scrollable { scrollPane = new JScrollPane(table); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - scrollPane.getVerticalScrollBar().setUI(new ThemeScrollBarUI("manager")); + scrollPane.getVerticalScrollBar().setUI(new PdeScrollBarUI("manager")); scrollPane.setBorder(BorderFactory.createEmptyBorder()); table.setFillsViewportHeight(true); table.setDefaultRenderer(Contribution.class, new ContribStatusRenderer()); @@ -204,7 +204,7 @@ public class ListPanel extends JPanel implements Scrollable { rowColor = Theme.getColor("manager.list.background.color"); table.setBackground(rowColor); - ((ThemeScrollBarUI) scrollPane.getVerticalScrollBar().getUI()).updateTheme(); + ((PdeScrollBarUI) scrollPane.getVerticalScrollBar().getUI()).updateTheme(); } diff --git a/app/src/processing/app/laf/ThemeScrollBarUI.java b/app/src/processing/app/laf/PdeScrollBarUI.java similarity index 94% rename from app/src/processing/app/laf/ThemeScrollBarUI.java rename to app/src/processing/app/laf/PdeScrollBarUI.java index 6ced42e0d..471a6866b 100644 --- a/app/src/processing/app/laf/ThemeScrollBarUI.java +++ b/app/src/processing/app/laf/PdeScrollBarUI.java @@ -34,7 +34,7 @@ import java.awt.*; * Custom scroll bar style for the editor. * Originally based on https://stackoverflow.com/a/53662678 */ -public class ThemeScrollBarUI extends BasicScrollBarUI { +public class PdeScrollBarUI extends BasicScrollBarUI { private final Dimension none = new Dimension(); private String backgroundAttr; @@ -48,7 +48,7 @@ public class ThemeScrollBarUI extends BasicScrollBarUI { private Color enabledColor; - public ThemeScrollBarUI(String prefix) { + public PdeScrollBarUI(String prefix) { this(prefix + ".scrollbar.color", prefix + ".scrollbar.thumb.pressed.color", prefix + ".scrollbar.thumb.rollover.color", @@ -57,8 +57,8 @@ public class ThemeScrollBarUI extends BasicScrollBarUI { } - public ThemeScrollBarUI(String backgroundAttr, String pressedAttr, - String rolloverAttr, String enabledAttr) { + public PdeScrollBarUI(String backgroundAttr, String pressedAttr, + String rolloverAttr, String enabledAttr) { this.backgroundAttr = backgroundAttr; this.pressedAttr = pressedAttr; this.rolloverAttr = rolloverAttr; diff --git a/app/src/processing/app/syntax/PdeTextArea.java b/app/src/processing/app/syntax/PdeTextArea.java index 906957a2e..1ccd328c8 100644 --- a/app/src/processing/app/syntax/PdeTextArea.java +++ b/app/src/processing/app/syntax/PdeTextArea.java @@ -28,7 +28,7 @@ import java.util.Map; import processing.app.ui.Editor; import processing.app.ui.Theme; -import processing.app.laf.ThemeScrollBarUI; +import processing.app.laf.PdeScrollBarUI; /** @@ -85,14 +85,14 @@ public class PdeTextArea extends JEditTextArea { gutterGradient = Theme.makeGradient("editor", Editor.LEFT_GUTTER, 500); - if (vertical.getUI() instanceof ThemeScrollBarUI) { + if (vertical.getUI() instanceof PdeScrollBarUI) { // System.out.println("PdeTextArea.updateTheme() just updating"); - ((ThemeScrollBarUI) vertical.getUI()).updateTheme(); - ((ThemeScrollBarUI) horizontal.getUI()).updateTheme(); + ((PdeScrollBarUI) vertical.getUI()).updateTheme(); + ((PdeScrollBarUI) horizontal.getUI()).updateTheme(); } else { // System.out.println("PdeTextArea.updateTheme() setting ui"); - vertical.setUI(new ThemeScrollBarUI("editor")); - horizontal.setUI(new ThemeScrollBarUI("editor")); + vertical.setUI(new PdeScrollBarUI("editor")); + horizontal.setUI(new PdeScrollBarUI("editor")); } repaint(); diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java index ffa04ca8d..22d65e5b9 100644 --- a/app/src/processing/app/ui/EditorConsole.java +++ b/app/src/processing/app/ui/EditorConsole.java @@ -38,7 +38,7 @@ import javax.swing.text.*; import processing.app.Console; import processing.app.Preferences; -import processing.app.laf.ThemeScrollBarUI; +import processing.app.laf.PdeScrollBarUI; /** @@ -131,17 +131,17 @@ public class EditorConsole extends JScrollPane { protected void updateTheme() { JScrollBar vertical = getVerticalScrollBar(); - if (vertical.getUI() instanceof ThemeScrollBarUI) { - ((ThemeScrollBarUI) vertical.getUI()).updateTheme(); + if (vertical.getUI() instanceof PdeScrollBarUI) { + ((PdeScrollBarUI) vertical.getUI()).updateTheme(); } else { - vertical.setUI(new ThemeScrollBarUI("console")); + vertical.setUI(new PdeScrollBarUI("console")); } JScrollBar horizontal = getHorizontalScrollBar(); - if (horizontal.getUI() instanceof ThemeScrollBarUI) { - ((ThemeScrollBarUI) horizontal.getUI()).updateTheme(); + if (horizontal.getUI() instanceof PdeScrollBarUI) { + ((PdeScrollBarUI) horizontal.getUI()).updateTheme(); } else { - horizontal.setUI(new ThemeScrollBarUI("console")); + horizontal.setUI(new PdeScrollBarUI("console")); } // necessary?