From b32c719ce41957c4487e5da5f5b25454d4768cde Mon Sep 17 00:00:00 2001 From: Enoc Date: Fri, 19 Feb 2021 00:28:51 -0600 Subject: [PATCH 1/3] Add overloaded methods to openjdk11 & 8 --- lib/docs/filters/openjdk/entries.rb | 31 +++++++---------------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/lib/docs/filters/openjdk/entries.rb b/lib/docs/filters/openjdk/entries.rb index 753c411e..62ab7bbe 100644 --- a/lib/docs/filters/openjdk/entries.rb +++ b/lib/docs/filters/openjdk/entries.rb @@ -27,34 +27,17 @@ module Docs end def additional_entries - # Only keep the first found entry with a unique name, - # i.e. overloaded methods are skipped in index - if version == '8' || version == '8 Gui' || version == '8 Web' - css('a[name$=".summary"]').each_with_object({}) do |summary, entries| - next if summary['name'].include?('nested') || summary['name'].include?('constructor') || - summary['name'].include?('field') || summary['name'].include?('constant') - summary.parent.css('.memberNameLink a').each do |node| - name = node.parent.parent.content.strip - name.sub! %r{\(.+?\)}m, '()' - id = node['href'].remove(%r{.*#}) - entries[name] ||= ["#{self.name}.#{name}", id] - end - end.values + entries = [] - else - css('a[id$=".summary"]').each_with_object({}) do |summary, entries| - next if summary['id'].include?('nested') || summary['id'].include?('constructor') || - summary['id'].include?('field') || summary['id'].include?('constant') - summary.parent.css('.memberNameLink a').each do |node| - name = node.parent.parent.content.strip - name.sub! %r{\(.+?\)}m, '()' - id = node['href'].remove(%r{.*#}) - entries[name] ||= ["#{self.name}.#{name}", id] - end - end.values + css('.memberNameLink a').each do |node| + next if !(node['href'].match?(/\(/)) # skip non-methods + entries << [self.name + '.' + node.content + '()', slug.downcase + node['href']] end + entries + end + end end end From 8f9d01c3b8b31c29996f0ee4b6c7bcd21250825c Mon Sep 17 00:00:00 2001 From: Enoc Date: Fri, 19 Feb 2021 23:25:34 -0600 Subject: [PATCH 2/3] Fix cleant_html filter for openjdk 8 --- lib/docs/filters/openjdk/entries.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/docs/filters/openjdk/entries.rb b/lib/docs/filters/openjdk/entries.rb index 62ab7bbe..b11fdca6 100644 --- a/lib/docs/filters/openjdk/entries.rb +++ b/lib/docs/filters/openjdk/entries.rb @@ -30,8 +30,15 @@ module Docs entries = [] css('.memberNameLink a').each do |node| - next if !(node['href'].match?(/\(/)) # skip non-methods - entries << [self.name + '.' + node.content + '()', slug.downcase + node['href']] + next unless node['href'].match?(/[-(]/) # skip non-methods + + if (version=='8' || version == '8 GUI' || version == '8 Web') + id = node['href'].gsub(/.*#/, '') + else + id = slug.downcase + node['href'] + end + + entries << [self.name + '.' + node.content + '()', id] end entries From ffd8023a2c10ba766b7d21e892e376000b25deb2 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Mon, 22 Feb 2021 20:38:05 +0100 Subject: [PATCH 3/3] openjdk 8: add base_url --- lib/docs/scrapers/openjdk.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/docs/scrapers/openjdk.rb b/lib/docs/scrapers/openjdk.rb index 5680190f..bb453432 100644 --- a/lib/docs/scrapers/openjdk.rb +++ b/lib/docs/scrapers/openjdk.rb @@ -59,6 +59,7 @@ module Docs version '8' do self.release = '8' + self.base_url = 'https://docs.oracle.com/javase/8/docs/api/' html_filters.push OLDFILTERS @@ -90,6 +91,7 @@ module Docs version '8 GUI' do self.release = '8' + self.base_url = 'https://docs.oracle.com/javase/8/docs/api/' html_filters.push OLDFILTERS @@ -102,6 +104,7 @@ module Docs version '8 Web' do self.release = '8' + self.base_url = 'https://docs.oracle.com/javase/8/docs/api/' html_filters.push OLDFILTERS