Added Java SE10 docset and removed JavaFX docset as it's now part of …

…the Java SE docs
Kapeli · Apr 7, 2018 · c9d62b1 · c9d62b1
1 parent 910292b
commit c9d62b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Dash/DHAppDelegate.m b/Dash/DHAppDelegate.m
@@ -256,7 +256,7 @@ - (void)checkCommitHashes
                              @"DHDBUnifiedOperation": @"1671a905",
                              @"DHWebViewController": @"b8feaee9",
                              @"DHWebPreferences": @"1f358da2",
-                             @"DHDocsetDownloader": @"24249fa8",
+                             @"DHDocsetDownloader": @"e4e4173e",
                              @"PlatformIcons": @"dd07b6ef",
                              @"DHTypes": @"5ed28f56",
                              @"Types": @"5ed28f56",

diff --git a/Dash/DHDocsetDownloader.m b/Dash/DHDocsetDownloader.m
@@ -115,7 +115,7 @@ - (void)setUp // doesn't get called unless you call the singleton from DHAppDele
                            [DHFeed feedWithFeed:@"Java_SE7.xml" icon:@"java" aliases:@[@"javase7"] doesNotHaveVersions:YES],
                            [DHFeed feedWithFeed:@"Java_SE8.xml" icon:@"java" aliases:@[@"javase8"] doesNotHaveVersions:YES],
                            [DHFeed feedWithFeed:@"Java_SE9.xml" icon:@"java" aliases:@[@"javase9"] doesNotHaveVersions:YES],
-                           [DHFeed feedWithFeed:@"JavaFX.xml" icon:@"javafx" aliases:nil doesNotHaveVersions:NO],
+                           [DHFeed feedWithFeed:@"Java_SE10.xml" icon:@"java" aliases:@[@"javase9"] doesNotHaveVersions:YES],
                            [DHFeed feedWithFeed:@"JavaScript.xml" icon:@"javascript" aliases:@[@"mdn", @"mozilla developer network", @"dom events", @"canvas", @"js"] doesNotHaveVersions:YES],
                            [DHFeed feedWithFeed:@"Jekyll.xml" icon:@"jekyll" aliases:@[@"jekyllrb jekyll.rb jekyll ruby"] doesNotHaveVersions:NO],
                            [DHFeed feedWithFeed:@"Jinja.xml" icon:@"jinja" aliases:@[@"python jinja2 template engine jinja 2 template engine"] doesNotHaveVersions:NO],
@@ -233,7 +233,7 @@ - (void)setUp // doesn't get called unless you call the singleton from DHAppDele
     for(NSDictionary *feedDictionary in savedFeeds)
     {
         DHFeed *savedFeed = [DHFeed feedWithDictionaryRepresentation:feedDictionary];
-        if([@[@"http://kapeli.com/feeds/OS_X.xml", @"http://kapeli.com/feeds/watchOS.xml", @"http://kapeli.com/feeds/iOS.xml", @"http://kapeli.com/feeds/tvOS.xml", @"http://kapeli.com/feeds/Jade.xml", @"http://kapeli.com/feeds/Angular.dart.xml", @"http://kapeli.com/feeds/Swift.xml", @"http://kapeli.com/feeds/AngularTS.xml", @"http://kapeli.com/feeds/Gradle_Groovy_API.xml", @"http://kapeli.com/feeds/XUL.xml", @"http://kapeli.com/feeds/OpenCV_C.xml", @"http://kapeli.com/feeds/OpenCV_C++.xml", @"http://kapeli.com/feeds/OpenCV_Java.xml", @"http://kapeli.com/feeds/OpenCV_Python.xml"] containsObject:savedFeed.feedURL])
+        if([@[@"http://kapeli.com/feeds/OS_X.xml", @"http://kapeli.com/feeds/watchOS.xml", @"http://kapeli.com/feeds/iOS.xml", @"http://kapeli.com/feeds/tvOS.xml", @"http://kapeli.com/feeds/Jade.xml", @"http://kapeli.com/feeds/JavaFX.xml", @"http://kapeli.com/feeds/Angular.dart.xml", @"http://kapeli.com/feeds/Swift.xml", @"http://kapeli.com/feeds/AngularTS.xml", @"http://kapeli.com/feeds/Gradle_Groovy_API.xml", @"http://kapeli.com/feeds/XUL.xml", @"http://kapeli.com/feeds/OpenCV_C.xml", @"http://kapeli.com/feeds/OpenCV_C++.xml", @"http://kapeli.com/feeds/OpenCV_Java.xml", @"http://kapeli.com/feeds/OpenCV_Python.xml"] containsObject:savedFeed.feedURL])
         {
             if(savedFeed.installed)
             {
@@ -249,7 +249,7 @@ - (void)setUp // doesn't get called unless you call the singleton from DHAppDele
             savedFeed.installed = NO;
             savedFeed.installedVersion = nil;
         }
-        if([@[@"http://kapeli.com/feeds/OS_X.xml", @"http://kapeli.com/feeds/Jade.xml", @"http://kapeli.com/feeds/Apple_Guides_and_Sample_Code.xml", @"http://kapeli.com/feeds/Angular.dart.xml", @"http://kapeli.com/feeds/AngularTS.xml", @"http://kapeli.com/feeds/Gradle_Groovy_API.xml", @"http://kapeli.com/feeds/XUL.xml", @"http://kapeli.com/feeds/OpenCV_C.xml", @"http://kapeli.com/feeds/OpenCV_C++.xml", @"http://kapeli.com/feeds/OpenCV_Java.xml", @"http://kapeli.com/feeds/OpenCV_Python.xml"] containsObject:savedFeed.feedURL])
+        if([@[@"http://kapeli.com/feeds/OS_X.xml", @"http://kapeli.com/feeds/Jade.xml", @"http://kapeli.com/feeds/JavaFX.xml", @"http://kapeli.com/feeds/Apple_Guides_and_Sample_Code.xml", @"http://kapeli.com/feeds/Angular.dart.xml", @"http://kapeli.com/feeds/AngularTS.xml", @"http://kapeli.com/feeds/Gradle_Groovy_API.xml", @"http://kapeli.com/feeds/XUL.xml", @"http://kapeli.com/feeds/OpenCV_C.xml", @"http://kapeli.com/feeds/OpenCV_C++.xml", @"http://kapeli.com/feeds/OpenCV_Java.xml", @"http://kapeli.com/feeds/OpenCV_Python.xml"] containsObject:savedFeed.feedURL])
         {
             continue;
         }

diff --git a/Dash/DHFeed.m b/Dash/DHFeed.m
@@ -134,7 +134,7 @@ - (BOOL)isMajorVersioned:(NSString *)feedURL
     {
         return YES;
     }
-    return [feedURL isEqualToString:@"http://kapeli.com/feeds/Drupal_7.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Drupal_8.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Zend_Framework_1.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Zend_Framework_2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Zend_Framework_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Bootstrap_2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Bootstrap_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Bootstrap_4.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Python_2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Python_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE6.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE7.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE8.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE9.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_on_Rails_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_on_Rails_4.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_on_Rails_5.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Qt_4.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Qt_5.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Lua_5.1.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Lua_5.2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_2.xml"];
+    return [feedURL isEqualToString:@"http://kapeli.com/feeds/Drupal_7.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Drupal_8.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Zend_Framework_1.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Zend_Framework_2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Zend_Framework_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Bootstrap_2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Bootstrap_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Bootstrap_4.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Python_2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Python_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE6.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE7.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE8.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE9.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Java_SE10.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_on_Rails_3.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_on_Rails_4.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_on_Rails_5.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Qt_4.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Qt_5.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Lua_5.1.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Lua_5.2.xml"] || [feedURL isEqualToString:@"http://kapeli.com/feeds/Ruby_2.xml"];
 }
 
 - (NSString *)sortName
@@ -144,6 +144,10 @@ - (NSString *)sortName
     {
         return [name stringByReplacingOccurrencesOfString:@"Angular.dart" withString:@"Angularz.dart"];
     }
+    else if([name hasPrefix:@"Java SE10"])
+    {
+        return [name stringByReplacingOccurrencesOfString:@"Java SE10" withString:@"Java SEz"];
+    }
     return name;
 }