MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

reuse existing download service & use https://

Browse Source
This commit is contained in:
Gregory.Shrago
2018-03-01 16:19:46 +03:00
parent 188e892a26
commit 94f423ef20
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarStatisticsService.java
+12 -16
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.internal.statistic.libraryJar;
import com.intellij.facet.frameworks.SettingsConnectionService;
import com.intellij.facet.frameworks.LibrariesDownloadConnectionService;
import com.intellij.internal.statistic.utils.StatisticsUploadAssistant;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
@@ -35,32 +35,28 @@ import java.net.URL;
/**
* @author Ivan Chirkov
*/
public class LibraryJarStatisticsService extends SettingsConnectionService implements StartupActivity, DumbAware {
public class LibraryJarStatisticsService implements StartupActivity, DumbAware {
private static final String FILE_NAME = "statistics/library-jar-statistics.xml";
private static final String DEFAULT_SETTINGS_URL = "https://www.jetbrains.com/idea/download-assistant.xml";
private static final String DEFAULT_SERVICE_URL = "https://frameworks.jetbrains.com";
private static final LibraryJarStatisticsService myInstance = new LibraryJarStatisticsService();
private LibraryJarDescriptor[] myDescriptors;
private static final LibraryJarStatisticsService ourInstance = new LibraryJarStatisticsService();
private LibraryJarDescriptor[] ourDescriptors;
@NotNull
public static LibraryJarStatisticsService getInstance() {
return myInstance;
}
protected LibraryJarStatisticsService() {
super(DEFAULT_SETTINGS_URL, DEFAULT_SERVICE_URL);
return ourInstance;
}
@NotNull
public LibraryJarDescriptor[] getTechnologyDescriptors() {
if (myDescriptors == null) {
if (ourDescriptors == null) {
if (!StatisticsUploadAssistant.isSendAllowed()) return LibraryJarDescriptor.EMPTY;
final URL url = createVersionsUrl();
if (url == null) return LibraryJarDescriptor.EMPTY;
final LibraryJarDescriptors descriptors = deserialize(url);
myDescriptors = descriptors == null ? LibraryJarDescriptor.EMPTY : descriptors.getDescriptors();
ourDescriptors = descriptors == null ? LibraryJarDescriptor.EMPTY : descriptors.getDescriptors();
}
return myDescriptors;
return ourDescriptors;
}
@Nullable
@@ -78,8 +74,8 @@ public class LibraryJarStatisticsService extends SettingsConnectionService imple
}
@Nullable
private URL createVersionsUrl() {
final String serviceUrl = getServiceUrl();
private static URL createVersionsUrl() {
final String serviceUrl = LibrariesDownloadConnectionService.getInstance().getServiceUrl();
if (StringUtil.isNotEmpty(serviceUrl)) {
try {
final String url = serviceUrl + "/" + FILE_NAME;
platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadConnectionService.java
+6 -3
View File
@@ -17,14 +17,17 @@ package com.intellij.facet.frameworks;
public class LibrariesDownloadConnectionService extends SettingsConnectionService {
private static final LibrariesDownloadConnectionService myInstance = new LibrariesDownloadConnectionService();
private static final String SETTINGS_URL = "https://www.jetbrains.com/idea/download-assistant.xml";
private static final String SERVICE_URL = "https://frameworks.jetbrains.com";
private static final LibrariesDownloadConnectionService ourInstance = new LibrariesDownloadConnectionService();
public static LibrariesDownloadConnectionService getInstance() {
return myInstance;
return ourInstance;
}
private LibrariesDownloadConnectionService() {
super("https://www.jetbrains.com/idea/download-assistant.xml", "http://frameworks.jetbrains.com");
super(SETTINGS_URL, SERVICE_URL);
}
}