You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2019/12/31 15:32:43 UTC
[netbeans] branch master updated: [NETBEANS-3428] Update FlatLaf
from 0.22 to 0.23
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a946cd5 [NETBEANS-3428] Update FlatLaf from 0.22 to 0.23
a946cd5 is described below
commit a946cd5a3da91a1f89695dbacae4cea7678934f6
Author: Karl Tauber <ka...@jformdesigner.com>
AuthorDate: Mon Dec 30 22:43:02 2019 +0100
[NETBEANS-3428] Update FlatLaf from 0.22 to 0.23
---
platform/libs.flatlaf/external/binaries-list | 2 +-
...laf-0.22-license.txt => flatlaf-0.23-license.txt} | 4 ++--
platform/libs.flatlaf/nbproject/project.properties | 2 +-
platform/libs.flatlaf/nbproject/project.xml | 4 ++--
.../swing/laf/flatlaf/FlatDarkLaf.properties | 20 ++++++++++----------
.../netbeans/swing/laf/flatlaf/FlatLaf.properties | 12 ++++++------
.../swing/laf/flatlaf/FlatLightLaf.properties | 14 +++++++-------
.../swing/laf/flatlaf/NbFlatDefaultsAddon.java | 15 +++------------
8 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/platform/libs.flatlaf/external/binaries-list b/platform/libs.flatlaf/external/binaries-list
index cadc065..20b230d 100644
--- a/platform/libs.flatlaf/external/binaries-list
+++ b/platform/libs.flatlaf/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-1DDE8147C324577DE87351CACF6123DCFEE64A64 com.formdev:flatlaf:0.22
+BDBE1A7C4927622E88B73A90C3530E5F60659A62 com.formdev:flatlaf:0.23
diff --git a/platform/libs.flatlaf/external/flatlaf-0.22-license.txt b/platform/libs.flatlaf/external/flatlaf-0.23-license.txt
similarity index 99%
rename from platform/libs.flatlaf/external/flatlaf-0.22-license.txt
rename to platform/libs.flatlaf/external/flatlaf-0.23-license.txt
index 05e8e7d..0ec6a05 100644
--- a/platform/libs.flatlaf/external/flatlaf-0.22-license.txt
+++ b/platform/libs.flatlaf/external/flatlaf-0.23-license.txt
@@ -1,7 +1,7 @@
Name: FlatLaf Look and Feel
Description: FlatLaf Look and Feel
-Version: 0.22
-Files: flatlaf-0.22.jar
+Version: 0.23
+Files: flatlaf-0.23.jar
License: Apache-2.0
Origin: FormDev Software GmbH.
URL: https://www.formdev.com/flatlaf/
diff --git a/platform/libs.flatlaf/nbproject/project.properties b/platform/libs.flatlaf/nbproject/project.properties
index 23c2e31..89abc72 100644
--- a/platform/libs.flatlaf/nbproject/project.properties
+++ b/platform/libs.flatlaf/nbproject/project.properties
@@ -20,4 +20,4 @@ javac.compilerargs=-Xlint:unchecked
javac.source=1.8
nbm.target.cluster=platform
-release.external/flatlaf-0.22.jar=modules/ext/flatlaf-0.22.jar
+release.external/flatlaf-0.23.jar=modules/ext/flatlaf-0.23.jar
diff --git a/platform/libs.flatlaf/nbproject/project.xml b/platform/libs.flatlaf/nbproject/project.xml
index b7e4e65..fa90761 100644
--- a/platform/libs.flatlaf/nbproject/project.xml
+++ b/platform/libs.flatlaf/nbproject/project.xml
@@ -30,8 +30,8 @@
<package>com.formdev.flatlaf.util</package>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/flatlaf-0.22.jar</runtime-relative-path>
- <binary-origin>external/flatlaf-0.22.jar</binary-origin>
+ <runtime-relative-path>ext/flatlaf-0.23.jar</runtime-relative-path>
+ <binary-origin>external/flatlaf-0.23.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
index 6011dd8..0e62aa8 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
@@ -27,11 +27,11 @@ EditorTab.activeBackground=#3B4754
#EditorTab.activeForeground=#f00
EditorTab.selectedBackground=#4E5254
#EditorTab.selectedForeground=#0f0
-EditorTab.hoverBackground=@@TabbedPane.hoverColor
+EditorTab.hoverBackground=$TabbedPane.hoverColor
#EditorTab.hoverForeground=#f00
EditorTab.attentionBackground=#E6C840
EditorTab.attentionForeground=#000
-EditorTab.underlineColor=@@TabbedPane.underlineColor
+EditorTab.underlineColor=$TabbedPane.underlineColor
EditorTab.inactiveUnderlineColor=#747A80
@@ -43,20 +43,20 @@ ViewTab.activeBackground=#3B4754
#ViewTab.activeForeground=#f00
#ViewTab.selectedBackground=#f00
#ViewTab.selectedForeground=#0f0
-ViewTab.hoverBackground=@@TabbedPane.hoverColor
+ViewTab.hoverBackground=$TabbedPane.hoverColor
#ViewTab.hoverForeground=#f00
-ViewTab.attentionBackground=@@EditorTab.attentionBackground
-ViewTab.attentionForeground=@@EditorTab.attentionForeground
-ViewTab.underlineColor=@@TabbedPane.underlineColor
-ViewTab.inactiveUnderlineColor=@@EditorTab.inactiveUnderlineColor
+ViewTab.attentionBackground=$EditorTab.attentionBackground
+ViewTab.attentionForeground=$EditorTab.attentionForeground
+ViewTab.underlineColor=$TabbedPane.underlineColor
+ViewTab.inactiveUnderlineColor=$EditorTab.inactiveUnderlineColor
#---- HeapView ----
# border
-nb.heapview.border1=@@Component.borderColor
-nb.heapview.border2=@@Component.borderColor
-nb.heapview.border3=@@Component.borderColor
+nb.heapview.border1=$Component.borderColor
+nb.heapview.border2=$Component.borderColor
+nb.heapview.border3=$Component.borderColor
# text
nb.heapview.foreground=#ddd
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
index 5a72a96..1cb933c 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
@@ -24,8 +24,8 @@ nb.explorer.unfocusedSelFg=@selectionInactiveForeground
#---- TabbedContainer ----
-TabbedContainer.editor.contentBorderColor=@@TabbedPane.contentAreaColor
-TabbedContainer.view.contentBorderColor=@@TabbedPane.contentAreaColor
+TabbedContainer.editor.contentBorderColor=$TabbedPane.contentAreaColor
+TabbedContainer.view.contentBorderColor=$TabbedPane.contentAreaColor
#---- EditorTab ----
@@ -44,10 +44,10 @@ ViewTab.underlineHeight=3
#---- TabControlIcon ----
-TabControlIcon.foreground=@@ComboBox.buttonArrowColor
-TabControlIcon.disabledForeground=@@ComboBox.buttonDisabledArrowColor
-TabControlIcon.rolloverBackground=@@Button.toolbar.hoverBackground
-TabControlIcon.pressedBackground=@@Button.toolbar.pressedBackground
+TabControlIcon.foreground=$ComboBox.buttonArrowColor
+TabControlIcon.disabledForeground=$ComboBox.buttonDisabledArrowColor
+TabControlIcon.rolloverBackground=$Button.toolbar.hoverBackground
+TabControlIcon.pressedBackground=$Button.toolbar.pressedBackground
TabControlIcon.close.rolloverBackground=#c74f50
TabControlIcon.close.rolloverForeground=#fff
TabControlIcon.arc=2
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
index c139e8b..2d7eb26 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
@@ -23,11 +23,11 @@ EditorTab.activeBackground=#E2E6EC
#EditorTab.activeForeground=#f00
EditorTab.selectedBackground=#FCFCFC
#EditorTab.selectedForeground=#0f0
-EditorTab.hoverBackground=@@TabbedPane.hoverColor
+EditorTab.hoverBackground=$TabbedPane.hoverColor
#EditorTab.hoverForeground=#f00
EditorTab.attentionBackground=#E6C840
EditorTab.attentionForeground=#000
-EditorTab.underlineColor=@@TabbedPane.underlineColor
+EditorTab.underlineColor=$TabbedPane.underlineColor
EditorTab.inactiveUnderlineColor=#9CA7B8
@@ -39,9 +39,9 @@ ViewTab.activeBackground=#E2E6EC
#ViewTab.activeForeground=#f00
#ViewTab.selectedBackground=#f00
#ViewTab.selectedForeground=#0f0
-ViewTab.hoverBackground=@@TabbedPane.hoverColor
+ViewTab.hoverBackground=$TabbedPane.hoverColor
#ViewTab.hoverForeground=#f00
-ViewTab.attentionBackground=@@EditorTab.attentionBackground
-ViewTab.attentionForeground=@@EditorTab.attentionForeground
-ViewTab.underlineColor=@@TabbedPane.underlineColor
-ViewTab.inactiveUnderlineColor=@@EditorTab.inactiveUnderlineColor
\ No newline at end of file
+ViewTab.attentionBackground=$EditorTab.attentionBackground
+ViewTab.attentionForeground=$EditorTab.attentionForeground
+ViewTab.underlineColor=$TabbedPane.underlineColor
+ViewTab.inactiveUnderlineColor=$EditorTab.inactiveUnderlineColor
\ No newline at end of file
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDefaultsAddon.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDefaultsAddon.java
index 37eeb2f..a9ea233 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDefaultsAddon.java
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDefaultsAddon.java
@@ -19,22 +19,13 @@
package org.netbeans.swing.laf.flatlaf;
import com.formdev.flatlaf.FlatDefaultsAddon;
-import java.io.InputStream;
/**
* NetBeans addon for FlatLaf.
+ * <p>
+ * Finds NetBeans addon .properties file for the given LaF class in the same
+ * package as this class.
*/
public class NbFlatDefaultsAddon extends FlatDefaultsAddon {
- /**
- * Finds NetBeans addon .properties file for the given LaF class in the same
- * package as this class.
- */
- @Override
- public InputStream getDefaults(Class<?> lafClass) {
- Class<?> addonClass = this.getClass();
- String propertiesName = '/' + addonClass.getPackage().getName().replace('.', '/')
- + '/' + lafClass.getSimpleName() + ".properties"; //NOI18N
- return addonClass.getResourceAsStream(propertiesName);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists