Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/base.js	Mon Sep 09 20:10:41 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/base.js	Mon Sep 09 13:35:35 2013 -0300
     1.3 @@ -23,204 +23,126 @@
     1.4   * questions.
     1.5   */
     1.6  
     1.7 -Scene                                  = Java.type("javafx.scene.Scene");
     1.8 -Group                                  = Java.type("javafx.scene.Group");
     1.9 -Stage                                  = Java.type("javafx.stage.Stage");
    1.10 +var JFX_BASE_CLASSES     = [];
    1.11 +var JFX_GRAPHICS_CLASSES = [];
    1.12 +var JFX_CONTROLS_CLASSES = [];
    1.13 +var JFX_FXML_CLASSES     = [];
    1.14 +var JFX_WEB_CLASSES      = [];
    1.15 +var JFX_MEDIA_CLASSES    = [];
    1.16 +var JFX_SWING_CLASSES    = [];
    1.17 +var JFX_SWT_CLASSES      = [];
    1.18  
    1.19 -Binding                                = Java.type("javafx.beans.binding.Binding");
    1.20 -Bindings                               = Java.type("javafx.beans.binding.Bindings");
    1.21 -BooleanBinding                         = Java.type("javafx.beans.binding.BooleanBinding");
    1.22 -BooleanExpression                      = Java.type("javafx.beans.binding.BooleanExpression");
    1.23 -DoubleBinding                          = Java.type("javafx.beans.binding.DoubleBinding");
    1.24 -DoubleExpression                       = Java.type("javafx.beans.binding.DoubleExpression");
    1.25 -FloatBinding                           = Java.type("javafx.beans.binding.FloatBinding");
    1.26 -FloatExpression                        = Java.type("javafx.beans.binding.FloatExpression");
    1.27 -IntegerBinding                         = Java.type("javafx.beans.binding.IntegerBinding");
    1.28 -IntegerExpression                      = Java.type("javafx.beans.binding.IntegerExpression");
    1.29 -ListBinding                            = Java.type("javafx.beans.binding.ListBinding");
    1.30 -ListExpression                         = Java.type("javafx.beans.binding.ListExpression");
    1.31 -LongBinding                            = Java.type("javafx.beans.binding.LongBinding");
    1.32 -LongExpression                         = Java.type("javafx.beans.binding.LongExpression");
    1.33 -MapBinding                             = Java.type("javafx.beans.binding.MapBinding");
    1.34 -MapExpression                          = Java.type("javafx.beans.binding.MapExpression");
    1.35 -NumberBinding                          = Java.type("javafx.beans.binding.NumberBinding");
    1.36 -NumberExpression                       = Java.type("javafx.beans.binding.NumberExpression");
    1.37 -NumberExpressionBase                   = Java.type("javafx.beans.binding.NumberExpressionBase");
    1.38 -ObjectBinding                          = Java.type("javafx.beans.binding.ObjectBinding");
    1.39 -ObjectExpression                       = Java.type("javafx.beans.binding.ObjectExpression");
    1.40 -SetBinding                             = Java.type("javafx.beans.binding.SetBinding");
    1.41 -SetExpression                          = Java.type("javafx.beans.binding.SetExpression");
    1.42 -StringBinding                          = Java.type("javafx.beans.binding.StringBinding");
    1.43 -StringExpression                       = Java.type("javafx.beans.binding.StringExpression");
    1.44 -When                                   = Java.type("javafx.beans.binding.When");
    1.45 -DefaultProperty                        = Java.type("javafx.beans.DefaultProperty");
    1.46 -InvalidationListener                   = Java.type("javafx.beans.InvalidationListener");
    1.47 -Observable                             = Java.type("javafx.beans.Observable");
    1.48 -JavaBeanBooleanProperty                = Java.type("javafx.beans.property.adapter.JavaBeanBooleanProperty");
    1.49 -JavaBeanBooleanPropertyBuilder         = Java.type("javafx.beans.property.adapter.JavaBeanBooleanPropertyBuilder");
    1.50 -JavaBeanDoubleProperty                 = Java.type("javafx.beans.property.adapter.JavaBeanDoubleProperty");
    1.51 -JavaBeanDoublePropertyBuilder          = Java.type("javafx.beans.property.adapter.JavaBeanDoublePropertyBuilder");
    1.52 -JavaBeanFloatProperty                  = Java.type("javafx.beans.property.adapter.JavaBeanFloatProperty");
    1.53 -JavaBeanFloatPropertyBuilder           = Java.type("javafx.beans.property.adapter.JavaBeanFloatPropertyBuilder");
    1.54 -JavaBeanIntegerProperty                = Java.type("javafx.beans.property.adapter.JavaBeanIntegerProperty");
    1.55 -JavaBeanIntegerPropertyBuilder         = Java.type("javafx.beans.property.adapter.JavaBeanIntegerPropertyBuilder");
    1.56 -JavaBeanLongProperty                   = Java.type("javafx.beans.property.adapter.JavaBeanLongProperty");
    1.57 -JavaBeanLongPropertyBuilder            = Java.type("javafx.beans.property.adapter.JavaBeanLongPropertyBuilder");
    1.58 -JavaBeanObjectProperty                 = Java.type("javafx.beans.property.adapter.JavaBeanObjectProperty");
    1.59 -JavaBeanObjectPropertyBuilder          = Java.type("javafx.beans.property.adapter.JavaBeanObjectPropertyBuilder");
    1.60 -JavaBeanProperty                       = Java.type("javafx.beans.property.adapter.JavaBeanProperty");
    1.61 -JavaBeanStringProperty                 = Java.type("javafx.beans.property.adapter.JavaBeanStringProperty");
    1.62 -JavaBeanStringPropertyBuilder          = Java.type("javafx.beans.property.adapter.JavaBeanStringPropertyBuilder");
    1.63 -ReadOnlyJavaBeanBooleanProperty        = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanBooleanProperty");
    1.64 -ReadOnlyJavaBeanBooleanPropertyBuilder = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanBooleanPropertyBuilder");
    1.65 -ReadOnlyJavaBeanDoubleProperty         = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanDoubleProperty");
    1.66 -ReadOnlyJavaBeanDoublePropertyBuilder  = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanDoublePropertyBuilder");
    1.67 -ReadOnlyJavaBeanFloatProperty          = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanFloatProperty");
    1.68 -ReadOnlyJavaBeanFloatPropertyBuilder   = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanFloatPropertyBuilder");
    1.69 -ReadOnlyJavaBeanIntegerProperty        = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanIntegerProperty");
    1.70 -ReadOnlyJavaBeanIntegerPropertyBuilder = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanIntegerPropertyBuilder");
    1.71 -ReadOnlyJavaBeanLongProperty           = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanLongProperty");
    1.72 -ReadOnlyJavaBeanLongPropertyBuilder    = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanLongPropertyBuilder");
    1.73 -ReadOnlyJavaBeanObjectProperty         = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanObjectProperty");
    1.74 -ReadOnlyJavaBeanObjectPropertyBuilder  = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanObjectPropertyBuilder");
    1.75 -ReadOnlyJavaBeanProperty               = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanProperty");
    1.76 -ReadOnlyJavaBeanStringProperty         = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanStringProperty");
    1.77 -ReadOnlyJavaBeanStringPropertyBuilder  = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanStringPropertyBuilder");
    1.78 -BooleanProperty                        = Java.type("javafx.beans.property.BooleanProperty");
    1.79 -BooleanPropertyBase                    = Java.type("javafx.beans.property.BooleanPropertyBase");
    1.80 -DoubleProperty                         = Java.type("javafx.beans.property.DoubleProperty");
    1.81 -DoublePropertyBase                     = Java.type("javafx.beans.property.DoublePropertyBase");
    1.82 -FloatProperty                          = Java.type("javafx.beans.property.FloatProperty");
    1.83 -FloatPropertyBase                      = Java.type("javafx.beans.property.FloatPropertyBase");
    1.84 -IntegerProperty                        = Java.type("javafx.beans.property.IntegerProperty");
    1.85 -IntegerPropertyBase                    = Java.type("javafx.beans.property.IntegerPropertyBase");
    1.86 -ListProperty                           = Java.type("javafx.beans.property.ListProperty");
    1.87 -ListPropertyBase                       = Java.type("javafx.beans.property.ListPropertyBase");
    1.88 -LongProperty                           = Java.type("javafx.beans.property.LongProperty");
    1.89 -LongPropertyBase                       = Java.type("javafx.beans.property.LongPropertyBase");
    1.90 -MapProperty                            = Java.type("javafx.beans.property.MapProperty");
    1.91 -MapPropertyBase                        = Java.type("javafx.beans.property.MapPropertyBase");
    1.92 -ObjectProperty                         = Java.type("javafx.beans.property.ObjectProperty");
    1.93 -ObjectPropertyBase                     = Java.type("javafx.beans.property.ObjectPropertyBase");
    1.94 -Property                               = Java.type("javafx.beans.property.Property");
    1.95 -ReadOnlyBooleanProperty                = Java.type("javafx.beans.property.ReadOnlyBooleanProperty");
    1.96 -ReadOnlyBooleanPropertyBase            = Java.type("javafx.beans.property.ReadOnlyBooleanPropertyBase");
    1.97 -ReadOnlyBooleanWrapper                 = Java.type("javafx.beans.property.ReadOnlyBooleanWrapper");
    1.98 -ReadOnlyDoubleProperty                 = Java.type("javafx.beans.property.ReadOnlyDoubleProperty");
    1.99 -ReadOnlyDoublePropertyBase             = Java.type("javafx.beans.property.ReadOnlyDoublePropertyBase");
   1.100 -ReadOnlyDoubleWrapper                  = Java.type("javafx.beans.property.ReadOnlyDoubleWrapper");
   1.101 -ReadOnlyFloatProperty                  = Java.type("javafx.beans.property.ReadOnlyFloatProperty");
   1.102 -ReadOnlyFloatPropertyBase              = Java.type("javafx.beans.property.ReadOnlyFloatPropertyBase");
   1.103 -ReadOnlyFloatWrapper                   = Java.type("javafx.beans.property.ReadOnlyFloatWrapper");
   1.104 -ReadOnlyIntegerProperty                = Java.type("javafx.beans.property.ReadOnlyIntegerProperty");
   1.105 -ReadOnlyIntegerPropertyBase            = Java.type("javafx.beans.property.ReadOnlyIntegerPropertyBase");
   1.106 -ReadOnlyIntegerWrapper                 = Java.type("javafx.beans.property.ReadOnlyIntegerWrapper");
   1.107 -ReadOnlyListProperty                   = Java.type("javafx.beans.property.ReadOnlyListProperty");
   1.108 -ReadOnlyListPropertyBase               = Java.type("javafx.beans.property.ReadOnlyListPropertyBase");
   1.109 -ReadOnlyListWrapper                    = Java.type("javafx.beans.property.ReadOnlyListWrapper");
   1.110 -ReadOnlyLongProperty                   = Java.type("javafx.beans.property.ReadOnlyLongProperty");
   1.111 -ReadOnlyLongPropertyBase               = Java.type("javafx.beans.property.ReadOnlyLongPropertyBase");
   1.112 -ReadOnlyLongWrapper                    = Java.type("javafx.beans.property.ReadOnlyLongWrapper");
   1.113 -ReadOnlyMapProperty                    = Java.type("javafx.beans.property.ReadOnlyMapProperty");
   1.114 -ReadOnlyMapPropertyBase                = Java.type("javafx.beans.property.ReadOnlyMapPropertyBase");
   1.115 -ReadOnlyMapWrapper                     = Java.type("javafx.beans.property.ReadOnlyMapWrapper");
   1.116 -ReadOnlyObjectProperty                 = Java.type("javafx.beans.property.ReadOnlyObjectProperty");
   1.117 -ReadOnlyObjectPropertyBase             = Java.type("javafx.beans.property.ReadOnlyObjectPropertyBase");
   1.118 -ReadOnlyObjectWrapper                  = Java.type("javafx.beans.property.ReadOnlyObjectWrapper");
   1.119 -ReadOnlyProperty                       = Java.type("javafx.beans.property.ReadOnlyProperty");
   1.120 -ReadOnlySetProperty                    = Java.type("javafx.beans.property.ReadOnlySetProperty");
   1.121 -ReadOnlySetPropertyBase                = Java.type("javafx.beans.property.ReadOnlySetPropertyBase");
   1.122 -ReadOnlySetWrapper                     = Java.type("javafx.beans.property.ReadOnlySetWrapper");
   1.123 -ReadOnlyStringProperty                 = Java.type("javafx.beans.property.ReadOnlyStringProperty");
   1.124 -ReadOnlyStringPropertyBase             = Java.type("javafx.beans.property.ReadOnlyStringPropertyBase");
   1.125 -ReadOnlyStringWrapper                  = Java.type("javafx.beans.property.ReadOnlyStringWrapper");
   1.126 -SetProperty                            = Java.type("javafx.beans.property.SetProperty");
   1.127 -SetPropertyBase                        = Java.type("javafx.beans.property.SetPropertyBase");
   1.128 -SimpleBooleanProperty                  = Java.type("javafx.beans.property.SimpleBooleanProperty");
   1.129 -SimpleDoubleProperty                   = Java.type("javafx.beans.property.SimpleDoubleProperty");
   1.130 -SimpleFloatProperty                    = Java.type("javafx.beans.property.SimpleFloatProperty");
   1.131 -SimpleIntegerProperty                  = Java.type("javafx.beans.property.SimpleIntegerProperty");
   1.132 -SimpleListProperty                     = Java.type("javafx.beans.property.SimpleListProperty");
   1.133 -SimpleLongProperty                     = Java.type("javafx.beans.property.SimpleLongProperty");
   1.134 -SimpleMapProperty                      = Java.type("javafx.beans.property.SimpleMapProperty");
   1.135 -SimpleObjectProperty                   = Java.type("javafx.beans.property.SimpleObjectProperty");
   1.136 -SimpleSetProperty                      = Java.type("javafx.beans.property.SimpleSetProperty");
   1.137 -SimpleStringProperty                   = Java.type("javafx.beans.property.SimpleStringProperty");
   1.138 -StringProperty                         = Java.type("javafx.beans.property.StringProperty");
   1.139 -StringPropertyBase                     = Java.type("javafx.beans.property.StringPropertyBase");
   1.140 -ChangeListener                         = Java.type("javafx.beans.value.ChangeListener");
   1.141 -ObservableBooleanValue                 = Java.type("javafx.beans.value.ObservableBooleanValue");
   1.142 -ObservableDoubleValue                  = Java.type("javafx.beans.value.ObservableDoubleValue");
   1.143 -ObservableFloatValue                   = Java.type("javafx.beans.value.ObservableFloatValue");
   1.144 -ObservableIntegerValue                 = Java.type("javafx.beans.value.ObservableIntegerValue");
   1.145 -ObservableListValue                    = Java.type("javafx.beans.value.ObservableListValue");
   1.146 -ObservableLongValue                    = Java.type("javafx.beans.value.ObservableLongValue");
   1.147 -ObservableMapValue                     = Java.type("javafx.beans.value.ObservableMapValue");
   1.148 -ObservableNumberValue                  = Java.type("javafx.beans.value.ObservableNumberValue");
   1.149 -ObservableObjectValue                  = Java.type("javafx.beans.value.ObservableObjectValue");
   1.150 -ObservableSetValue                     = Java.type("javafx.beans.value.ObservableSetValue");
   1.151 -ObservableStringValue                  = Java.type("javafx.beans.value.ObservableStringValue");
   1.152 -ObservableValue                        = Java.type("javafx.beans.value.ObservableValue");
   1.153 -ObservableValueBase                    = Java.type("javafx.beans.value.ObservableValueBase");
   1.154 -WeakChangeListener                     = Java.type("javafx.beans.value.WeakChangeListener");
   1.155 -WritableBooleanValue                   = Java.type("javafx.beans.value.WritableBooleanValue");
   1.156 -WritableDoubleValue                    = Java.type("javafx.beans.value.WritableDoubleValue");
   1.157 -WritableFloatValue                     = Java.type("javafx.beans.value.WritableFloatValue");
   1.158 -WritableIntegerValue                   = Java.type("javafx.beans.value.WritableIntegerValue");
   1.159 -WritableListValue                      = Java.type("javafx.beans.value.WritableListValue");
   1.160 -WritableLongValue                      = Java.type("javafx.beans.value.WritableLongValue");
   1.161 -WritableMapValue                       = Java.type("javafx.beans.value.WritableMapValue");
   1.162 -WritableNumberValue                    = Java.type("javafx.beans.value.WritableNumberValue");
   1.163 -WritableObjectValue                    = Java.type("javafx.beans.value.WritableObjectValue");
   1.164 -WritableSetValue                       = Java.type("javafx.beans.value.WritableSetValue");
   1.165 -WritableStringValue                    = Java.type("javafx.beans.value.WritableStringValue");
   1.166 -WritableValue                          = Java.type("javafx.beans.value.WritableValue");
   1.167 -WeakInvalidationListener               = Java.type("javafx.beans.WeakInvalidationListener");
   1.168 -WeakListener                           = Java.type("javafx.beans.WeakListener");
   1.169 -FXCollections                          = Java.type("javafx.collections.FXCollections");
   1.170 -ListChangeListener                     = Java.type("javafx.collections.ListChangeListener");
   1.171 -ListChangeListener$Change              = Java.type("javafx.collections.ListChangeListener$Change");
   1.172 -MapChangeListener                      = Java.type("javafx.collections.MapChangeListener");
   1.173 -MapChangeListener$Change               = Java.type("javafx.collections.MapChangeListener$Change");
   1.174 -ModifiableObservableListBase           = Java.type("javafx.collections.ModifiableObservableListBase");
   1.175 -ObservableList                         = Java.type("javafx.collections.ObservableList");
   1.176 -ObservableListBase                     = Java.type("javafx.collections.ObservableListBase");
   1.177 -ObservableMap                          = Java.type("javafx.collections.ObservableMap");
   1.178 -ObservableSet                          = Java.type("javafx.collections.ObservableSet");
   1.179 -SetChangeListener                      = Java.type("javafx.collections.SetChangeListener");
   1.180 -SetChangeListener$Change               = Java.type("javafx.collections.SetChangeListener$Change");
   1.181 -WeakListChangeListener                 = Java.type("javafx.collections.WeakListChangeListener");
   1.182 -WeakMapChangeListener                  = Java.type("javafx.collections.WeakMapChangeListener");
   1.183 -WeakSetChangeListener                  = Java.type("javafx.collections.WeakSetChangeListener");
   1.184 -ActionEvent                            = Java.type("javafx.event.ActionEvent");
   1.185 -Event                                  = Java.type("javafx.event.Event");
   1.186 -EventDispatchChain                     = Java.type("javafx.event.EventDispatchChain");
   1.187 -EventDispatcher                        = Java.type("javafx.event.EventDispatcher");
   1.188 -EventHandler                           = Java.type("javafx.event.EventHandler");
   1.189 -EventTarget                            = Java.type("javafx.event.EventTarget");
   1.190 -EventType                              = Java.type("javafx.event.EventType");
   1.191 -WeakEventHandler                       = Java.type("javafx.event.WeakEventHandler");
   1.192 -Builder                                = Java.type("javafx.util.Builder");
   1.193 -BuilderFactory                         = Java.type("javafx.util.BuilderFactory");
   1.194 -Callback                               = Java.type("javafx.util.Callback");
   1.195 -BigDecimalStringConverter              = Java.type("javafx.util.converter.BigDecimalStringConverter");
   1.196 -BigIntegerStringConverter              = Java.type("javafx.util.converter.BigIntegerStringConverter");
   1.197 -BooleanStringConverter                 = Java.type("javafx.util.converter.BooleanStringConverter");
   1.198 -ByteStringConverter                    = Java.type("javafx.util.converter.ByteStringConverter");
   1.199 -CharacterStringConverter               = Java.type("javafx.util.converter.CharacterStringConverter");
   1.200 -CurrencyStringConverter                = Java.type("javafx.util.converter.CurrencyStringConverter");
   1.201 -DateStringConverter                    = Java.type("javafx.util.converter.DateStringConverter");
   1.202 -DateTimeStringConverter                = Java.type("javafx.util.converter.DateTimeStringConverter");
   1.203 -DefaultStringConverter                 = Java.type("javafx.util.converter.DefaultStringConverter");
   1.204 -DoubleStringConverter                  = Java.type("javafx.util.converter.DoubleStringConverter");
   1.205 -FloatStringConverter                   = Java.type("javafx.util.converter.FloatStringConverter");
   1.206 -FormatStringConverter                  = Java.type("javafx.util.converter.FormatStringConverter");
   1.207 -IntegerStringConverter                 = Java.type("javafx.util.converter.IntegerStringConverter");
   1.208 -LongStringConverter                    = Java.type("javafx.util.converter.LongStringConverter");
   1.209 -NumberStringConverter                  = Java.type("javafx.util.converter.NumberStringConverter");
   1.210 -PercentageStringConverter              = Java.type("javafx.util.converter.PercentageStringConverter");
   1.211 -ShortStringConverter                   = Java.type("javafx.util.converter.ShortStringConverter");
   1.212 -TimeStringConverter                    = Java.type("javafx.util.converter.TimeStringConverter");
   1.213 -Duration                               = Java.type("javafx.util.Duration");
   1.214 -Pair                                   = Java.type("javafx.util.Pair");
   1.215 -StringConverter                        = Java.type("javafx.util.StringConverter");
   1.216 +function LOAD_FX_CLASSES(clsList) {
   1.217 +
   1.218 +    for each (var cls in clsList) {
   1.219 +        // Ex. Stage = Java.type("javafx.stage.Stage");
   1.220 +        this[cls[cls.length - 1]] = Java.type(cls.join("."));
   1.221 +    }
   1.222 +}
   1.223 +
   1.224 +(function() {
   1.225 +    var System           = Java.type("java.lang.System");
   1.226 +    var ZipFile          = Java.type("java.util.zip.ZipFile");
   1.227 +
   1.228 +    var SUFFIX_LENGTH    = ".class".length;
   1.229 +
   1.230 +    try {
   1.231 +        var jfxrtJar = new ZipFile(System.getProperty("java.home") + "/lib/ext/jfxrt.jar");
   1.232 +    } catch (ex) {
   1.233 +        throw new Error("JavaFX runtime not found");
   1.234 +    }
   1.235 +
   1.236 +    var entries = jfxrtJar.entries();
   1.237 +
   1.238 +    while (entries.hasMoreElements()) {
   1.239 +        var entry = entries.nextElement();
   1.240 +
   1.241 +        if (entry.isDirectory()) {
   1.242 +            continue;
   1.243 +        }
   1.244 +
   1.245 +        var name = entry.name;
   1.246 +
   1.247 +        if (!name.endsWith(".class")) {
   1.248 +            continue;
   1.249 +        }
   1.250 +
   1.251 +        name = name.substring(0, name.length - SUFFIX_LENGTH);
   1.252 +        cls = name.split("/");
   1.253 +
   1.254 +        if (cls[0] != "javafx") {
   1.255 +            continue;
   1.256 +        }
   1.257 +
   1.258 +        var last = cls[cls.length - 1];
   1.259 +        var nested = last.lastIndexOf("$");
   1.260 +
   1.261 +        // If class name ends with $nnn
   1.262 +        if (nested != -1 && !(last.substring(nested) - 0)) {
   1.263 +            continue;
   1.264 +        }
   1.265 +
   1.266 +        switch (cls[1]) {
   1.267 +        case "stage":
   1.268 +            if (cls[2] == "Stage") {
   1.269 +                JFX_BASE_CLASSES.push(cls);
   1.270 +            } else {
   1.271 +                JFX_GRAPHICS_CLASSES.push(cls);
   1.272 +            }
   1.273 +            break;
   1.274 +
   1.275 +        case "scene":
   1.276 +            switch (cls[2]) {
   1.277 +            case "Scene":
   1.278 +            case "Group":
   1.279 +                JFX_BASE_CLASSES.push(cls);
   1.280 +                break;
   1.281 +
   1.282 +            case "chart":
   1.283 +            case "control":
   1.284 +                JFX_CONTROLS_CLASSES.push(cls);
   1.285 +                break;
   1.286 +
   1.287 +            case "web":
   1.288 +                JFX_WEB_CLASSES.push(cls);
   1.289 +                break;
   1.290 +
   1.291 +            case "media":
   1.292 +                JFX_MEDIA_CLASSES.push(cls);
   1.293 +                break;
   1.294 +
   1.295 +            default:
   1.296 +                JFX_GRAPHICS_CLASSES.push(cls);
   1.297 +                break;
   1.298 +            }
   1.299 +            break;
   1.300 +
   1.301 +        case "beans":
   1.302 +        case "collections":
   1.303 +        case "events":
   1.304 +        case "util":
   1.305 +            JFX_BASE_CLASSES.push(cls);
   1.306 +            break;
   1.307 +
   1.308 +        case "animation":
   1.309 +        case "application":
   1.310 +        case "concurrent":
   1.311 +        case "css":
   1.312 +        case "geometry":
   1.313 +            JFX_GRAPHICS_CLASSES.push(cls);
   1.314 +            break;
   1.315 +
   1.316 +        case "fxml":
   1.317 +            JFX_FXML_CLASSES.push(cls);
   1.318 +            break;
   1.319 +
   1.320 +        case "embed":
   1.321 +            if (cls[2] == "swing") {
   1.322 +                JFX_SWING_CLASSES.push(cls);
   1.323 +            } else {
   1.324 +                JFX_SWT_CLASSES.push(cls);
   1.325 +            }
   1.326 +            break;
   1.327 +        }
   1.328 +    }
   1.329 +})();

     2.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/fxml.js	Mon Sep 09 20:10:41 2013 +0530
     2.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/fxml.js	Mon Sep 09 13:35:35 2013 -0300
     2.3 @@ -23,8 +23,8 @@
     2.4   * questions.
     2.5   */
     2.6  
     2.7 -FXML                 = Java.type("javafx.fxml.FXML");
     2.8 -FXMLLoader           = Java.type("javafx.fxml.FXMLLoader");
     2.9 -Initializable        = Java.type("javafx.fxml.Initializable");
    2.10 -JavaFXBuilderFactory = Java.type("javafx.fxml.JavaFXBuilderFactory");
    2.11 -LoadException        = Java.type("javafx.fxml.LoadException");
    2.12 +if (!this.JFX_BASE_CLASSES) {
    2.13 +    load("fx:base.js")
    2.14 +}
    2.15 +
    2.16 +LOAD_FX_CLASSES(JFX_FXML_CLASSES);

     3.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/graphics.js	Mon Sep 09 20:10:41 2013 +0530
     3.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/graphics.js	Mon Sep 09 13:35:35 2013 -0300
     3.3 @@ -23,409 +23,10 @@
     3.4   * questions.
     3.5   */
     3.6  
     3.7 -Animation                              = Java.type("javafx.animation.Animation");
     3.8 -Animation$Status                       = Java.type("javafx.animation.Animation$Status");
     3.9 -AnimationBuilder                       = Java.type("javafx.animation.AnimationBuilder");
    3.10 -AnimationTimer                         = Java.type("javafx.animation.AnimationTimer");
    3.11 -FadeTransition                         = Java.type("javafx.animation.FadeTransition");
    3.12 -FadeTransitionBuilder                  = Java.type("javafx.animation.FadeTransitionBuilder");
    3.13 -FillTransition                         = Java.type("javafx.animation.FillTransition");
    3.14 -FillTransitionBuilder                  = Java.type("javafx.animation.FillTransitionBuilder");
    3.15 -Interpolatable                         = Java.type("javafx.animation.Interpolatable");
    3.16 -Interpolator                           = Java.type("javafx.animation.Interpolator");
    3.17 -KeyFrame                               = Java.type("javafx.animation.KeyFrame");
    3.18 -KeyValue                               = Java.type("javafx.animation.KeyValue");
    3.19 -ParallelTransition                     = Java.type("javafx.animation.ParallelTransition");
    3.20 -ParallelTransitionBuilder              = Java.type("javafx.animation.ParallelTransitionBuilder");
    3.21 -PathTransition                         = Java.type("javafx.animation.PathTransition");
    3.22 -PathTransition$OrientationType         = Java.type("javafx.animation.PathTransition$OrientationType");
    3.23 -PathTransitionBuilder                  = Java.type("javafx.animation.PathTransitionBuilder");
    3.24 -PauseTransition                        = Java.type("javafx.animation.PauseTransition");
    3.25 -PauseTransitionBuilder                 = Java.type("javafx.animation.PauseTransitionBuilder");
    3.26 -RotateTransition                       = Java.type("javafx.animation.RotateTransition");
    3.27 -RotateTransitionBuilder                = Java.type("javafx.animation.RotateTransitionBuilder");
    3.28 -ScaleTransition                        = Java.type("javafx.animation.ScaleTransition");
    3.29 -ScaleTransitionBuilder                 = Java.type("javafx.animation.ScaleTransitionBuilder");
    3.30 -SequentialTransition                   = Java.type("javafx.animation.SequentialTransition");
    3.31 -SequentialTransitionBuilder            = Java.type("javafx.animation.SequentialTransitionBuilder");
    3.32 -StrokeTransition                       = Java.type("javafx.animation.StrokeTransition");
    3.33 -StrokeTransitionBuilder                = Java.type("javafx.animation.StrokeTransitionBuilder");
    3.34 -Timeline                               = Java.type("javafx.animation.Timeline");
    3.35 -TimelineBuilder                        = Java.type("javafx.animation.TimelineBuilder");
    3.36 -Transition                             = Java.type("javafx.animation.Transition");
    3.37 -TransitionBuilder                      = Java.type("javafx.animation.TransitionBuilder");
    3.38 -TranslateTransition                    = Java.type("javafx.animation.TranslateTransition");
    3.39 -TranslateTransitionBuilder             = Java.type("javafx.animation.TranslateTransitionBuilder");
    3.40 -Application                            = Java.type("javafx.application.Application");
    3.41 -Application$Parameters                 = Java.type("javafx.application.Application$Parameters");
    3.42 -ConditionalFeature                     = Java.type("javafx.application.ConditionalFeature");
    3.43 -HostServices                           = Java.type("javafx.application.HostServices");
    3.44 -Platform                               = Java.type("javafx.application.Platform");
    3.45 -Preloader                              = Java.type("javafx.application.Preloader");
    3.46 -Preloader$ErrorNotification            = Java.type("javafx.application.Preloader$ErrorNotification");
    3.47 -Preloader$PreloaderNotification        = Java.type("javafx.application.Preloader$PreloaderNotification");
    3.48 -Preloader$ProgressNotification         = Java.type("javafx.application.Preloader$ProgressNotification");
    3.49 -Preloader$StateChangeNotification      = Java.type("javafx.application.Preloader$StateChangeNotification");
    3.50 -Preloader$StateChangeNotification$Type = Java.type("javafx.application.Preloader$StateChangeNotification$Type");
    3.51 -ScheduledService                       = Java.type("javafx.concurrent.ScheduledService");
    3.52 -Service                                = Java.type("javafx.concurrent.Service");
    3.53 -Task                                   = Java.type("javafx.concurrent.Task");
    3.54 -Worker                                 = Java.type("javafx.concurrent.Worker");
    3.55 -Worker$State                           = Java.type("javafx.concurrent.Worker$State");
    3.56 -WorkerStateEvent                       = Java.type("javafx.concurrent.WorkerStateEvent");
    3.57 -CssMetaData                            = Java.type("javafx.css.CssMetaData");
    3.58 -FontCssMetaData                        = Java.type("javafx.css.FontCssMetaData");
    3.59 -ParsedValue                            = Java.type("javafx.css.ParsedValue");
    3.60 -PseudoClass                            = Java.type("javafx.css.PseudoClass");
    3.61 -SimpleStyleableBooleanProperty         = Java.type("javafx.css.SimpleStyleableBooleanProperty");
    3.62 -SimpleStyleableDoubleProperty          = Java.type("javafx.css.SimpleStyleableDoubleProperty");
    3.63 -SimpleStyleableFloatProperty           = Java.type("javafx.css.SimpleStyleableFloatProperty");
    3.64 -SimpleStyleableIntegerProperty         = Java.type("javafx.css.SimpleStyleableIntegerProperty");
    3.65 -SimpleStyleableLongProperty            = Java.type("javafx.css.SimpleStyleableLongProperty");
    3.66 -SimpleStyleableObjectProperty          = Java.type("javafx.css.SimpleStyleableObjectProperty");
    3.67 -SimpleStyleableStringProperty          = Java.type("javafx.css.SimpleStyleableStringProperty");
    3.68 -Styleable                              = Java.type("javafx.css.Styleable");
    3.69 -StyleableBooleanProperty               = Java.type("javafx.css.StyleableBooleanProperty");
    3.70 -StyleableDoubleProperty                = Java.type("javafx.css.StyleableDoubleProperty");
    3.71 -StyleableFloatProperty                 = Java.type("javafx.css.StyleableFloatProperty");
    3.72 -StyleableIntegerProperty               = Java.type("javafx.css.StyleableIntegerProperty");
    3.73 -StyleableLongProperty                  = Java.type("javafx.css.StyleableLongProperty");
    3.74 -StyleableObjectProperty                = Java.type("javafx.css.StyleableObjectProperty");
    3.75 -StyleableProperty                      = Java.type("javafx.css.StyleableProperty");
    3.76 -StyleableStringProperty                = Java.type("javafx.css.StyleableStringProperty");
    3.77 -StyleConverter                         = Java.type("javafx.css.StyleConverter");
    3.78 -StyleOrigin                            = Java.type("javafx.css.StyleOrigin");
    3.79 -BoundingBox                            = Java.type("javafx.geometry.BoundingBox");
    3.80 -BoundingBoxBuilder                     = Java.type("javafx.geometry.BoundingBoxBuilder");
    3.81 -Bounds                                 = Java.type("javafx.geometry.Bounds");
    3.82 -Dimension2D                            = Java.type("javafx.geometry.Dimension2D");
    3.83 -Dimension2DBuilder                     = Java.type("javafx.geometry.Dimension2DBuilder");
    3.84 -HorizontalDirection                    = Java.type("javafx.geometry.HorizontalDirection");
    3.85 -HPos                                   = Java.type("javafx.geometry.HPos");
    3.86 -Insets                                 = Java.type("javafx.geometry.Insets");
    3.87 -InsetsBuilder                          = Java.type("javafx.geometry.InsetsBuilder");
    3.88 -NodeOrientation                        = Java.type("javafx.geometry.NodeOrientation");
    3.89 -Orientation                            = Java.type("javafx.geometry.Orientation");
    3.90 -Point2D                                = Java.type("javafx.geometry.Point2D");
    3.91 -Point2DBuilder                         = Java.type("javafx.geometry.Point2DBuilder");
    3.92 -Point3D                                = Java.type("javafx.geometry.Point3D");
    3.93 -Point3DBuilder                         = Java.type("javafx.geometry.Point3DBuilder");
    3.94 -Pos                                    = Java.type("javafx.geometry.Pos");
    3.95 -Rectangle2D                            = Java.type("javafx.geometry.Rectangle2D");
    3.96 -Rectangle2DBuilder                     = Java.type("javafx.geometry.Rectangle2DBuilder");
    3.97 -Side                                   = Java.type("javafx.geometry.Side");
    3.98 -VerticalDirection                      = Java.type("javafx.geometry.VerticalDirection");
    3.99 -VPos                                   = Java.type("javafx.geometry.VPos");
   3.100 -Collation                              = Java.type("javafx.print.Collation");
   3.101 -JobSettings                            = Java.type("javafx.print.JobSettings");
   3.102 -PageLayout                             = Java.type("javafx.print.PageLayout");
   3.103 -PageOrientation                        = Java.type("javafx.print.PageOrientation");
   3.104 -PageRange                              = Java.type("javafx.print.PageRange");
   3.105 -Paper                                  = Java.type("javafx.print.Paper");
   3.106 -Paper$Units                            = Java.type("javafx.print.Paper$Units");
   3.107 -PaperSource                            = Java.type("javafx.print.PaperSource");
   3.108 -PrintColor                             = Java.type("javafx.print.PrintColor");
   3.109 -Printer                                = Java.type("javafx.print.Printer");
   3.110 -Printer$MarginType                     = Java.type("javafx.print.Printer$MarginType");
   3.111 -PrinterAttributes                      = Java.type("javafx.print.PrinterAttributes");
   3.112 -PrinterJob                             = Java.type("javafx.print.PrinterJob");
   3.113 -PrinterJob$JobStatus                   = Java.type("javafx.print.PrinterJob$JobStatus");
   3.114 -PrintQuality                           = Java.type("javafx.print.PrintQuality");
   3.115 -PrintResolution                        = Java.type("javafx.print.PrintResolution");
   3.116 -PrintSides                             = Java.type("javafx.print.PrintSides");
   3.117 -AmbientLight                           = Java.type("javafx.scene.AmbientLight");
   3.118 -//AmbientLightBuilder                    = Java.type("javafx.scene.AmbientLightBuilder");
   3.119 -CacheHint                              = Java.type("javafx.scene.CacheHint");
   3.120 -Camera                                 = Java.type("javafx.scene.Camera");
   3.121 -//CameraBuilder                          = Java.type("javafx.scene.CameraBuilder");
   3.122 -Canvas                                 = Java.type("javafx.scene.canvas.Canvas");
   3.123 -CanvasBuilder                          = Java.type("javafx.scene.canvas.CanvasBuilder");
   3.124 -GraphicsContext                        = Java.type("javafx.scene.canvas.GraphicsContext");
   3.125 -Cursor                                 = Java.type("javafx.scene.Cursor");
   3.126 -DepthTest                              = Java.type("javafx.scene.DepthTest");
   3.127 -Blend                                  = Java.type("javafx.scene.effect.Blend");
   3.128 -BlendBuilder                           = Java.type("javafx.scene.effect.BlendBuilder");
   3.129 -BlendMode                              = Java.type("javafx.scene.effect.BlendMode");
   3.130 -Bloom                                  = Java.type("javafx.scene.effect.Bloom");
   3.131 -BloomBuilder                           = Java.type("javafx.scene.effect.BloomBuilder");
   3.132 -BlurType                               = Java.type("javafx.scene.effect.BlurType");
   3.133 -BoxBlur                                = Java.type("javafx.scene.effect.BoxBlur");
   3.134 -BoxBlurBuilder                         = Java.type("javafx.scene.effect.BoxBlurBuilder");
   3.135 -ColorAdjust                            = Java.type("javafx.scene.effect.ColorAdjust");
   3.136 -ColorAdjustBuilder                     = Java.type("javafx.scene.effect.ColorAdjustBuilder");
   3.137 -ColorInput                             = Java.type("javafx.scene.effect.ColorInput");
   3.138 -ColorInputBuilder                      = Java.type("javafx.scene.effect.ColorInputBuilder");
   3.139 -DisplacementMap                        = Java.type("javafx.scene.effect.DisplacementMap");
   3.140 -DisplacementMapBuilder                 = Java.type("javafx.scene.effect.DisplacementMapBuilder");
   3.141 -DropShadow                             = Java.type("javafx.scene.effect.DropShadow");
   3.142 -DropShadowBuilder                      = Java.type("javafx.scene.effect.DropShadowBuilder");
   3.143 -Effect                                 = Java.type("javafx.scene.effect.Effect");
   3.144 -FloatMap                               = Java.type("javafx.scene.effect.FloatMap");
   3.145 -FloatMapBuilder                        = Java.type("javafx.scene.effect.FloatMapBuilder");
   3.146 -GaussianBlur                           = Java.type("javafx.scene.effect.GaussianBlur");
   3.147 -GaussianBlurBuilder                    = Java.type("javafx.scene.effect.GaussianBlurBuilder");
   3.148 -Glow                                   = Java.type("javafx.scene.effect.Glow");
   3.149 -GlowBuilder                            = Java.type("javafx.scene.effect.GlowBuilder");
   3.150 -ImageInput                             = Java.type("javafx.scene.effect.ImageInput");
   3.151 -ImageInputBuilder                      = Java.type("javafx.scene.effect.ImageInputBuilder");
   3.152 -InnerShadow                            = Java.type("javafx.scene.effect.InnerShadow");
   3.153 -InnerShadowBuilder                     = Java.type("javafx.scene.effect.InnerShadowBuilder");
   3.154 -Light                                  = Java.type("javafx.scene.effect.Light");
   3.155 -Light$Distant                          = Java.type("javafx.scene.effect.Light$Distant");
   3.156 -Light$Point                            = Java.type("javafx.scene.effect.Light$Point");
   3.157 -Light$Spot                             = Java.type("javafx.scene.effect.Light$Spot");
   3.158 -LightBuilder                           = Java.type("javafx.scene.effect.LightBuilder");
   3.159 -Lighting                               = Java.type("javafx.scene.effect.Lighting");
   3.160 -LightingBuilder                        = Java.type("javafx.scene.effect.LightingBuilder");
   3.161 -MotionBlur                             = Java.type("javafx.scene.effect.MotionBlur");
   3.162 -MotionBlurBuilder                      = Java.type("javafx.scene.effect.MotionBlurBuilder");
   3.163 -PerspectiveTransform                   = Java.type("javafx.scene.effect.PerspectiveTransform");
   3.164 -PerspectiveTransformBuilder            = Java.type("javafx.scene.effect.PerspectiveTransformBuilder");
   3.165 -Reflection                             = Java.type("javafx.scene.effect.Reflection");
   3.166 -ReflectionBuilder                      = Java.type("javafx.scene.effect.ReflectionBuilder");
   3.167 -SepiaTone                              = Java.type("javafx.scene.effect.SepiaTone");
   3.168 -SepiaToneBuilder                       = Java.type("javafx.scene.effect.SepiaToneBuilder");
   3.169 -Shadow                                 = Java.type("javafx.scene.effect.Shadow");
   3.170 -ShadowBuilder                          = Java.type("javafx.scene.effect.ShadowBuilder");
   3.171 -//Group                                  = Java.type("javafx.scene.Group");
   3.172 -GroupBuilder                           = Java.type("javafx.scene.GroupBuilder");
   3.173 -Image                                  = Java.type("javafx.scene.image.Image");
   3.174 -ImageView                              = Java.type("javafx.scene.image.ImageView");
   3.175 -ImageViewBuilder                       = Java.type("javafx.scene.image.ImageViewBuilder");
   3.176 -PixelFormat                            = Java.type("javafx.scene.image.PixelFormat");
   3.177 -PixelFormat$Type                       = Java.type("javafx.scene.image.PixelFormat$Type");
   3.178 -PixelReader                            = Java.type("javafx.scene.image.PixelReader");
   3.179 -PixelWriter                            = Java.type("javafx.scene.image.PixelWriter");
   3.180 -WritableImage                          = Java.type("javafx.scene.image.WritableImage");
   3.181 -WritablePixelFormat                    = Java.type("javafx.scene.image.WritablePixelFormat");
   3.182 -ImageCursor                            = Java.type("javafx.scene.ImageCursor");
   3.183 -ImageCursorBuilder                     = Java.type("javafx.scene.ImageCursorBuilder");
   3.184 -Clipboard                              = Java.type("javafx.scene.input.Clipboard");
   3.185 -ClipboardContent                       = Java.type("javafx.scene.input.ClipboardContent");
   3.186 -ClipboardContentBuilder                = Java.type("javafx.scene.input.ClipboardContentBuilder");
   3.187 -ContextMenuEvent                       = Java.type("javafx.scene.input.ContextMenuEvent");
   3.188 -DataFormat                             = Java.type("javafx.scene.input.DataFormat");
   3.189 -Dragboard                              = Java.type("javafx.scene.input.Dragboard");
   3.190 -DragEvent                              = Java.type("javafx.scene.input.DragEvent");
   3.191 -GestureEvent                           = Java.type("javafx.scene.input.GestureEvent");
   3.192 -InputEvent                             = Java.type("javafx.scene.input.InputEvent");
   3.193 -//InputEventBuilder                      = Java.type("javafx.scene.input.InputEventBuilder");
   3.194 -InputMethodEvent                       = Java.type("javafx.scene.input.InputMethodEvent");
   3.195 -InputMethodHighlight                   = Java.type("javafx.scene.input.InputMethodHighlight");
   3.196 -InputMethodRequests                    = Java.type("javafx.scene.input.InputMethodRequests");
   3.197 -InputMethodTextRun                     = Java.type("javafx.scene.input.InputMethodTextRun");
   3.198 -//InputMethodTextRunBuilder              = Java.type("javafx.scene.input.InputMethodTextRunBuilder");
   3.199 -KeyCharacterCombination                = Java.type("javafx.scene.input.KeyCharacterCombination");
   3.200 -KeyCharacterCombinationBuilder         = Java.type("javafx.scene.input.KeyCharacterCombinationBuilder");
   3.201 -KeyCode                                = Java.type("javafx.scene.input.KeyCode");
   3.202 -KeyCodeCombination                     = Java.type("javafx.scene.input.KeyCodeCombination");
   3.203 -KeyCodeCombinationBuilder              = Java.type("javafx.scene.input.KeyCodeCombinationBuilder");
   3.204 -KeyCombination                         = Java.type("javafx.scene.input.KeyCombination");
   3.205 -KeyCombination$Modifier                = Java.type("javafx.scene.input.KeyCombination$Modifier");
   3.206 -KeyCombination$ModifierValue           = Java.type("javafx.scene.input.KeyCombination$ModifierValue");
   3.207 -KeyEvent                               = Java.type("javafx.scene.input.KeyEvent");
   3.208 -Mnemonic                               = Java.type("javafx.scene.input.Mnemonic");
   3.209 -MnemonicBuilder                        = Java.type("javafx.scene.input.MnemonicBuilder");
   3.210 -MouseButton                            = Java.type("javafx.scene.input.MouseButton");
   3.211 -MouseDragEvent                         = Java.type("javafx.scene.input.MouseDragEvent");
   3.212 -MouseEvent                             = Java.type("javafx.scene.input.MouseEvent");
   3.213 -PickResult                             = Java.type("javafx.scene.input.PickResult");
   3.214 -RotateEvent                            = Java.type("javafx.scene.input.RotateEvent");
   3.215 -ScrollEvent                            = Java.type("javafx.scene.input.ScrollEvent");
   3.216 -ScrollEvent$HorizontalTextScrollUnits  = Java.type("javafx.scene.input.ScrollEvent$HorizontalTextScrollUnits");
   3.217 -ScrollEvent$VerticalTextScrollUnits    = Java.type("javafx.scene.input.ScrollEvent$VerticalTextScrollUnits");
   3.218 -SwipeEvent                             = Java.type("javafx.scene.input.SwipeEvent");
   3.219 -TouchEvent                             = Java.type("javafx.scene.input.TouchEvent");
   3.220 -TouchPoint                             = Java.type("javafx.scene.input.TouchPoint");
   3.221 -TouchPoint$State                       = Java.type("javafx.scene.input.TouchPoint$State");
   3.222 -//TouchPointBuilder                      = Java.type("javafx.scene.input.TouchPointBuilder");
   3.223 -TransferMode                           = Java.type("javafx.scene.input.TransferMode");
   3.224 -ZoomEvent                              = Java.type("javafx.scene.input.ZoomEvent");
   3.225 -AnchorPane                             = Java.type("javafx.scene.layout.AnchorPane");
   3.226 -AnchorPaneBuilder                      = Java.type("javafx.scene.layout.AnchorPaneBuilder");
   3.227 -Background                             = Java.type("javafx.scene.layout.Background");
   3.228 -//BackgroundBuilder                      = Java.type("javafx.scene.layout.BackgroundBuilder");
   3.229 -BackgroundFill                         = Java.type("javafx.scene.layout.BackgroundFill");
   3.230 -//BackgroundFillBuilder                  = Java.type("javafx.scene.layout.BackgroundFillBuilder");
   3.231 -BackgroundImage                        = Java.type("javafx.scene.layout.BackgroundImage");
   3.232 -//BackgroundImageBuilder                 = Java.type("javafx.scene.layout.BackgroundImageBuilder");
   3.233 -BackgroundPosition                     = Java.type("javafx.scene.layout.BackgroundPosition");
   3.234 -//BackgroundPositionBuilder              = Java.type("javafx.scene.layout.BackgroundPositionBuilder");
   3.235 -BackgroundRepeat                       = Java.type("javafx.scene.layout.BackgroundRepeat");
   3.236 -BackgroundSize                         = Java.type("javafx.scene.layout.BackgroundSize");
   3.237 -//BackgroundSizeBuilder                  = Java.type("javafx.scene.layout.BackgroundSizeBuilder");
   3.238 -Border                                 = Java.type("javafx.scene.layout.Border");
   3.239 -//BorderBuilder                          = Java.type("javafx.scene.layout.BorderBuilder");
   3.240 -BorderImage                            = Java.type("javafx.scene.layout.BorderImage");
   3.241 -//BorderImageBuilder                     = Java.type("javafx.scene.layout.BorderImageBuilder");
   3.242 -BorderPane                             = Java.type("javafx.scene.layout.BorderPane");
   3.243 -BorderPaneBuilder                      = Java.type("javafx.scene.layout.BorderPaneBuilder");
   3.244 -BorderRepeat                           = Java.type("javafx.scene.layout.BorderRepeat");
   3.245 -BorderStroke                           = Java.type("javafx.scene.layout.BorderStroke");
   3.246 -//BorderStrokeBuilder                    = Java.type("javafx.scene.layout.BorderStrokeBuilder");
   3.247 -BorderStrokeStyle                      = Java.type("javafx.scene.layout.BorderStrokeStyle");
   3.248 -//BorderStrokeStyleBuilder               = Java.type("javafx.scene.layout.BorderStrokeStyleBuilder");
   3.249 -BorderWidths                           = Java.type("javafx.scene.layout.BorderWidths");
   3.250 -//BorderWidthsBuilder                    = Java.type("javafx.scene.layout.BorderWidthsBuilder");
   3.251 -ColumnConstraints                      = Java.type("javafx.scene.layout.ColumnConstraints");
   3.252 -ColumnConstraintsBuilder               = Java.type("javafx.scene.layout.ColumnConstraintsBuilder");
   3.253 -ConstraintsBase                        = Java.type("javafx.scene.layout.ConstraintsBase");
   3.254 -CornerRadii                            = Java.type("javafx.scene.layout.CornerRadii");
   3.255 -FlowPane                               = Java.type("javafx.scene.layout.FlowPane");
   3.256 -FlowPaneBuilder                        = Java.type("javafx.scene.layout.FlowPaneBuilder");
   3.257 -GridPane                               = Java.type("javafx.scene.layout.GridPane");
   3.258 -GridPaneBuilder                        = Java.type("javafx.scene.layout.GridPaneBuilder");
   3.259 -HBox                                   = Java.type("javafx.scene.layout.HBox");
   3.260 -HBoxBuilder                            = Java.type("javafx.scene.layout.HBoxBuilder");
   3.261 -Pane                                   = Java.type("javafx.scene.layout.Pane");
   3.262 -PaneBuilder                            = Java.type("javafx.scene.layout.PaneBuilder");
   3.263 -Priority                               = Java.type("javafx.scene.layout.Priority");
   3.264 -Region                                 = Java.type("javafx.scene.layout.Region");
   3.265 -RegionBuilder                          = Java.type("javafx.scene.layout.RegionBuilder");
   3.266 -RowConstraints                         = Java.type("javafx.scene.layout.RowConstraints");
   3.267 -RowConstraintsBuilder                  = Java.type("javafx.scene.layout.RowConstraintsBuilder");
   3.268 -StackPane                              = Java.type("javafx.scene.layout.StackPane");
   3.269 -StackPaneBuilder                       = Java.type("javafx.scene.layout.StackPaneBuilder");
   3.270 -TilePane                               = Java.type("javafx.scene.layout.TilePane");
   3.271 -TilePaneBuilder                        = Java.type("javafx.scene.layout.TilePaneBuilder");
   3.272 -VBox                                   = Java.type("javafx.scene.layout.VBox");
   3.273 -VBoxBuilder                            = Java.type("javafx.scene.layout.VBoxBuilder");
   3.274 -LightBase                              = Java.type("javafx.scene.LightBase");
   3.275 -//LightBaseBuilder                       = Java.type("javafx.scene.LightBaseBuilder");
   3.276 -Node                                   = Java.type("javafx.scene.Node");
   3.277 -NodeBuilder                            = Java.type("javafx.scene.NodeBuilder");
   3.278 -Color                                  = Java.type("javafx.scene.paint.Color");
   3.279 -ColorBuilder                           = Java.type("javafx.scene.paint.ColorBuilder");
   3.280 -CycleMethod                            = Java.type("javafx.scene.paint.CycleMethod");
   3.281 -ImagePattern                           = Java.type("javafx.scene.paint.ImagePattern");
   3.282 -ImagePatternBuilder                    = Java.type("javafx.scene.paint.ImagePatternBuilder");
   3.283 -LinearGradient                         = Java.type("javafx.scene.paint.LinearGradient");
   3.284 -LinearGradientBuilder                  = Java.type("javafx.scene.paint.LinearGradientBuilder");
   3.285 -Material                               = Java.type("javafx.scene.paint.Material");
   3.286 -Paint                                  = Java.type("javafx.scene.paint.Paint");
   3.287 -PhongMaterial                          = Java.type("javafx.scene.paint.PhongMaterial");
   3.288 -//PhongMaterialBuilder                   = Java.type("javafx.scene.paint.PhongMaterialBuilder");
   3.289 -RadialGradient                         = Java.type("javafx.scene.paint.RadialGradient");
   3.290 -RadialGradientBuilder                  = Java.type("javafx.scene.paint.RadialGradientBuilder");
   3.291 -Stop                                   = Java.type("javafx.scene.paint.Stop");
   3.292 -StopBuilder                            = Java.type("javafx.scene.paint.StopBuilder");
   3.293 -ParallelCamera                         = Java.type("javafx.scene.ParallelCamera");
   3.294 -//ParallelCameraBuilder                  = Java.type("javafx.scene.ParallelCameraBuilder");
   3.295 -Parent                                 = Java.type("javafx.scene.Parent");
   3.296 -ParentBuilder                          = Java.type("javafx.scene.ParentBuilder");
   3.297 -PerspectiveCamera                      = Java.type("javafx.scene.PerspectiveCamera");
   3.298 -PerspectiveCameraBuilder               = Java.type("javafx.scene.PerspectiveCameraBuilder");
   3.299 -PointLight                             = Java.type("javafx.scene.PointLight");
   3.300 -//PointLightBuilder                      = Java.type("javafx.scene.PointLightBuilder");
   3.301 -//Scene                                  = Java.type("javafx.scene.Scene");
   3.302 -SceneBuilder                           = Java.type("javafx.scene.SceneBuilder");
   3.303 -Arc                                    = Java.type("javafx.scene.shape.Arc");
   3.304 -ArcBuilder                             = Java.type("javafx.scene.shape.ArcBuilder");
   3.305 -ArcTo                                  = Java.type("javafx.scene.shape.ArcTo");
   3.306 -ArcToBuilder                           = Java.type("javafx.scene.shape.ArcToBuilder");
   3.307 -ArcType                                = Java.type("javafx.scene.shape.ArcType");
   3.308 -Box                                    = Java.type("javafx.scene.shape.Box");
   3.309 -//BoxBuilder                             = Java.type("javafx.scene.shape.BoxBuilder");
   3.310 -Circle                                 = Java.type("javafx.scene.shape.Circle");
   3.311 -CircleBuilder                          = Java.type("javafx.scene.shape.CircleBuilder");
   3.312 -ClosePath                              = Java.type("javafx.scene.shape.ClosePath");
   3.313 -ClosePathBuilder                       = Java.type("javafx.scene.shape.ClosePathBuilder");
   3.314 -CubicCurve                             = Java.type("javafx.scene.shape.CubicCurve");
   3.315 -CubicCurveBuilder                      = Java.type("javafx.scene.shape.CubicCurveBuilder");
   3.316 -CubicCurveTo                           = Java.type("javafx.scene.shape.CubicCurveTo");
   3.317 -CubicCurveToBuilder                    = Java.type("javafx.scene.shape.CubicCurveToBuilder");
   3.318 -CullFace                               = Java.type("javafx.scene.shape.CullFace");
   3.319 -Cylinder                               = Java.type("javafx.scene.shape.Cylinder");
   3.320 -//CylinderBuilder                        = Java.type("javafx.scene.shape.CylinderBuilder");
   3.321 -DrawMode                               = Java.type("javafx.scene.shape.DrawMode");
   3.322 -Ellipse                                = Java.type("javafx.scene.shape.Ellipse");
   3.323 -EllipseBuilder                         = Java.type("javafx.scene.shape.EllipseBuilder");
   3.324 -FillRule                               = Java.type("javafx.scene.shape.FillRule");
   3.325 -HLineTo                                = Java.type("javafx.scene.shape.HLineTo");
   3.326 -HLineToBuilder                         = Java.type("javafx.scene.shape.HLineToBuilder");
   3.327 -Line                                   = Java.type("javafx.scene.shape.Line");
   3.328 -LineBuilder                            = Java.type("javafx.scene.shape.LineBuilder");
   3.329 -LineTo                                 = Java.type("javafx.scene.shape.LineTo");
   3.330 -LineToBuilder                          = Java.type("javafx.scene.shape.LineToBuilder");
   3.331 -Mesh                                   = Java.type("javafx.scene.shape.Mesh");
   3.332 -MeshView                               = Java.type("javafx.scene.shape.MeshView");
   3.333 -//MeshViewBuilder                        = Java.type("javafx.scene.shape.MeshViewBuilder");
   3.334 -MoveTo                                 = Java.type("javafx.scene.shape.MoveTo");
   3.335 -MoveToBuilder                          = Java.type("javafx.scene.shape.MoveToBuilder");
   3.336 -Path                                   = Java.type("javafx.scene.shape.Path");
   3.337 -PathBuilder                            = Java.type("javafx.scene.shape.PathBuilder");
   3.338 -PathElement                            = Java.type("javafx.scene.shape.PathElement");
   3.339 -PathElementBuilder                     = Java.type("javafx.scene.shape.PathElementBuilder");
   3.340 -Polygon                                = Java.type("javafx.scene.shape.Polygon");
   3.341 -PolygonBuilder                         = Java.type("javafx.scene.shape.PolygonBuilder");
   3.342 -Polyline                               = Java.type("javafx.scene.shape.Polyline");
   3.343 -PolylineBuilder                        = Java.type("javafx.scene.shape.PolylineBuilder");
   3.344 -QuadCurve                              = Java.type("javafx.scene.shape.QuadCurve");
   3.345 -QuadCurveBuilder                       = Java.type("javafx.scene.shape.QuadCurveBuilder");
   3.346 -QuadCurveTo                            = Java.type("javafx.scene.shape.QuadCurveTo");
   3.347 -QuadCurveToBuilder                     = Java.type("javafx.scene.shape.QuadCurveToBuilder");
   3.348 -Rectangle                              = Java.type("javafx.scene.shape.Rectangle");
   3.349 -RectangleBuilder                       = Java.type("javafx.scene.shape.RectangleBuilder");
   3.350 -Shape                                  = Java.type("javafx.scene.shape.Shape");
   3.351 -Shape3D                                = Java.type("javafx.scene.shape.Shape3D");
   3.352 -//Shape3DBuilder                         = Java.type("javafx.scene.shape.Shape3DBuilder");
   3.353 -ShapeBuilder                           = Java.type("javafx.scene.shape.ShapeBuilder");
   3.354 -Sphere                                 = Java.type("javafx.scene.shape.Sphere");
   3.355 -//SphereBuilder                          = Java.type("javafx.scene.shape.SphereBuilder");
   3.356 -StrokeLineCap                          = Java.type("javafx.scene.shape.StrokeLineCap");
   3.357 -StrokeLineJoin                         = Java.type("javafx.scene.shape.StrokeLineJoin");
   3.358 -StrokeType                             = Java.type("javafx.scene.shape.StrokeType");
   3.359 -SVGPath                                = Java.type("javafx.scene.shape.SVGPath");
   3.360 -SVGPathBuilder                         = Java.type("javafx.scene.shape.SVGPathBuilder");
   3.361 -TriangleMesh                           = Java.type("javafx.scene.shape.TriangleMesh");
   3.362 -VLineTo                                = Java.type("javafx.scene.shape.VLineTo");
   3.363 -VLineToBuilder                         = Java.type("javafx.scene.shape.VLineToBuilder");
   3.364 -SnapshotParameters                     = Java.type("javafx.scene.SnapshotParameters");
   3.365 -SnapshotParametersBuilder              = Java.type("javafx.scene.SnapshotParametersBuilder");
   3.366 -SnapshotResult                         = Java.type("javafx.scene.SnapshotResult");
   3.367 -SubScene                               = Java.type("javafx.scene.SubScene");
   3.368 -//SubSceneBuilder                        = Java.type("javafx.scene.SubSceneBuilder");
   3.369 -Font                                   = Java.type("javafx.scene.text.Font");
   3.370 -FontBuilder                            = Java.type("javafx.scene.text.FontBuilder");
   3.371 -FontPosture                            = Java.type("javafx.scene.text.FontPosture");
   3.372 -FontSmoothingType                      = Java.type("javafx.scene.text.FontSmoothingType");
   3.373 -FontWeight                             = Java.type("javafx.scene.text.FontWeight");
   3.374 -Text                                   = Java.type("javafx.scene.text.Text");
   3.375 -TextAlignment                          = Java.type("javafx.scene.text.TextAlignment");
   3.376 -TextBoundsType                         = Java.type("javafx.scene.text.TextBoundsType");
   3.377 -TextBuilder                            = Java.type("javafx.scene.text.TextBuilder");
   3.378 -TextFlow                               = Java.type("javafx.scene.text.TextFlow");
   3.379 -//TextFlowBuilder                        = Java.type("javafx.scene.text.TextFlowBuilder");
   3.380 -Affine                                 = Java.type("javafx.scene.transform.Affine");
   3.381 -AffineBuilder                          = Java.type("javafx.scene.transform.AffineBuilder");
   3.382 -MatrixType                             = Java.type("javafx.scene.transform.MatrixType");
   3.383 -NonInvertibleTransformException        = Java.type("javafx.scene.transform.NonInvertibleTransformException");
   3.384 -Rotate                                 = Java.type("javafx.scene.transform.Rotate");
   3.385 -RotateBuilder                          = Java.type("javafx.scene.transform.RotateBuilder");
   3.386 -Scale                                  = Java.type("javafx.scene.transform.Scale");
   3.387 -ScaleBuilder                           = Java.type("javafx.scene.transform.ScaleBuilder");
   3.388 -Shear                                  = Java.type("javafx.scene.transform.Shear");
   3.389 -ShearBuilder                           = Java.type("javafx.scene.transform.ShearBuilder");
   3.390 -Transform                              = Java.type("javafx.scene.transform.Transform");
   3.391 -//TransformBuilder                       = Java.type("javafx.scene.transform.TransformBuilder");
   3.392 -TransformChangedEvent                  = Java.type("javafx.scene.transform.TransformChangedEvent");
   3.393 -Translate                              = Java.type("javafx.scene.transform.Translate");
   3.394 -TranslateBuilder                       = Java.type("javafx.scene.transform.TranslateBuilder");
   3.395 -DirectoryChooser                       = Java.type("javafx.stage.DirectoryChooser");
   3.396 -DirectoryChooserBuilder                = Java.type("javafx.stage.DirectoryChooserBuilder");
   3.397 -FileChooser                            = Java.type("javafx.stage.FileChooser");
   3.398 -FileChooser$ExtensionFilter            = Java.type("javafx.stage.FileChooser$ExtensionFilter");
   3.399 -FileChooserBuilder                     = Java.type("javafx.stage.FileChooserBuilder");
   3.400 -Modality                               = Java.type("javafx.stage.Modality");
   3.401 -Popup                                  = Java.type("javafx.stage.Popup");
   3.402 -PopupBuilder                           = Java.type("javafx.stage.PopupBuilder");
   3.403 -PopupWindow                            = Java.type("javafx.stage.PopupWindow");
   3.404 -PopupWindowBuilder                     = Java.type("javafx.stage.PopupWindowBuilder");
   3.405 -Screen                                 = Java.type("javafx.stage.Screen");
   3.406 -//Stage                                  = Java.type("javafx.stage.Stage");
   3.407 -StageBuilder                           = Java.type("javafx.stage.StageBuilder");
   3.408 -StageStyle                             = Java.type("javafx.stage.StageStyle");
   3.409 -Window                                 = Java.type("javafx.stage.Window");
   3.410 -WindowBuilder                          = Java.type("javafx.stage.WindowBuilder");
   3.411 -WindowEvent                            = Java.type("javafx.stage.WindowEvent");
   3.412 +if (!this.JFX_BASE_CLASSES) {
   3.413 +    load("fx:base.js")
   3.414 +}
   3.415  
   3.416 +LOAD_FX_CLASSES(JFX_GRAPHICS_CLASSES);
   3.417 +
   3.418 +

     4.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/media.js	Mon Sep 09 20:10:41 2013 +0530
     4.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/media.js	Mon Sep 09 13:35:35 2013 -0300
     4.3 @@ -23,23 +23,8 @@
     4.4   * questions.
     4.5   */
     4.6  
     4.7 -AudioClip             = Java.type("javafx.scene.media.AudioClip");
     4.8 -AudioClipBuilder      = Java.type("javafx.scene.media.AudioClipBuilder");
     4.9 -AudioEqualizer        = Java.type("javafx.scene.media.AudioEqualizer");
    4.10 -AudioSpectrumListener = Java.type("javafx.scene.media.AudioSpectrumListener");
    4.11 -AudioTrack            = Java.type("javafx.scene.media.AudioTrack");
    4.12 -EqualizerBand         = Java.type("javafx.scene.media.EqualizerBand");
    4.13 -Media                 = Java.type("javafx.scene.media.Media");
    4.14 -MediaBuilder          = Java.type("javafx.scene.media.MediaBuilder");
    4.15 -MediaErrorEvent       = Java.type("javafx.scene.media.MediaErrorEvent");
    4.16 -MediaException        = Java.type("javafx.scene.media.MediaException");
    4.17 -MediaException$Type   = Java.type("javafx.scene.media.MediaException$Type");
    4.18 -MediaMarkerEvent      = Java.type("javafx.scene.media.MediaMarkerEvent");
    4.19 -MediaPlayer           = Java.type("javafx.scene.media.MediaPlayer");
    4.20 -MediaPlayer$Status    = Java.type("javafx.scene.media.MediaPlayer$Status");
    4.21 -MediaPlayerBuilder    = Java.type("javafx.scene.media.MediaPlayerBuilder");
    4.22 -MediaView             = Java.type("javafx.scene.media.MediaView");
    4.23 -MediaViewBuilder      = Java.type("javafx.scene.media.MediaViewBuilder");
    4.24 -SubtitleTrack         = Java.type("javafx.scene.media.SubtitleTrack");
    4.25 -Track                 = Java.type("javafx.scene.media.Track");
    4.26 -VideoTrack            = Java.type("javafx.scene.media.VideoTrack");
    4.27 +if (!this.JFX_BASE_CLASSES) {
    4.28 +    load("fx:base.js")
    4.29 +}
    4.30 +
    4.31 +LOAD_FX_CLASSES(JFX_MEDIA_CLASSES);

     5.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/swing.js	Mon Sep 09 20:10:41 2013 +0530
     5.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/swing.js	Mon Sep 09 13:35:35 2013 -0300
     5.3 @@ -23,7 +23,8 @@
     5.4   * questions.
     5.5   */
     5.6  
     5.7 -JFXPanel        = Java.type("javafx.embed.swing.JFXPanel");
     5.8 -JFXPanelBuilder = Java.type("javafx.embed.swing.JFXPanelBuilder");
     5.9 -SwingFXUtils    = Java.type("javafx.embed.swing.SwingFXUtils");
    5.10 -SwingNode       = Java.type("javafx.embed.swing.SwingNode");
    5.11 +if (!this.JFX_BASE_CLASSES) {
    5.12 +    load("fx:base.js")
    5.13 +}
    5.14 +
    5.15 +LOAD_FX_CLASSES(JFX_SWING_CLASSES);

     6.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/swt.js	Mon Sep 09 20:10:41 2013 +0530
     6.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/swt.js	Mon Sep 09 13:35:35 2013 -0300
     6.3 @@ -23,7 +23,8 @@
     6.4   * questions.
     6.5   */
     6.6  
     6.7 -CustomTransfer        = Java.type("javafx.embed.swt.CustomTransfer");
     6.8 -//CustomTransferBuilder = Java.type("javafx.embed.swt.CustomTransferBuilder");
     6.9 -FXCanvas              = Java.type("javafx.embed.swt.FXCanvas");
    6.10 -SWTFXUtils            = Java.type("javafx.embed.swt.SWTFXUtils");
    6.11 +if (!this.JFX_BASE_CLASSES) {
    6.12 +    load("fx:base.js")
    6.13 +}
    6.14 +
    6.15 +LOAD_FX_CLASSES(JFX_SWT_CLASSES);

     7.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/web.js	Mon Sep 09 20:10:41 2013 +0530
     7.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/web.js	Mon Sep 09 13:35:35 2013 -0300
     7.3 @@ -23,14 +23,8 @@
     7.4   * questions.
     7.5   */
     7.6  
     7.7 -HTMLEditor        = Java.type("javafx.scene.web.HTMLEditor");
     7.8 -//HTMLEditorBuilder = Java.type("javafx.scene.web.HTMLEditorBuilder");
     7.9 -PopupFeatures     = Java.type("javafx.scene.web.PopupFeatures");
    7.10 -PromptData        = Java.type("javafx.scene.web.PromptData");
    7.11 -//PromptDataBuilder = Java.type("javafx.scene.web.PromptDataBuilder");
    7.12 -WebEngine         = Java.type("javafx.scene.web.WebEngine");
    7.13 -WebEngineBuilder  = Java.type("javafx.scene.web.WebEngineBuilder");
    7.14 -WebEvent          = Java.type("javafx.scene.web.WebEvent");
    7.15 -WebHistory        = Java.type("javafx.scene.web.WebHistory");
    7.16 -WebView           = Java.type("javafx.scene.web.WebView");
    7.17 -WebViewBuilder    = Java.type("javafx.scene.web.WebViewBuilder");
    7.18 +if (!this.JFX_BASE_CLASSES) {
    7.19 +    load("fx:base.js")
    7.20 +}
    7.21 +
    7.22 +LOAD_FX_CLASSES(JFX_WEB_CLASSES);