Final 8.0.00 release

kirill-grouchnikov · Mar 15, 2018 · 6ade92c · 6ade92c
1 parent be5aed6
commit 6ade92c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 19 deletions.
diff --git a/build.xml b/build.xml
@@ -53,10 +53,10 @@
     <property name="trident.basedir" value="${module.substance-swingx.basedir}/../trident" />
 	<property name="substance.basedir" value="${module.substance-swingx.basedir}/../substance" />
 
-    <property name="substance.version" value="8.0.00-rc" />
-    <property name="substance.versionKey" value="8.0.0rc Wyoming" />
+    <property name="substance.version" value="8.0.00" />
+    <property name="substance.versionKey" value="8.0.0 Wyoming" />
     <property name="swingx.version" value="1.6.4" />
-    <property name="trident.version" value="1.5.00-rc" />
+    <property name="trident.version" value="1.5.00" />
 
 	<path id="substance-swingx.module.bootclasspath">
 		<!-- Paths to be included in compilation bootclasspath -->

diff --git a/.../8.0.00-rc/substance-swingx-8.0.00-rc.jar → drop/8.0.00/substance-swingx-8.0.00.jar b/.../8.0.00-rc/substance-swingx-8.0.00-rc.jar → drop/8.0.00/substance-swingx-8.0.00.jar
diff --git a/src/org/pushingpixels/substance/swingx/SubstanceHeaderUI.java b/src/org/pushingpixels/substance/swingx/SubstanceHeaderUI.java
@@ -29,7 +29,7 @@
 import org.jdesktop.swingx.painter.Painter;
 import org.jdesktop.swingx.plaf.PainterUIResource;
 import org.jdesktop.swingx.plaf.basic.BasicHeaderUI;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.internal.painter.BackgroundPaintingUtils;
 import org.pushingpixels.substance.internal.painter.DecorationPainterUtils;
@@ -86,7 +86,7 @@ protected void installDefaults(JXHeader h) {
 		// this.descriptionPane.setOpaque(false);
 
 		super.installDefaults(h);
-		SubstanceCortex.ComponentScope.setDecorationType(h, DecorationAreaType.HEADER);
+		ComponentOrParentChainScope.setDecorationType(h, DecorationAreaType.HEADER);
 	}
 
 	/*

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceLoginPaneUI.java b/src/org/pushingpixels/substance/swingx/SubstanceLoginPaneUI.java
@@ -40,6 +40,7 @@
 import org.jdesktop.swingx.JXLoginPane;
 import org.jdesktop.swingx.plaf.basic.BasicLoginPaneUI;
 import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.internal.contrib.intellij.UIUtil;
 import org.pushingpixels.substance.internal.painter.BackgroundPaintingUtils;
@@ -135,7 +136,7 @@ public Image getBanner() {
         Icon themedIcon = SubstanceCoreUtilities.getThemedIcon(this.loginPanel,
                 window_new.of(32, 32));
 
-        SubstanceCortex.ComponentScope.setDecorationType(this.loginPanel,
+        ComponentOrParentChainScope.setDecorationType(this.loginPanel,
                 DecorationAreaType.HEADER);
         BackgroundPaintingUtils.update(graphics, this.loginPanel, true);
         DecorationPainterUtils.clearDecorationType(this.loginPanel);

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceStatusBarUI.java b/src/org/pushingpixels/substance/swingx/SubstanceStatusBarUI.java
@@ -35,7 +35,7 @@
 import org.jdesktop.swingx.JXStatusBar;
 import org.jdesktop.swingx.plaf.basic.BasicStatusBarUI;
 import org.pushingpixels.substance.api.ComponentState;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.ColorSchemeAssociationKind;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.api.colorscheme.SubstanceColorScheme;
@@ -81,7 +81,7 @@ public SubstanceStatusBarUI() {
     @Override
     protected void installDefaults(JXStatusBar sb) {
         super.installDefaults(sb);
-        SubstanceCortex.ComponentScope.setDecorationType(sb, DecorationAreaType.FOOTER);
+        ComponentOrParentChainScope.setDecorationType(sb, DecorationAreaType.FOOTER);
     }
 
     /*

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceSwingxFillBackgroundDelegate.java b/src/org/pushingpixels/substance/swingx/SubstanceSwingxFillBackgroundDelegate.java
@@ -25,6 +25,7 @@
 import javax.swing.JSeparator;
 
 import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSkin;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.api.painter.overlay.SubstanceOverlayPainter;
@@ -36,7 +37,7 @@ public void paint(JComponent component, Graphics2D graphics, boolean paintSepara
         BackgroundPaintingUtils.updateIfOpaque(graphics, component);
         if (paintSeparator) {
             SubstanceSkin skin = SubstanceCortex.ComponentScope.getCurrentSkin(component);
-            DecorationAreaType decorationAreaType = SubstanceCortex.ComponentScope
+            DecorationAreaType decorationAreaType = ComponentOrParentChainScope
                     .getDecorationType(component);
             List<SubstanceOverlayPainter> overlayPainters = skin
                     .getOverlayPainters(decorationAreaType);

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceSwingxPlugin.java b/src/org/pushingpixels/substance/swingx/SubstanceSwingxPlugin.java
@@ -47,6 +47,7 @@
 import org.pushingpixels.substance.api.ComponentState;
 import org.pushingpixels.substance.api.SubstanceComponentPlugin;
 import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSkin;
 import org.pushingpixels.substance.api.SubstanceSlices.ColorSchemeAssociationKind;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
@@ -115,7 +116,7 @@ public void paint(Graphics2D g, Object jxTitledPanel, int width,
 				JComponent titledPanel = (JComponent) jxTitledPanel;
 				Graphics2D g2d = (Graphics2D) g.create();
 				// g2d.translate(10, 10);
-				DecorationAreaType decorationType = SubstanceCortex.ComponentScope
+				DecorationAreaType decorationType = ComponentOrParentChainScope
 						.getDecorationType(titledPanel);
 				if ((decorationType != null)
 						&& (SubstanceCoreUtilities.getSkin(titledPanel)

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceTaskPaneContainerUI.java b/src/org/pushingpixels/substance/swingx/SubstanceTaskPaneContainerUI.java
@@ -28,7 +28,7 @@
 import org.jdesktop.swingx.JXTaskPaneContainer;
 import org.jdesktop.swingx.VerticalLayout;
 import org.jdesktop.swingx.plaf.basic.BasicTaskPaneContainerUI;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.internal.painter.DecorationPainterUtils;
 import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities;
@@ -86,7 +86,7 @@ public void installUI(JComponent c) {
     protected void installDefaults() {
         super.installDefaults();
         this.taskPane.setBackgroundPainter(null);
-        SubstanceCortex.ComponentScope.setDecorationType(this.taskPane, DecorationAreaType.GENERAL);
+        ComponentOrParentChainScope.setDecorationType(this.taskPane, DecorationAreaType.GENERAL);
     }
 
     /*

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceTaskPaneUI.java b/src/org/pushingpixels/substance/swingx/SubstanceTaskPaneUI.java
@@ -43,7 +43,7 @@
 import org.jdesktop.swingx.icon.EmptyIcon;
 import org.jdesktop.swingx.plaf.basic.BasicTaskPaneUI;
 import org.pushingpixels.substance.api.ComponentState;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.ColorSchemeAssociationKind;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.api.colorscheme.SubstanceColorScheme;
@@ -132,7 +132,7 @@ protected void uninstallListeners() {
 
     @Override
     protected void installDefaults() {
-        SubstanceCortex.ComponentScope.setDecorationType(this.group, DecorationAreaType.GENERAL);
+        ComponentOrParentChainScope.setDecorationType(this.group, DecorationAreaType.GENERAL);
 
         super.installDefaults();
     }
@@ -228,7 +228,7 @@ public SubstancePaneBorder() {
 
             // since the label is never added to this component, we need
             // to explicitly mark it as DecorationAreaType.GENERAL
-            SubstanceCortex.ComponentScope.setDecorationType(this.label,
+            ComponentOrParentChainScope.setDecorationType(this.label,
                     DecorationAreaType.GENERAL);
             // and enforce the foreground color computed in #getPaintColor
             this.label.putClientProperty(SubstanceTextUtilities.ENFORCE_FG_COLOR, Boolean.TRUE);

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceTipOfTheDayUI.java b/src/org/pushingpixels/substance/swingx/SubstanceTipOfTheDayUI.java
@@ -33,7 +33,7 @@
 import org.jdesktop.swingx.JXTipOfTheDay;
 import org.jdesktop.swingx.plaf.UIManagerExt;
 import org.jdesktop.swingx.plaf.basic.BasicTipOfTheDayUI;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.AnimationFacet;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.api.icon.SubstanceIcon;
@@ -85,7 +85,7 @@ protected void installComponents() {
         JXHeader didYouKnow = new JXHeader();
         didYouKnow.setTitle(
                 UIManagerExt.getString("TipOfTheDay.didYouKnowText", tipPane.getLocale()));
-        SubstanceCortex.ComponentScope.setDecorationType(didYouKnow, DecorationAreaType.GENERAL);
+        ComponentOrParentChainScope.setDecorationType(didYouKnow, DecorationAreaType.GENERAL);
 
         SubstanceIcon origIcon = dialog_information.of(32, 32);
         Icon infoIcon = SubstanceCoreUtilities.shouldUseThemedIconsOnOptionPanes() ? origIcon

diff --git a/src/org/pushingpixels/substance/swingx/SubstanceTitledPanelUI.java b/src/org/pushingpixels/substance/swingx/SubstanceTitledPanelUI.java
@@ -29,7 +29,7 @@
 import org.jdesktop.swingx.JXPanel;
 import org.jdesktop.swingx.JXTitledPanel;
 import org.jdesktop.swingx.plaf.basic.BasicTitledPanelUI;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.SubstanceSlices.DecorationAreaType;
 import org.pushingpixels.substance.internal.contrib.jgoodies.looks.ShadowPopupBorder;
 import org.pushingpixels.substance.internal.painter.DecorationPainterUtils;
@@ -74,7 +74,7 @@ protected void installComponents(JXTitledPanel titledPanel) {
     @Override
     protected JXPanel createAndConfigureTopPanel(JXTitledPanel titledPanel) {
         JXPanel result = super.createAndConfigureTopPanel(titledPanel);
-        SubstanceCortex.ComponentScope.setDecorationType(result, DecorationAreaType.HEADER);
+        ComponentOrParentChainScope.setDecorationType(result, DecorationAreaType.HEADER);
         return result;
     }