changeset 5243:5677ce5e6af3

[DOC] RT-32520 FXML reference is outdated
author Martin Sladecek <martin.sladecek@oracle.com>
date Thu, 03 Oct 2013 09:09:01 +0200
parents 51aa0b68a442
children 98b9cd9ee0fc
files modules/fxml/src/main/docs/javafx/fxml/doc-files/fxml.css modules/fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html
diffstat 2 files changed, 36 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxml/src/main/docs/javafx/fxml/doc-files/fxml.css	Wed Oct 02 18:06:32 2013 -0700
+++ b/modules/fxml/src/main/docs/javafx/fxml/doc-files/fxml.css	Thu Oct 03 09:09:01 2013 +0200
@@ -67,6 +67,24 @@
     padding:12;
 }
 
+table {
+	font-size: 10pt;
+	font-family: Courier New;
+	background: #eeeeee;
+	border: #ccc 1px solid;
+	margin: 12px;
+}
+
+table td {
+	padding: 3px;
+	border-top: 1px solid #e0e0e0;
+	border-bottom: 1px solid #e0e0e0;
+	border-left: 1px solid #e0e0e0;
+	border-right: 1px solid #e0e0e0;
+   background: #dddddd;
+
+}
+
 span.variable {
     font-style: italic;
 }
--- a/modules/fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Wed Oct 02 18:06:32 2013 -0700
+++ b/modules/fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Thu Oct 03 09:09:01 2013 +0200
@@ -552,7 +552,24 @@
 
 <p>As the user types in the text input, the label's text content will be automatically updated.</p>
 
-<p>Only simple expressions that resolve to property values or page variables are currently supported. Support for more complex expressions involving boolean or other operators may be added in the future.</p>
+<p>More complex expression are also supported. A list of supported constants and operators follows:</p>
+
+<table>
+ <tr><td>"string"<br />'string'</td><td>A string constant</td></tr>
+ <tr><td>true<br />false</td><td>A boolean constant</td></tr>
+ <tr><td>null</td><td>A constant representing the null value</td></tr>
+ <tr><td>50.0<br />3e5<br />42</td><td>A numerical constant</td></tr>
+ <tr><td>- <br/>(unary operator)</td><td>Unary minus operator, applied on a number</td>
+ <tr><td>! <br/>(unary operator)</td><td>Unary negation of a boolean</td></tr>
+ <tr><td>+ - <br />
+ 			* /
+ 			%</td> <td>Numerical binary operators</td></tr>
+ <tr><td>&& ||</td><td>Boolean binary operators</td></tr>
+ <tr><td>&gt; &gt;= <br />
+ 		   &lt; &lt;= <br />
+ 		   == !=</td>
+ 		   <td>Binary operators of comparison.<br/> Both arguments must be of type Comparable</td></tr>
+</table>
 
 <h3><a name="static_property_attributes">Static Properties</a></h3>
 <p><assert id="static_property_attributes" group="attributes">Attributes representing static properties are handled similarly to static property elements and use a similar syntax.</assert> For example, the earlier <span class="code">GridPane</span> markup shown earlier to demonstrate static property elements could be rewritten as follows:</p>