changeset 5504:864db17fb10d

RT-33781 Ensemble8: Fix regressed bar color in AudioClip
author dmasada
date Wed, 23 Oct 2013 10:20:06 -0700
parents 42c2c77eb5bd
children 3fd034b34089
files apps/samples/Ensemble8/src/generated/java/ensemble/generated/Samples.java apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/PlanetaryPlayerPane.java apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/audioclip/AudioClipApp.java
diffstat 3 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/apps/samples/Ensemble8/src/generated/java/ensemble/generated/Samples.java	Wed Oct 23 16:52:24 2013 +0300
+++ b/apps/samples/Ensemble8/src/generated/java/ensemble/generated/Samples.java	Wed Oct 23 10:20:06 2013 -0700
@@ -136,7 +136,7 @@
     private static final SampleInfo SAMPLE_129 = new SampleInfo("TextFlow","Demonstrates some simple uses of rich text and TextFlow.The first example shows use of text with different fonts in a TextFlow. Use the Playground to experiment with different Text properties. The second example shows TextFlow and embedded objects. ","/Text/TextFlow","/ensemble/samples/text/textflow","ensemble.samples.text.textflow.TextFlowApp","/ensemble/samples/text/textflow/preview.png",new String[]{"/ensemble/samples/shared-resources/oracle.png","/ensemble/samples/text/textflow/TextFlowApp.java",},new String[]{"javafx.scene.text.Font","javafx.scene.text.FontPosture","javafx.scene.text.Text","javafx.scene.text.TextFlow",},new String[]{},new String[]{},"/ensemble/samples/text/textflow/TextFlowApp.java",new PlaygroundProperty[]{new PlaygroundProperty("textHello","strikethrough","name","Hello strikethrough"),new PlaygroundProperty("textHello","underline","name","Hello underline"),new PlaygroundProperty("textHello","fill","name","Hello fill"),new PlaygroundProperty("textHello","rotate","min","-180","max","180","name","Hello rotate"),new PlaygroundProperty("textHello","translateX","name","Hello translateX"),new PlaygroundProperty("textHello","translateY","name","Hello translateY"),new PlaygroundProperty("textBold","strikethrough","name","Bold strikethrough"),new PlaygroundProperty("textBold","underline","name","Bold underline"),new PlaygroundProperty("textBold","fill","name","Bold fill"),new PlaygroundProperty("textBold","rotate","min","-180","max","180","name","Bold rotate"),new PlaygroundProperty("textBold","translateX","name","Bold translateX"),new PlaygroundProperty("textBold","translateY","name","Bold translateY"),new PlaygroundProperty("textWorld","strikethrough","name","World strikethrough"),new PlaygroundProperty("textWorld","underline","name","World underline"),new PlaygroundProperty("textWorld","fill","name","World fill"),new PlaygroundProperty("textWorld","rotate","min","-180","max","180","name","World rotate"),new PlaygroundProperty("textWorld","translateX","name","World translateX"),new PlaygroundProperty("textWorld","translateY","name","World translateY"),},new ConditionalFeature[]{});
     private static final SampleInfo SAMPLE_130 = new SampleInfo("HTML Editor","A sample that demonstrates the HTML Editor. You can make changes to the example text, and the resulting generated HTML is displayed. ","/Web/HTML Editor","/ensemble/samples/web/htmleditor","ensemble.samples.web.htmleditor.HTMLEditorApp","/ensemble/samples/web/htmleditor/preview.png",new String[]{"/ensemble/samples/web/htmleditor/HTMLEditorApp.java",},new String[]{"javafx.scene.web.HTMLEditor",},new String[]{},new String[]{"controls/text/SimpleLabel",},"/ensemble/samples/web/htmleditor/HTMLEditorApp.java",new PlaygroundProperty[]{},new ConditionalFeature[]{ConditionalFeature.WEB,});
     private static final SampleInfo SAMPLE_131 = new SampleInfo("WebView","A sample that demonstrates a WebView object accessing a web page. ","/Web/WebView","/ensemble/samples/web/webview","ensemble.samples.web.webview.WebViewApp","/ensemble/samples/web/webview/preview.png",new String[]{"/ensemble/samples/web/webview/WebViewApp.java",},new String[]{"javafx.scene.web.WebView","javafx.scene.web.WebEngine",},new String[]{},new String[]{},"/ensemble/samples/web/webview/WebViewApp.java",new PlaygroundProperty[]{},new ConditionalFeature[]{ConditionalFeature.WEB,});
-    public static final SampleCategory ROOT = new SampleCategory("ROOT",null,null,new SampleCategory[]{new SampleCategory("Animation",new SampleInfo[]{SAMPLE_0,},new SampleInfo[]{SAMPLE_0,SAMPLE_1,SAMPLE_2,SAMPLE_3,SAMPLE_4,SAMPLE_5,SAMPLE_6,SAMPLE_7,SAMPLE_8,SAMPLE_9,SAMPLE_10,SAMPLE_11,SAMPLE_12,},new SampleCategory[]{new SampleCategory("Timeline",new SampleInfo[]{SAMPLE_1,SAMPLE_2,},null,null),new SampleCategory("Transitions",new SampleInfo[]{SAMPLE_3,SAMPLE_4,SAMPLE_5,SAMPLE_6,SAMPLE_7,SAMPLE_8,SAMPLE_9,SAMPLE_10,SAMPLE_11,SAMPLE_12,},null,null),}),new SampleCategory("Canvas",new SampleInfo[]{SAMPLE_13,},new SampleInfo[]{SAMPLE_13,},null),new SampleCategory("Charts",null,new SampleInfo[]{SAMPLE_14,SAMPLE_15,SAMPLE_16,SAMPLE_17,SAMPLE_18,SAMPLE_19,SAMPLE_20,SAMPLE_21,SAMPLE_22,SAMPLE_23,SAMPLE_24,SAMPLE_25,SAMPLE_26,SAMPLE_27,SAMPLE_28,SAMPLE_29,SAMPLE_30,SAMPLE_31,},new SampleCategory[]{new SampleCategory("Area",new SampleInfo[]{SAMPLE_14,SAMPLE_15,SAMPLE_16,SAMPLE_17,},null,null),new SampleCategory("Bar",new SampleInfo[]{SAMPLE_18,SAMPLE_19,SAMPLE_20,SAMPLE_21,SAMPLE_22,},null,null),new SampleCategory("Bubble",new SampleInfo[]{SAMPLE_23,},null,null),new SampleCategory("Custom",new SampleInfo[]{SAMPLE_24,},null,null),new SampleCategory("Line",new SampleInfo[]{SAMPLE_25,SAMPLE_26,SAMPLE_27,},null,null),new SampleCategory("Pie",new SampleInfo[]{SAMPLE_28,SAMPLE_29,},null,null),new SampleCategory("Scatter",new SampleInfo[]{SAMPLE_30,SAMPLE_31,},null,null),}),new SampleCategory("Concurrency",new SampleInfo[]{SAMPLE_32,SAMPLE_33,},new SampleInfo[]{SAMPLE_32,SAMPLE_33,},null),new SampleCategory("Controls",new SampleInfo[]{SAMPLE_34,SAMPLE_35,SAMPLE_36,SAMPLE_37,SAMPLE_38,SAMPLE_39,SAMPLE_40,SAMPLE_41,SAMPLE_42,SAMPLE_43,SAMPLE_44,SAMPLE_45,SAMPLE_46,SAMPLE_47,SAMPLE_48,},new SampleInfo[]{SAMPLE_34,SAMPLE_49,SAMPLE_50,SAMPLE_51,SAMPLE_35,SAMPLE_36,SAMPLE_37,SAMPLE_38,SAMPLE_39,SAMPLE_52,SAMPLE_53,SAMPLE_54,SAMPLE_40,SAMPLE_41,SAMPLE_42,SAMPLE_43,SAMPLE_44,SAMPLE_45,SAMPLE_55,SAMPLE_56,SAMPLE_57,SAMPLE_58,SAMPLE_59,SAMPLE_60,SAMPLE_61,SAMPLE_62,SAMPLE_63,SAMPLE_64,SAMPLE_46,SAMPLE_65,SAMPLE_66,SAMPLE_47,SAMPLE_48,},new SampleCategory[]{new SampleCategory("Button",new SampleInfo[]{SAMPLE_49,SAMPLE_50,SAMPLE_51,},null,null),new SampleCategory("Listview",new SampleInfo[]{SAMPLE_52,SAMPLE_53,SAMPLE_54,},null,null),new SampleCategory("Splitpane",new SampleInfo[]{SAMPLE_55,},null,null),new SampleCategory("Tab",new SampleInfo[]{SAMPLE_56,},null,null),new SampleCategory("Table",new SampleInfo[]{SAMPLE_57,SAMPLE_58,},null,null),new SampleCategory("Text",new SampleInfo[]{SAMPLE_59,SAMPLE_60,SAMPLE_61,SAMPLE_62,SAMPLE_63,SAMPLE_64,},null,null),new SampleCategory("Toolbar",new SampleInfo[]{SAMPLE_65,SAMPLE_66,},null,null),}),new SampleCategory("Fxml",new SampleInfo[]{SAMPLE_67,},new SampleInfo[]{SAMPLE_67,},null),new SampleCategory("Graphics",new SampleInfo[]{SAMPLE_68,SAMPLE_69,SAMPLE_70,SAMPLE_71,SAMPLE_72,SAMPLE_73,SAMPLE_74,SAMPLE_75,},new SampleInfo[]{SAMPLE_68,SAMPLE_69,SAMPLE_70,SAMPLE_71,SAMPLE_72,SAMPLE_73,SAMPLE_76,SAMPLE_77,SAMPLE_78,SAMPLE_79,SAMPLE_80,SAMPLE_81,SAMPLE_82,SAMPLE_83,SAMPLE_84,SAMPLE_85,SAMPLE_86,SAMPLE_74,SAMPLE_87,SAMPLE_88,SAMPLE_89,SAMPLE_90,SAMPLE_91,SAMPLE_92,SAMPLE_93,SAMPLE_94,SAMPLE_95,SAMPLE_96,SAMPLE_75,},new SampleCategory[]{new SampleCategory("Effects",new SampleInfo[]{SAMPLE_76,SAMPLE_77,SAMPLE_78,SAMPLE_79,SAMPLE_80,},null,null),new SampleCategory("Gauge",null,null,null),new SampleCategory("Images",new SampleInfo[]{SAMPLE_81,SAMPLE_82,SAMPLE_83,},null,null),new SampleCategory("Paints",new SampleInfo[]{SAMPLE_84,SAMPLE_85,SAMPLE_86,},null,null),new SampleCategory("Shapes",new SampleInfo[]{SAMPLE_87,SAMPLE_88,SAMPLE_89,SAMPLE_90,SAMPLE_91,SAMPLE_92,SAMPLE_93,SAMPLE_94,SAMPLE_95,SAMPLE_96,},null,null),}),new SampleCategory("Graphics 3d",new SampleInfo[]{SAMPLE_97,SAMPLE_98,SAMPLE_99,SAMPLE_100,},new SampleInfo[]{SAMPLE_97,SAMPLE_98,SAMPLE_99,SAMPLE_100,},null),new SampleCategory("Language",null,new SampleInfo[]{SAMPLE_101,SAMPLE_102,SAMPLE_103,},new SampleCategory[]{new SampleCategory("Beans",new SampleInfo[]{SAMPLE_101,SAMPLE_102,},null,null),new SampleCategory("Collections",new SampleInfo[]{SAMPLE_103,},null,null),}),new SampleCategory("Layout",new SampleInfo[]{SAMPLE_104,SAMPLE_105,SAMPLE_106,SAMPLE_107,SAMPLE_108,SAMPLE_109,SAMPLE_110,SAMPLE_111,},new SampleInfo[]{SAMPLE_104,SAMPLE_105,SAMPLE_106,SAMPLE_107,SAMPLE_108,SAMPLE_109,SAMPLE_110,SAMPLE_111,},null),new SampleCategory("Media",new SampleInfo[]{SAMPLE_112,SAMPLE_113,SAMPLE_114,SAMPLE_115,SAMPLE_116,},new SampleInfo[]{SAMPLE_112,SAMPLE_113,SAMPLE_114,SAMPLE_115,SAMPLE_116,},null),new SampleCategory("Scenegraph",null,new SampleInfo[]{SAMPLE_117,SAMPLE_118,SAMPLE_119,SAMPLE_120,SAMPLE_121,SAMPLE_122,SAMPLE_123,SAMPLE_124,SAMPLE_125,SAMPLE_126,},new SampleCategory[]{new SampleCategory("Events",new SampleInfo[]{SAMPLE_117,SAMPLE_118,SAMPLE_119,SAMPLE_120,SAMPLE_121,SAMPLE_122,},null,null),new SampleCategory("Node",new SampleInfo[]{SAMPLE_123,SAMPLE_124,},null,null),new SampleCategory("Stage",new SampleInfo[]{SAMPLE_125,SAMPLE_126,},null,null),}),new SampleCategory("Swing",new SampleInfo[]{SAMPLE_127,},new SampleInfo[]{SAMPLE_127,},null),new SampleCategory("Text",new SampleInfo[]{SAMPLE_128,SAMPLE_129,},new SampleInfo[]{SAMPLE_128,SAMPLE_129,},null),new SampleCategory("Web",new SampleInfo[]{SAMPLE_130,SAMPLE_131,},new SampleInfo[]{SAMPLE_130,SAMPLE_131,},null),});
+    public static final SampleCategory ROOT = new SampleCategory("ROOT",null,null,new SampleCategory[]{new SampleCategory("Animation",new SampleInfo[]{SAMPLE_0,},new SampleInfo[]{SAMPLE_0,SAMPLE_1,SAMPLE_2,SAMPLE_3,SAMPLE_4,SAMPLE_5,SAMPLE_6,SAMPLE_7,SAMPLE_8,SAMPLE_9,SAMPLE_10,SAMPLE_11,SAMPLE_12,},new SampleCategory[]{new SampleCategory("Timeline",new SampleInfo[]{SAMPLE_1,SAMPLE_2,},null,null),new SampleCategory("Transitions",new SampleInfo[]{SAMPLE_3,SAMPLE_4,SAMPLE_5,SAMPLE_6,SAMPLE_7,SAMPLE_8,SAMPLE_9,SAMPLE_10,SAMPLE_11,SAMPLE_12,},null,null),}),new SampleCategory("Canvas",new SampleInfo[]{SAMPLE_13,},new SampleInfo[]{SAMPLE_13,},null),new SampleCategory("Charts",null,new SampleInfo[]{SAMPLE_14,SAMPLE_15,SAMPLE_16,SAMPLE_17,SAMPLE_18,SAMPLE_19,SAMPLE_20,SAMPLE_21,SAMPLE_22,SAMPLE_23,SAMPLE_24,SAMPLE_25,SAMPLE_26,SAMPLE_27,SAMPLE_28,SAMPLE_29,SAMPLE_30,SAMPLE_31,},new SampleCategory[]{new SampleCategory("Area",new SampleInfo[]{SAMPLE_14,SAMPLE_15,SAMPLE_16,SAMPLE_17,},null,null),new SampleCategory("Bar",new SampleInfo[]{SAMPLE_18,SAMPLE_19,SAMPLE_20,SAMPLE_21,SAMPLE_22,},null,null),new SampleCategory("Bubble",new SampleInfo[]{SAMPLE_23,},null,null),new SampleCategory("Custom",new SampleInfo[]{SAMPLE_24,},null,null),new SampleCategory("Line",new SampleInfo[]{SAMPLE_25,SAMPLE_26,SAMPLE_27,},null,null),new SampleCategory("Pie",new SampleInfo[]{SAMPLE_28,SAMPLE_29,},null,null),new SampleCategory("Scatter",new SampleInfo[]{SAMPLE_30,SAMPLE_31,},null,null),}),new SampleCategory("Concurrency",new SampleInfo[]{SAMPLE_32,SAMPLE_33,},new SampleInfo[]{SAMPLE_32,SAMPLE_33,},null),new SampleCategory("Controls",new SampleInfo[]{SAMPLE_34,SAMPLE_35,SAMPLE_36,SAMPLE_37,SAMPLE_38,SAMPLE_39,SAMPLE_40,SAMPLE_41,SAMPLE_42,SAMPLE_43,SAMPLE_44,SAMPLE_45,SAMPLE_46,SAMPLE_47,SAMPLE_48,},new SampleInfo[]{SAMPLE_34,SAMPLE_49,SAMPLE_50,SAMPLE_51,SAMPLE_35,SAMPLE_36,SAMPLE_37,SAMPLE_38,SAMPLE_39,SAMPLE_52,SAMPLE_53,SAMPLE_54,SAMPLE_40,SAMPLE_41,SAMPLE_42,SAMPLE_43,SAMPLE_44,SAMPLE_45,SAMPLE_55,SAMPLE_56,SAMPLE_57,SAMPLE_58,SAMPLE_59,SAMPLE_60,SAMPLE_61,SAMPLE_62,SAMPLE_63,SAMPLE_64,SAMPLE_46,SAMPLE_65,SAMPLE_66,SAMPLE_47,SAMPLE_48,},new SampleCategory[]{new SampleCategory("Button",new SampleInfo[]{SAMPLE_49,SAMPLE_50,SAMPLE_51,},null,null),new SampleCategory("Listview",new SampleInfo[]{SAMPLE_52,SAMPLE_53,SAMPLE_54,},null,null),new SampleCategory("Splitpane",new SampleInfo[]{SAMPLE_55,},null,null),new SampleCategory("Tab",new SampleInfo[]{SAMPLE_56,},null,null),new SampleCategory("Table",new SampleInfo[]{SAMPLE_57,SAMPLE_58,},null,null),new SampleCategory("Text",new SampleInfo[]{SAMPLE_59,SAMPLE_60,SAMPLE_61,SAMPLE_62,SAMPLE_63,SAMPLE_64,},null,null),new SampleCategory("Toolbar",new SampleInfo[]{SAMPLE_65,SAMPLE_66,},null,null),}),new SampleCategory("Fxml",new SampleInfo[]{SAMPLE_67,},new SampleInfo[]{SAMPLE_67,},null),new SampleCategory("Graphics",new SampleInfo[]{SAMPLE_68,SAMPLE_69,SAMPLE_70,SAMPLE_71,SAMPLE_72,SAMPLE_73,SAMPLE_74,SAMPLE_75,},new SampleInfo[]{SAMPLE_68,SAMPLE_69,SAMPLE_70,SAMPLE_71,SAMPLE_72,SAMPLE_73,SAMPLE_76,SAMPLE_77,SAMPLE_78,SAMPLE_79,SAMPLE_80,SAMPLE_81,SAMPLE_82,SAMPLE_83,SAMPLE_84,SAMPLE_85,SAMPLE_86,SAMPLE_74,SAMPLE_87,SAMPLE_88,SAMPLE_89,SAMPLE_90,SAMPLE_91,SAMPLE_92,SAMPLE_93,SAMPLE_94,SAMPLE_95,SAMPLE_96,SAMPLE_75,},new SampleCategory[]{new SampleCategory("Effects",new SampleInfo[]{SAMPLE_76,SAMPLE_77,SAMPLE_78,SAMPLE_79,SAMPLE_80,},null,null),new SampleCategory("Images",new SampleInfo[]{SAMPLE_81,SAMPLE_82,SAMPLE_83,},null,null),new SampleCategory("Paints",new SampleInfo[]{SAMPLE_84,SAMPLE_85,SAMPLE_86,},null,null),new SampleCategory("Shapes",new SampleInfo[]{SAMPLE_87,SAMPLE_88,SAMPLE_89,SAMPLE_90,SAMPLE_91,SAMPLE_92,SAMPLE_93,SAMPLE_94,SAMPLE_95,SAMPLE_96,},null,null),}),new SampleCategory("Graphics 3d",new SampleInfo[]{SAMPLE_97,SAMPLE_98,SAMPLE_99,SAMPLE_100,},new SampleInfo[]{SAMPLE_97,SAMPLE_98,SAMPLE_99,SAMPLE_100,},null),new SampleCategory("Language",null,new SampleInfo[]{SAMPLE_101,SAMPLE_102,SAMPLE_103,},new SampleCategory[]{new SampleCategory("Beans",new SampleInfo[]{SAMPLE_101,SAMPLE_102,},null,null),new SampleCategory("Collections",new SampleInfo[]{SAMPLE_103,},null,null),}),new SampleCategory("Layout",new SampleInfo[]{SAMPLE_104,SAMPLE_105,SAMPLE_106,SAMPLE_107,SAMPLE_108,SAMPLE_109,SAMPLE_110,SAMPLE_111,},new SampleInfo[]{SAMPLE_104,SAMPLE_105,SAMPLE_106,SAMPLE_107,SAMPLE_108,SAMPLE_109,SAMPLE_110,SAMPLE_111,},null),new SampleCategory("Media",new SampleInfo[]{SAMPLE_112,SAMPLE_113,SAMPLE_114,SAMPLE_115,SAMPLE_116,},new SampleInfo[]{SAMPLE_112,SAMPLE_113,SAMPLE_114,SAMPLE_115,SAMPLE_116,},null),new SampleCategory("Scenegraph",null,new SampleInfo[]{SAMPLE_117,SAMPLE_118,SAMPLE_119,SAMPLE_120,SAMPLE_121,SAMPLE_122,SAMPLE_123,SAMPLE_124,SAMPLE_125,SAMPLE_126,},new SampleCategory[]{new SampleCategory("Events",new SampleInfo[]{SAMPLE_117,SAMPLE_118,SAMPLE_119,SAMPLE_120,SAMPLE_121,SAMPLE_122,},null,null),new SampleCategory("Node",new SampleInfo[]{SAMPLE_123,SAMPLE_124,},null,null),new SampleCategory("Stage",new SampleInfo[]{SAMPLE_125,SAMPLE_126,},null,null),}),new SampleCategory("Swing",new SampleInfo[]{SAMPLE_127,},new SampleInfo[]{SAMPLE_127,},null),new SampleCategory("Text",new SampleInfo[]{SAMPLE_128,SAMPLE_129,},new SampleInfo[]{SAMPLE_128,SAMPLE_129,},null),new SampleCategory("Web",new SampleInfo[]{SAMPLE_130,SAMPLE_131,},new SampleInfo[]{SAMPLE_130,SAMPLE_131,},null),});
     public static final SampleInfo[] HIGHLIGHTS = new SampleInfo[]{SAMPLE_24,SAMPLE_114,};
     private static final HashMap<String,SampleInfo[]> DOCS_URL_TO_SAMPLE = new HashMap<String,SampleInfo[]>(176);
     static {
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/PlanetaryPlayerPane.java	Wed Oct 23 16:52:24 2013 +0300
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/PlanetaryPlayerPane.java	Wed Oct 23 10:20:06 2013 -0700
@@ -158,9 +158,8 @@
         mediaBottomBar.setAlignment(Pos.CENTER);
         BorderPane.setAlignment(mediaBottomBar, Pos.CENTER);
 
-        Button backButton = new Button();
+        Button backButton = new Button("Back");
         backButton.setId("back-button");
-        backButton.setText("Back");
         backButton.setOnAction(backAction);
 
         Button stopButton = new Button("Stop");
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/audioclip/AudioClipApp.java	Wed Oct 23 16:52:24 2013 +0300
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/audioclip/AudioClipApp.java	Wed Oct 23 10:20:06 2013 -0700
@@ -64,7 +64,7 @@
         Rectangle r1 = new Rectangle(0, 15, barWidth * 11.5, 10);
         r1.setFill(new Color(0.2, 0.12, 0.1, 1.0));
         Rectangle r2 = new Rectangle(0, -25, barWidth * 11.5, 10);
-        r1.setFill(new Color(0.2, 0.12, 0.1, 1.0));
+        r2.setFill(new Color(0.2, 0.12, 0.1, 1.0));
 
         final Group content = new Group(
                 r1,