Revision: 2948292a4d88
Branch: default
Author: Pekka Klärck
Date: Tue May 20 09:18:33 2014 UTC
Log: Libdoc: Fixed using JavaDocs on Java 8.
Update issue 1704
Status: Done
Fixed the problem by using the API differently depending on the Java
version.
http://code.google.com/p/robotframework/source/detail?r=2948292a4d88
Modified:
/src/robot/libdocpkg/javabuilder.py
=======================================
--- /src/robot/libdocpkg/javabuilder.py Thu Jan 23 14:00:53 2014 UTC
+++ /src/robot/libdocpkg/javabuilder.py Tue May 20 09:18:33 2014 UTC
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import sys
+
from robot.errors import DataError
from robot import utils
@@ -111,8 +113,12 @@
jdoctool = JavadocTool.make0(context)
filter = ModifierFilter(PUBLIC)
java_names = List.of(path)
- root = jdoctool.getRootDocImpl('en', 'utf-8', filter, java_names,
- List.nil(), False, List.nil(),
- List.nil(), False, False, True)
+ if sys.platform[4:7] < '1.8': # API changed in Java 8
+ root = jdoctool.getRootDocImpl('en', 'utf-8', filter, java_names,
+ List.nil(), False, List.nil(),
+ List.nil(), False, False, True)
+ else:
+ root = jdoctool.getRootDocImpl('en', 'utf-8', filter, java_names,
+ List.nil(), List.nil(), False,
List.nil(),
+ List.nil(), False, False, True)
return root.classes()[0]
-
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
