changeset 6534:8a9062f8c637

RT-36314: JavaFX API javadoc has wrong link to JDK docs
author kcr
date Fri, 21 Mar 2014 11:05:12 -0700
parents 37b60b405b4b
children 8c568afe762a
files build.gradle
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Fri Mar 21 10:04:53 2014 -0700
+++ b/build.gradle	Fri Mar 21 11:05:12 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -275,7 +275,7 @@
 defineProperty("JAVAC", cygpath("$JDK_HOME/bin/javac${IS_WINDOWS ? '.exe' : ''}"))
 defineProperty("JAVAH", cygpath("$JDK_HOME/bin/javah${IS_WINDOWS ? '.exe' : ''}"))
 defineProperty("JAVADOC", cygpath("$JDK_HOME/bin/javadoc${IS_WINDOWS ? '.exe' : ''}"))
-defineProperty("JDK_DOCS", "http://download.oracle.com/javase/7/docs/api")
+defineProperty("JDK_DOCS", "http://docs.oracle.com/javase/8/docs/api/")
 
 defineProperty("javaRuntimeVersion", System.getProperty("java.runtime.version"))
 defineProperty("javaVersion", javaRuntimeVersion.split("-")[0])
@@ -1115,7 +1115,11 @@
         exclude("com/**/*", "javafx/scene/ParentDesignInfo*", "Compile*", "javafx/builder/**/*", "javafx/scene/accessibility/**/*");
         executable = JAVADOC;
         options.windowTitle("JavaFX Project ${project.name} ${RELEASE_NAME}")
-        options.links(JDK_DOCS);
+        if (BUILD_CLOSED) {
+            options.linksOffline(JDK_DOCS, JDK_DOCS_CLOSED);
+        } else {
+            options.links(JDK_DOCS);
+        }
         options.addBooleanOption("XDignore.symbol.file").setValue(true);
         options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
         options.addBooleanOption("javafx").setValue(true);
@@ -2393,7 +2397,11 @@
     options.windowTitle("${javadocTitle}")
     options.header("${javadocHeader}")
     options.bottom("${javadocBottom}")
-    options.links(JDK_DOCS);
+    if (BUILD_CLOSED) {
+        options.linksOffline(JDK_DOCS, JDK_DOCS_CLOSED);
+    } else {
+        options.links(JDK_DOCS);
+    }
     options.addBooleanOption("XDignore.symbol.file").setValue(true);
     options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
     options.addBooleanOption("javafx").setValue(true);