Final 8.0.00 release

kirill-grouchnikov · Mar 15, 2018 · 110d832 · 110d832
1 parent 4b6221a
commit 110d832
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 20 deletions.
diff --git a/build.xml b/build.xml
@@ -54,11 +54,11 @@
     <property name="flamingo.basedir" value="${module.substance-flamingo.basedir}/../flamingo" />
     <property name="substance.basedir" value="${module.substance-flamingo.basedir}/../substance" />
 
-    <property name="substance.version" value="8.0.00-rc" />
-    <property name="substance.versionKey" value="8.0.0rc Wyoming" />
-    <property name="flamingo.version" value="5.3.00-rc" />
-    <property name="flamingo.versionKey" value="5.3.00rc Liadan" />
-    <property name="trident.version" value="1.5.00-rc" />
+    <property name="substance.version" value="8.0.00" />
+    <property name="substance.versionKey" value="8.0.0 Wyoming" />
+    <property name="flamingo.version" value="5.3.00" />
+    <property name="flamingo.versionKey" value="5.3.00 Liadan" />
+    <property name="trident.version" value="1.5.00" />
 
 	<path id="substance-flamingo.module.bootclasspath">
 		<!-- Paths to be included in compilation bootclasspath -->

diff --git a/....0.00-rc/substance-flamingo-8.0.00-rc.jar → drop/8.0.00/substance-flamingo-8.0.00.jar b/....0.00-rc/substance-flamingo-8.0.00-rc.jar → drop/8.0.00/substance-flamingo-8.0.00.jar
diff --git a/src/org/pushingpixels/substance/flamingo/ribbon/gallery/oob/WatermarkResizableIcon.java b/src/org/pushingpixels/substance/flamingo/ribbon/gallery/oob/WatermarkResizableIcon.java
@@ -48,7 +48,7 @@
 
 import org.pushingpixels.flamingo.api.common.icon.ResizableIcon;
 import org.pushingpixels.flamingo.internal.hidpi.UIUtil;
-import org.pushingpixels.substance.api.SubstanceCortex;
+import org.pushingpixels.substance.api.SubstanceCortex.ComponentOrParentChainScope;
 import org.pushingpixels.substance.api.watermark.SubstanceWatermark;
 import org.pushingpixels.substance.internal.utils.SubstanceColorSchemeUtilities;
 import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities;
@@ -194,7 +194,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
 		double scaleFactor = UIUtil.getScaleFactor();
 		if (this.watermark != null) {
 			graphics.setColor(SubstanceCoreUtilities.getSkin(c)
-					.getEnabledColorScheme(SubstanceCortex.ComponentScope.getDecorationType(c))
+					.getEnabledColorScheme(ComponentOrParentChainScope.getDecorationType(c))
 					.getExtraLightColor());
 			graphics.fillRect(0, 0, this.currWidth, this.currHeight);
 			Composite oldComp = graphics.getComposite();

diff --git a/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonBandUI.java b/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonBandUI.java
@@ -55,6 +55,7 @@
 import org.pushingpixels.flamingo.internal.ui.ribbon.BasicRibbonBandUI;
 import org.pushingpixels.substance.api.ComponentState;
 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;
@@ -101,7 +102,7 @@ public static ComponentUI createUI(JComponent comp) {
     @Override
     protected void installDefaults() {
         super.installDefaults();
-        SubstanceCortex.ComponentScope.setDecorationType(this.ribbonBand,
+        ComponentOrParentChainScope.setDecorationType(this.ribbonBand,
                 DecorationAreaType.GENERAL);
 
         Color backgr = this.ribbonBand.getBackground();
@@ -133,7 +134,7 @@ protected void uninstallDefaults() {
     protected void installComponents() {
         super.installComponents();
 
-        SubstanceCortex.ComponentScope.setDecorationType(this.ribbonBand,
+        ComponentOrParentChainScope.setDecorationType(this.ribbonBand,
                 DecorationAreaType.GENERAL);
 
         if (this.expandButton != null) {
@@ -271,7 +272,7 @@ public static void paintRibbonBandBackground(Graphics graphics, Component comp,
 
         SubstanceSkin skin = SubstanceCoreUtilities.getSkin(comp);
         SubstanceColorScheme bgScheme = skin
-                .getBackgroundColorScheme(SubstanceCortex.ComponentScope.getDecorationType(comp));
+                .getBackgroundColorScheme(ComponentOrParentChainScope.getDecorationType(comp));
 
         int offset = 20 - dy;
         float bp = (float) offset / (float) comp.getHeight();
@@ -319,7 +320,7 @@ protected JCommandButton createExpandButton() {
         RibbonBandExpandButton result = new RibbonBandExpandButton();
         // since paintBandTitleBackground uses HEADER, mark this button with
         // HEADER as well to sync the mark color
-        SubstanceCortex.ComponentScope.setDecorationType(result, DecorationAreaType.HEADER);
+        ComponentOrParentChainScope.setDecorationType(result, DecorationAreaType.HEADER);
         SubstanceSkin skin = SubstanceCoreUtilities.getSkin(this.ribbonBand);
         result.setIcon(getExpandButtonIcon(skin, result));
         return result;

diff --git a/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonFrameTitlePane.java b/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonFrameTitlePane.java
@@ -68,6 +68,7 @@
 import org.pushingpixels.flamingo.internal.utils.FlamingoUtilities;
 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;
@@ -340,7 +341,7 @@ public SubstanceRibbonFrameTitlePane(JRootPane root, SubstanceRootPaneUI ui) {
                 SubstanceTitlePaneUtilities.ExtraComponentKind.LEADING);
         // Mark this with HEADER decoration area type even though it is in the primary title pane.
         // Otherwise the background fill on the popup menu doesn't look good.
-        SubstanceCortex.ComponentScope.setDecorationType(this.taskbarPanel,
+        ComponentOrParentChainScope.setDecorationType(this.taskbarPanel,
                 DecorationAreaType.HEADER);
         this.add(this.taskbarPanel);
     }

diff --git a/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonTaskToggleButtonUI.java b/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonTaskToggleButtonUI.java
@@ -53,6 +53,7 @@
 import org.pushingpixels.flamingo.internal.ui.ribbon.JRibbonTaskToggleButton;
 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;
@@ -123,7 +124,7 @@ public void paintBorder(Component c, Graphics g, int x, int y,
 					int width, int height) {
 			}
 		});
-		SubstanceCortex.ComponentScope.setDecorationType(this.commandButton,
+		ComponentOrParentChainScope.setDecorationType(this.commandButton,
 				DecorationAreaType.GENERAL);
         SubstanceCortex.ComponentOrParentChainScope.setColorizationFactor(this.commandButton, 
 				RibbonContextualTaskGroup.HUE_ALPHA);

diff --git a/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonUI.java b/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRibbonUI.java
@@ -61,7 +61,7 @@
 import org.pushingpixels.flamingo.internal.ui.ribbon.JRibbonTaskToggleButton;
 import org.pushingpixels.flamingo.internal.utils.FlamingoUtilities;
 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;
@@ -182,7 +182,7 @@ public static ComponentUI createUI(JComponent comp) {
     @Override
     protected void installDefaults() {
         super.installDefaults();
-        SubstanceCortex.ComponentScope.setDecorationType(this.ribbon, DecorationAreaType.HEADER);
+        ComponentOrParentChainScope.setDecorationType(this.ribbon, DecorationAreaType.HEADER);
         Color backgr = this.ribbon.getBackground();
         if (backgr == null || backgr instanceof UIResource) {
             Color toSet = SubstanceColorSchemeUtilities
@@ -210,10 +210,10 @@ protected void uninstallDefaults() {
     @Override
     protected void installComponents() {
         super.installComponents();
-        SubstanceCortex.ComponentScope.setDecorationType(this.taskBarPanel,
+        ComponentOrParentChainScope.setDecorationType(this.taskBarPanel,
                 DecorationAreaType.PRIMARY_TITLE_PANE);
-        SubstanceCortex.ComponentScope.setDecorationType(this.ribbon, DecorationAreaType.HEADER);
-        SubstanceCortex.ComponentScope.setDecorationType(this.bandScrollablePanel,
+        ComponentOrParentChainScope.setDecorationType(this.ribbon, DecorationAreaType.HEADER);
+        ComponentOrParentChainScope.setDecorationType(this.bandScrollablePanel,
                 DecorationAreaType.GENERAL);
     }
 

diff --git a/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRichTooltipPanelUI.java b/src/org/pushingpixels/substance/flamingo/ribbon/ui/SubstanceRichTooltipPanelUI.java
@@ -39,7 +39,7 @@
 import org.pushingpixels.flamingo.internal.ui.common.BasicRichTooltipPanelUI;
 import org.pushingpixels.flamingo.internal.ui.common.JRichTooltipPanel;
 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.DecorationAreaType;
 import org.pushingpixels.substance.api.colorscheme.SubstanceColorScheme;
 import org.pushingpixels.substance.internal.utils.SubstanceColorSchemeUtilities;
@@ -58,7 +58,7 @@ public static ComponentUI createUI(JComponent c) {
 	@Override
 	protected void installDefaults() {
 		super.installDefaults();
-		SubstanceCortex.ComponentScope.setDecorationType(this.richTooltipPanel, DecorationAreaType.GENERAL);
+		ComponentOrParentChainScope.setDecorationType(this.richTooltipPanel, DecorationAreaType.GENERAL);
 	}
 
 	@Override