diff --git a/NOTICE.txt b/NOTICE.txt index 8b8c12abe33c..d9f5e1dfc3b2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,3 +1,3 @@ This software includes code from IntelliJ IDEA Community Edition Copyright (C) JetBrains s.r.o. -http://www.jetbrains.com/idea/ +https://www.jetbrains.com/idea/ diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi index 36aab224dfa3..704880ada6c4 100644 --- a/build/conf/nsis/idea.nsi +++ b/build/conf/nsis/idea.nsi @@ -839,7 +839,7 @@ skip_properties: WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}" \ "Publisher" "JetBrains s.r.o." WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}" \ - "URLInfoAbout" "http://www.jetbrains.com/products" + "URLInfoAbout" "https://www.jetbrains.com/products" WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}" \ "InstallType" "$baseRegKey" WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}" \ @@ -1181,6 +1181,6 @@ remove_IntelliJIdeaProjectFile: done: DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}" ; UNCOMMENT THIS IN RELEASE BUILD -; ExecShell "" "http://www.jetbrains.com/idea/uninstall/" +; ExecShell "" "https://www.jetbrains.com/idea/uninstall/" SectionEnd diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 1c497a2fb62d..b0a6d06c1a97 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -234,7 +234,7 @@ libraryLicense(name: "Jakarta ORO", libraryName: "OroMatcher", version: "2.0.8", libraryLicense(name: "PicoContainer", libraryName: "picocontainer", version: "1.2", license: "BSD", url: "http://www.picocontainer.org/", licenseUrl: "http://docs.codehaus.org/display/PICO/License") libraryLicense(name: "Plexus Utils", libraryName: "plexus-utils-1.5.5.jar", version: "1.5.5", license: "Apache 2.0", url: "http://plexus.codehaus.org/plexus-utils") libraryLicense(name: "Relax NG Object Model", libraryName: "rngom-20051226-patched.jar", license: "MIT", url: "http://java.net/projects/rngom/", licenseUrl: "http://www.opensource.org/licenses/mit-license.php") -libraryLicense(name: "RMI Stubs", attachedTo: "xslt-debugger-engine", license: "Apache 2.0", url: "http://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") +libraryLicense(name: "RMI Stubs", attachedTo: "xslt-debugger-engine", license: "Apache 2.0", url: "https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Saxon-9HE", version: "9", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/", licenseUrl: "http://www.mozilla.org/MPL/") libraryLicense(name: "Saxon-6.5.5", version: "6.5.5", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/", licenseUrl: "http://www.mozilla.org/MPL/") libraryLicense(name: "Sonatype Nexus: Indexer", libraryName: "nexus-indexer-1.2.3.jar", version: "1.2.3", license: "Eclipse Public License v1.0", url: "http://nexus.sonatype.org/", licenseUrl: "http://www.eclipse.org/org/documents/epl-v10.html") diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml index f26c8286ac82..e0444ad58660 100644 --- a/community-resources/src/idea/IdeaApplicationInfo.xml +++ b/community-resources/src/idea/IdeaApplicationInfo.xml @@ -1,6 +1,6 @@ - + @@ -13,25 +13,25 @@ caption-url="/welcomeCaption_community.png" slogan-url="/developSlogan_community.png"/> - + - + - - - - - - + + + + + + - + diff --git a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java index 3a81718443bf..05250e619ed0 100644 --- a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java +++ b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; * @author nik * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public abstract class GenericCompiler implements Compiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassInstrumentingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassInstrumentingCompiler.java index 4e5143aee495..71d924aada85 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassInstrumentingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassInstrumentingCompiler.java @@ -23,7 +23,7 @@ package com.intellij.openapi.compiler; * SourceGeneratingCompiler -> SourceInstrumentingCompiler -> TranslatingCompiler -> ClassInstrumentingCompiler -> ClassPostProcessingCompiler -> PackagingCompiler -> Validator * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface ClassInstrumentingCompiler extends FileProcessingCompiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassPostProcessingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassPostProcessingCompiler.java index c4c3e8b40cf1..07d3d6ce75b0 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassPostProcessingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/ClassPostProcessingCompiler.java @@ -23,7 +23,7 @@ package com.intellij.openapi.compiler; * SourceGeneratingCompiler -> SourceInstrumentingCompiler -> TranslatingCompiler -> ClassInstrumentingCompiler -> ClassPostProcessingCompiler -> PackagingCompiler -> Validator * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface ClassPostProcessingCompiler extends FileProcessingCompiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerFilter.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerFilter.java index 36b2e5fd8a5c..4d2472acfab3 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerFilter.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerFilter.java @@ -17,7 +17,7 @@ package com.intellij.openapi.compiler; /** * @deprecated this interface is a part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface CompilerFilter { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java index 58e540578f33..055233b90c02 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java @@ -66,7 +66,7 @@ public abstract class CompilerManager { * @param outputTypes a set of filetypes that compiler can generate * * @deprecated this method is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public abstract void addTranslatingCompiler(@NotNull TranslatingCompiler compiler, Set inputTypes, Set outputTypes); diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CopyingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CopyingCompiler.java index 758524e92426..2d7704786e5b 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CopyingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CopyingCompiler.java @@ -34,7 +34,7 @@ import java.util.List; * Compiler which copies the compiled files to a different directory. * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public abstract class CopyingCompiler implements PackagingCompiler{ diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/GeneratingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/GeneratingCompiler.java index af1fb1eb8dd7..eacb27235740 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/GeneratingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/GeneratingCompiler.java @@ -23,7 +23,7 @@ import com.intellij.openapi.vfs.VirtualFile; * Actual implementation should implement one of its subinterfaces. Currently only {@link SourceGeneratingCompiler} is available. * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface GeneratingCompiler extends Compiler, ValidityStateFactory, IntermediateOutputCompiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java index a55136eaccb6..a5bd314b373d 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java @@ -20,7 +20,7 @@ package com.intellij.openapi.compiler; * and can be used as input to another compiler * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface IntermediateOutputCompiler extends Compiler{ diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaSourceTransformingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaSourceTransformingCompiler.java index 1194efcccba3..5328a1336f93 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaSourceTransformingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaSourceTransformingCompiler.java @@ -21,7 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile; * This compiler is called right before the java sources compiler. * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface JavaSourceTransformingCompiler extends Compiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/PackagingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/PackagingCompiler.java index 3055e0ff654f..c4dd497dd2a5 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/PackagingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/PackagingCompiler.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; * SourceGeneratingCompiler -> SourceInstrumentingCompiler -> TranslatingCompiler -> ClassInstrumentingCompiler -> ClassPostProcessingCompiler -> PackagingCompiler -> Validator * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface PackagingCompiler extends FileProcessingCompiler{ diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceGeneratingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceGeneratingCompiler.java index 2fe36ba202ba..279b1d7fe7aa 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceGeneratingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceGeneratingCompiler.java @@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile; * SourceGeneratingCompiler -> SourceInstrumentingCompiler -> TranslatingCompiler -> ClassInstrumentingCompiler -> ClassPostProcessingCompiler -> PackagingCompiler -> Validator * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface SourceGeneratingCompiler extends GeneratingCompiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceProcessingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceProcessingCompiler.java index 64d287ad3c11..e24a016a3a39 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceProcessingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/SourceProcessingCompiler.java @@ -17,7 +17,7 @@ package com.intellij.openapi.compiler; /** * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface SourceProcessingCompiler extends FileProcessingCompiler, IntermediateOutputCompiler { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/TranslatingCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/TranslatingCompiler.java index c5ce012c9ce6..75f9c0d6ed98 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/TranslatingCompiler.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/TranslatingCompiler.java @@ -28,7 +28,7 @@ import java.util.Collection; * SourceGeneratingCompiler -> SourceInstrumentingCompiler -> TranslatingCompiler -> ClassInstrumentingCompiler -> ClassPostProcessingCompiler -> PackagingCompiler -> Validator * * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 12 plugins need to - * integrate into 'external build system' instead (http://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). + * integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins). * Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14. */ public interface TranslatingCompiler extends Compiler { diff --git a/java/idea-ui/src/com/intellij/openapi/wm/impl/welcomeScreen/DevelopPluginsAction.java b/java/idea-ui/src/com/intellij/openapi/wm/impl/welcomeScreen/DevelopPluginsAction.java index 5e37d69ebcc4..677c86ebac41 100644 --- a/java/idea-ui/src/com/intellij/openapi/wm/impl/welcomeScreen/DevelopPluginsAction.java +++ b/java/idea-ui/src/com/intellij/openapi/wm/impl/welcomeScreen/DevelopPluginsAction.java @@ -29,7 +29,7 @@ import java.io.File; */ public class DevelopPluginsAction extends AnAction implements DumbAware { @NonNls private static final String PLUGIN_URL = PathManager.getHomePath() + "/Plugin Development Readme.html"; - @NonNls private static final String PLUGIN_WEBSITE = "http://www.jetbrains.com/idea/plugins/plugin_developers.html"; + @NonNls private static final String PLUGIN_WEBSITE = "https://www.jetbrains.com/idea/plugins/plugin_developers.html"; @Override public void actionPerformed(final AnActionEvent e) { diff --git a/java/idea-ui/src/com/intellij/platform/templates/IC_template_groups.xml b/java/idea-ui/src/com/intellij/platform/templates/IC_template_groups.xml index f750a26f8063..bc2f609a5344 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/IC_template_groups.xml +++ b/java/idea-ui/src/com/intellij/platform/templates/IC_template_groups.xml @@ -1,4 +1,4 @@ - + Java Samples Java diff --git a/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xml b/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xml index 92725d311e4a..885cf97234ec 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xml +++ b/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xml @@ -1,4 +1,4 @@ - + Java Samples Java diff --git a/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xsd b/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xsd index 19d59f6c716d..b7e5aca7baba 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xsd +++ b/java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xsd @@ -1,6 +1,6 @@ + targetNamespace="https://www.jetbrains.com/projectTemplates"> diff --git a/java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarStatisticsService.java b/java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarStatisticsService.java index 1473184bc93b..7ab6ee5c6c57 100644 --- a/java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarStatisticsService.java +++ b/java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarStatisticsService.java @@ -37,9 +37,8 @@ import java.net.URL; * @author Ivan Chirkov */ public class LibraryJarStatisticsService extends SettingsConnectionService implements StartupActivity, DumbAware { - private static final String FILE_NAME = "statistics/library-jar-statistics.xml"; - private static final String DEFAULT_SETTINGS_URL = "http://www.jetbrains.com/idea/download-assistant.xml"; + private static final String DEFAULT_SETTINGS_URL = "https://www.jetbrains.com/idea/download-assistant.xml"; private static final String DEFAULT_SERVICE_URL = "http://frameworks.jetbrains.com"; private static final LibraryJarStatisticsService myInstance = new LibraryJarStatisticsService(); diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java index 90e7d127b8b5..999ad6ecb90f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java @@ -191,7 +191,7 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase { public void testRememberLocalTransientFieldState() { doTest(); } public void testFinalFieldDuringInitialization() { doTest(); } public void testFinalFieldDuringSuperInitialization() { doTest(); } - public void _testSymmetricUncheckedCast() { doTest(); } // http://youtrack.jetbrains.com/issue/IDEABKL-6871 + public void _testSymmetricUncheckedCast() { doTest(); } // https://youtrack.jetbrains.com/issue/IDEABKL-6871 public void testNullCheckDoesntAffectUncheckedCast() { doTest(); } public void testThrowNull() { doTest(); } @@ -350,5 +350,5 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase { myFixture.testHighlighting(true, false, true, getTestName(false) + ".java"); } - public void _testNullCheckBeforeInstanceof() { doTest(); } // http://youtrack.jetbrains.com/issue/IDEA-113220 + public void _testNullCheckBeforeInstanceof() { doTest(); } // https://youtrack.jetbrains.com/issue/IDEA-113220 } diff --git a/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java b/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java index d54297af2a60..40ed171181d6 100644 --- a/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java +++ b/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java @@ -39,5 +39,5 @@ public class JavaFileStructureFilteringTest extends JavaFileStructureTestCase { public void testMatcher1() {checkTree("ico");} public void testMatcher2() {checkTree("ico");} - public void _testAnonymousMatcher2() {checkTree("ico");} //http://youtrack.jetbrains.com/issue/IDEABKL-6906 + public void _testAnonymousMatcher2() {checkTree("ico");} //https://youtrack.jetbrains.com/issue/IDEABKL-6906 } diff --git a/platform/core-api/src/com/intellij/psi/stubs/package-info.java b/platform/core-api/src/com/intellij/psi/stubs/package-info.java index aad148a9f337..96780fbb1fca 100644 --- a/platform/core-api/src/com/intellij/psi/stubs/package-info.java +++ b/platform/core-api/src/com/intellij/psi/stubs/package-info.java @@ -1,5 +1,5 @@ /** - * @see Indexing and PSI Stubs in IntelliJ IDEA + * @see Indexing and PSI Stubs in IntelliJ IDEA * * @see Lifecycle of stub creation */ diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 9bce1758c35f..ba141f4227aa 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -49,7 +49,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private String myBuildNumber = null; private String myApiVersion = null; private String myCompanyName = "JetBrains s.r.o."; - private String myCompanyUrl = "http://www.jetbrains.com/"; + private String myCompanyUrl = "https://www.jetbrains.com/"; private Color myProgressColor = null; private Color myCopyrightForeground = JBColor.BLACK; private Color myAboutForeground = JBColor.BLACK; @@ -93,7 +93,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private boolean myHasContextHelp = true; @NonNls private String myHelpFileName = "ideahelp.jar"; @NonNls private String myHelpRootName = "idea"; - @NonNls private String myWebHelpUrl = "http://www.jetbrains.com/idea/webhelp/"; + @NonNls private String myWebHelpUrl = "https://www.jetbrains.com/idea/webhelp/"; private List myPluginChooserPages = new ArrayList(); private String myStatisticsSettingsUrl; private String myStatisticsServiceUrl; @@ -732,8 +732,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern myStatisticsServiceKey = statisticsElement.getAttributeValue(ATTRIBUTE_STATISTICS_SERVICE_KEY); } else { - myStatisticsSettingsUrl = "http://jetbrains.com/idea/statistics/stat-assistant.xml"; - myStatisticsServiceUrl = "http://jetbrains.com/idea/statistics/index.jsp"; + myStatisticsSettingsUrl = "https://www.jetbrains.com/idea/statistics/stat-assistant.xml"; + myStatisticsServiceUrl = "https://www.jetbrains.com/idea/statistics/index.jsp"; myStatisticsServiceKey = null; } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 00747fd4460e..f69f416bb07f 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -341,7 +341,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF private void scheduleDropCachesWithInvalidStubPsi() { // invokeLater even if already on EDT, because - // we might be inside an index query and write actions might result in deadlocks there (http://youtrack.jetbrains.com/issue/IDEA-123118) + // we might be inside an index query and write actions might result in deadlocks there (https://youtrack.jetbrains.com/issue/IDEA-123118) ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java index 9e8beb103165..2cef0b6f12f3 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java @@ -68,7 +68,7 @@ public abstract class AbstractExternalSystemSettings< /** * Every time particular external system setting is changed corresponding message is sent via ide - * messaging sub-system. + * messaging sub-system. * The problem is that every external system implementation defines it's own topic/listener pair. Listener interface is derived * from the common {@link ExternalSystemSettingsListener} interface and is specific to external sub-system implementation. * However, it's possible that a client wants to perform particular actions based only on {@link ExternalSystemSettingsListener} diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadConnectionService.java b/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadConnectionService.java index 2d5a3ddc9685..4b4411ae7e2c 100644 --- a/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadConnectionService.java +++ b/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadConnectionService.java @@ -24,7 +24,7 @@ public class LibrariesDownloadConnectionService extends SettingsConnectionServic } private LibrariesDownloadConnectionService() { - super("http://jetbrains.com/idea/download-assistant.xml", "http://frameworks.jetbrains.com"); + super("https://www.jetbrains.com/idea/download-assistant.xml", "http://frameworks.jetbrains.com"); } } diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java b/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java index fd124c633337..28677f2dd483 100644 --- a/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java +++ b/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,22 +17,16 @@ package com.intellij.facet.frameworks; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.JDOMUtil; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.net.HttpConfigurable; -import org.jdom.Document; +import com.intellij.util.containers.ContainerUtilRt; +import com.intellij.util.io.HttpRequests; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; -import java.io.InputStream; import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; import java.util.Map; public abstract class SettingsConnectionService { @@ -40,23 +34,24 @@ public abstract class SettingsConnectionService { protected static final String SERVICE_URL_ATTR_NAME = "url"; - private static final String myAgentID = "IntelliJ IDEA"; - private Map myAttributesMap; @NotNull protected String[] getAttributeNames() { - return new String[] {SERVICE_URL_ATTR_NAME}; + return new String[]{SERVICE_URL_ATTR_NAME}; } private final String mySettingsUrl; - @Nullable private final String myDefaultServiceUrl; + @Nullable + private final String myDefaultServiceUrl; protected SettingsConnectionService(@NotNull String settingsUrl, @Nullable String defaultServiceUrl) { mySettingsUrl = settingsUrl; myDefaultServiceUrl = defaultServiceUrl; } + @SuppressWarnings("unused") + @Deprecated public String getSettingsUrl() { return mySettingsUrl; } @@ -67,55 +62,46 @@ public abstract class SettingsConnectionService { } @Nullable - private Map readSettings(String... attributes) { - Map settings = ContainerUtil.newLinkedHashMap(); + private Map readSettings(final String... attributes) { + final Map settings = ContainerUtilRt.newLinkedHashMap(); try { - String url = getSettingsUrl(); - HttpConfigurable.getInstance().prepareURL(url); - String text = FileUtil.loadTextAndClose(getStream(new URL(url))); - if (text.startsWith("") || text.startsWith("")) { - LOG.info("HTML text obtained from " + url + ": " + StringUtil.first(text, 300, true)); - return settings; - } - try { - Document document = JDOMUtil.loadDocument(text); - Element root = document.getRootElement(); - for (String s : attributes) { - String attributeValue = root.getAttributeValue(s); - if (StringUtil.isNotEmpty(attributeValue)) { - settings.put(s, attributeValue); + HttpRequests.request(mySettingsUrl).userAgent().connect(new HttpRequests.RequestProcessor() { + @Override + public Void process(@NotNull HttpRequests.Request request) throws IOException { + if (!request.isSuccessful()) { + HttpURLConnection connection = (HttpURLConnection)request.getConnection(); + LOG.warn(connection.getResponseCode() + " " + connection.getResponseMessage()); + return null; } + + try { + Element root = JDOMUtil.load(request.getInputStream()); + for (String s : attributes) { + String attributeValue = root.getAttributeValue(s); + if (StringUtil.isNotEmpty(attributeValue)) { + settings.put(s, attributeValue); + } + } + } + catch (JDOMException e) { + LOG.error(e); + } + return null; } - } - catch (JDOMException e) { - LOG.error("", e, text); - } - } - catch (MalformedURLException e) { - LOG.error(e); + }); } catch (IOException e) { - // no route to host, unknown host, etc. + LOG.warn(e); } catch (Exception e) { LOG.error(e); } - return settings; } - private static InputStream getStream(URL url) throws IOException { - final URLConnection connection = url.openConnection(); - if (connection instanceof HttpURLConnection) { - connection.setRequestProperty("User-agent", myAgentID); - } - return connection.getInputStream(); - } - @Nullable public String getServiceUrl() { final String serviceUrl = getSettingValue(SERVICE_URL_ATTR_NAME); - return serviceUrl == null ? getDefaultServiceUrl() : serviceUrl; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java index 36b1822e26f6..44368e996ca4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java @@ -712,7 +712,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent { /** * It's possible that we need to expand quick doc control's width in order to provide better visual representation - * (see http://youtrack.jetbrains.com/issue/IDEA-101425). This method calculates that width expand. + * (see https://youtrack.jetbrains.com/issue/IDEA-101425). This method calculates that width expand. * * @param buttonWidth icon button's width * @param updatedText text which will be should at the quick doc control diff --git a/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/GeneralColorsPage.java b/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/GeneralColorsPage.java index c0dd305dfb16..0e08183cd32d 100644 --- a/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/GeneralColorsPage.java +++ b/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/GeneralColorsPage.java @@ -45,7 +45,7 @@ public class GeneralColorsPage implements ColorSettingsPage, InspectionColorSett "\n" + "//TODO: Visit JB Web resources:\n"+ "JetBrains Home Page: http://www.jetbrains.com\n" + - "JetBrains Developer Community: http://www.jetbrains.com/devnet\n" + + "JetBrains Developer Community: https://www.jetbrains.com/devnet\n" + "\n" + "Search:\n" + " result = \"text, text, text\";\n" + diff --git a/platform/lang-impl/src/com/intellij/platform/templates/github/DownloadUtil.java b/platform/lang-impl/src/com/intellij/platform/templates/github/DownloadUtil.java index b66e76de4858..5199133d7259 100644 --- a/platform/lang-impl/src/com/intellij/platform/templates/github/DownloadUtil.java +++ b/platform/lang-impl/src/com/intellij/platform/templates/github/DownloadUtil.java @@ -1,6 +1,5 @@ package com.intellij.platform.templates.github; -import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -175,7 +174,7 @@ public class DownloadUtil { try { HttpRequests.request(location) - .userAgent(ApplicationInfoEx.getInstanceEx().getFullApplicationName()) + .userAgent() .connect(new HttpRequests.RequestProcessor() { @Override public Object process(@NotNull HttpRequests.Request request) throws IOException { diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java index 7f9b96dc28b0..e79b8ac77603 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java @@ -304,7 +304,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith } protected boolean shouldShowBusyIconIfNeeded() { - // http://youtrack.jetbrains.com/issue/IDEA-101422 "Rotating wait symbol in Project list whenever typing" + // https://youtrack.jetbrains.com/issue/IDEA-101422 "Rotating wait symbol in Project list whenever typing" return hasFocus(); } diff --git a/platform/platform-api/src/com/intellij/util/io/HttpRequests.java b/platform/platform-api/src/com/intellij/util/io/HttpRequests.java index ccdeabe79ab3..b0f2603182b4 100644 --- a/platform/platform-api/src/com/intellij/util/io/HttpRequests.java +++ b/platform/platform-api/src/com/intellij/util/io/HttpRequests.java @@ -17,6 +17,7 @@ package com.intellij.util.io; import com.intellij.ide.IdeBundle; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.SystemProperties; @@ -44,20 +45,28 @@ import java.util.zip.GZIPInputStream; * }); * } */ -public final class HttpRequests { +public abstract class HttpRequests { private static final boolean ourWrapClassLoader = SystemInfo.isJavaVersionAtLeast("1.7") && !SystemProperties.getBooleanProperty("idea.parallel.class.loader", true); public interface Request { - @NotNull URLConnection getConnection() throws IOException; - @NotNull InputStream getInputStream() throws IOException; + @NotNull + URLConnection getConnection() throws IOException; + + @NotNull + InputStream getInputStream() throws IOException; + + boolean isSuccessful() throws IOException; } public interface RequestProcessor { T process(@NotNull Request request) throws IOException; } - public static class RequestBuilder { + protected HttpRequests() { + } + + public abstract static class RequestBuilder { private final String myUrl; private int myConnectTimeout = HttpConfigurable.CONNECTION_TIMEOUT; private int myTimeout = HttpConfigurable.READ_TIMEOUT; @@ -67,7 +76,7 @@ public final class HttpRequests { private HostnameVerifier myHostnameVerifier; private String myUserAgent; - private RequestBuilder(@NotNull String url) { + protected RequestBuilder(@NotNull String url) { myUrl = url; } @@ -113,6 +122,9 @@ public final class HttpRequests { return this; } + @NotNull + public abstract RequestBuilder userAgent(); + public T connect(@NotNull RequestProcessor processor) throws IOException { // todo[r.sh] drop condition in IDEA 15 if (ourWrapClassLoader) { @@ -126,9 +138,11 @@ public final class HttpRequests { @NotNull public static RequestBuilder request(@NotNull String url) { - return new RequestBuilder(url); + return ServiceManager.getService(HttpRequests.class).createRequestBuilder(url); } + protected abstract RequestBuilder createRequestBuilder(@NotNull String url); + private static T wrapAndProcess(RequestBuilder builder, RequestProcessor processor) throws IOException { // hack-around for class loader lock in sun.net.www.protocol.http.NegotiateAuthentication (IDEA-131621) ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); @@ -168,6 +182,12 @@ public final class HttpRequests { return myInputStream; } + @Override + public boolean isSuccessful() throws IOException { + URLConnection connection = getConnection(); + return !(connection instanceof HttpURLConnection) || ((HttpURLConnection)connection).getResponseCode() == 200; + } + private void cleanup() throws IOException { if (myInputStream != null) { myInputStream.close(); diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsConnectionService.java b/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsConnectionService.java index 107a063430bd..b2d2eb6fd3db 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsConnectionService.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsConnectionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,17 +47,17 @@ public class StatisticsConnectionService extends SettingsConnectionService { return ArrayUtil.append(super.getAttributeNames(), PERMISSION_ATTR_NAME); } - public Boolean isTransmissionPermitted() { + public boolean isTransmissionPermitted() { final String permitted = getSettingValue(PERMISSION_ATTR_NAME); - - return permitted == null ? true : Boolean.parseBoolean(permitted); + return permitted == null || Boolean.parseBoolean(permitted); } @NotNull public Set getDisabledGroups() { final String disabledGroupsString = getSettingValue(DISABLED); - - if (disabledGroupsString == null) return Collections.emptySet(); + if (disabledGroupsString == null) { + return Collections.emptySet(); + } final List disabledGroupsList = StringUtil.split(disabledGroupsString, ","); return ContainerUtil.map2Set(disabledGroupsList, new Function() { diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java index c0acb8435339..91fd073b6bd3 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java @@ -40,7 +40,7 @@ public class IdeSettingsStatisticsService extends SettingsConnectionService { } private IdeSettingsStatisticsService() { - super("http://jetbrains.com/idea/ide-settings-statistics.xml", "http://frameworks.jetbrains.com/statistics"); + super("https://www.jetbrains.com/idea/ide-settings-statistics.xml", "http://frameworks.jetbrains.com/statistics"); } @NotNull diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsUsagesCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsUsagesCollector.java index e8b27c97bdad..d218bec6bb6d 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsUsagesCollector.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsUsagesCollector.java @@ -7,13 +7,13 @@ import com.intellij.internal.statistic.beans.UsageDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.util.containers.hash.HashSet; +import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Set; public class IdeSettingsUsagesCollector extends AbstractApplicationUsagesCollector { - @NotNull @Override public Set getProjectUsages(@NotNull Project project) throws CollectUsagesException { @@ -26,9 +26,9 @@ public class IdeSettingsUsagesCollector extends AbstractApplicationUsagesCollect @NotNull private static Set> getProviders(@Nullable Project project, boolean projectComponent) { - Set> pairs = new HashSet>(); + Set> pairs = new THashSet>(); for (IdeSettingsDescriptor descriptor : IdeSettingsStatisticsService.getInstance().getSettingDescriptors()) { - final Pair pair = getProvider(project, descriptor, projectComponent); + Pair pair = getProvider(project, descriptor, projectComponent); if (pair != null) { pairs.add(pair); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AdditionalTextAttributesEP.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AdditionalTextAttributesEP.java index 7f63175cfaf4..0f8027945a3f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AdditionalTextAttributesEP.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AdditionalTextAttributesEP.java @@ -19,11 +19,9 @@ import com.intellij.openapi.extensions.AbstractExtensionPointBean; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.util.xmlb.annotations.Attribute; -import java.lang.String; - /** * A way to provide additional colors to color schemes. - * http://youtrack.jetbrains.com/issue/IDEA-98261 + * https://youtrack.jetbrains.com/issue/IDEA-98261 * * @author VISTALL * @since 12.1 diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java index efbc24769369..c0e97a884d91 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java @@ -47,8 +47,8 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted { : (T)new CompositeWrapper(ep); } T configurable = ep.createConfigurable(); - if (configurable instanceof Configurable) { - LOG.warn("cannot wrap configurable: " + configurable.getClass().getName()); + if (configurable instanceof Configurable && LOG.isDebugEnabled()) { + LOG.debug("cannot create configurable wrapper for " + configurable.getClass()); } return configurable; } @@ -112,6 +112,9 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted { if (myConfigurable == null) { LOG.error("Can't instantiate configurable for " + myEp); } + else if (LOG.isDebugEnabled()) { + LOG.debug("created configurable for " + myConfigurable.getClass()); + } } return myConfigurable; } @@ -129,8 +132,8 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted { Configurable configurable = cast(Configurable.class, this); if (configurable != null) { String name = configurable.getDisplayName(); - if (!loaded) { - LOG.warn("configurable loaded for its name: " + name); + if (!loaded && LOG.isDebugEnabled()) { + LOG.debug("XML does not provide displayName for " + configurable.getClass()); } return name; } @@ -190,7 +193,7 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted { if (configurable != null) { String id = configurable.getId(); if (!loaded) { - LOG.warn("configurable loaded for its id: " + id); + LOG.warn("XML does not provide id for " + configurable.getClass()); } return id; } @@ -288,9 +291,9 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted { @Override public ConfigurableWrapper addChild(Configurable configurable) { if (myComparator != null) { - final int preIndex = Arrays.binarySearch(myKids, configurable, myComparator); - LOG.assertTrue(preIndex < 0); - myKids = ArrayUtil.insert(myKids, -preIndex - 1, configurable); + int index = Arrays.binarySearch(myKids, configurable, myComparator); + LOG.assertTrue(index < 0, "similar configurable is already exist"); + myKids = ArrayUtil.insert(myKids, -1 - index, configurable); } else { myKids = ArrayUtil.append(myKids, configurable); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java index 62de6594ef0b..08ddc18fb2e6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java @@ -59,7 +59,7 @@ import java.util.*; public class PluginsAdvertiser implements StartupActivity { @NonNls public static final String IGNORE_ULTIMATE_EDITION = "ignoreUltimateEdition"; private static final Logger LOG = Logger.getInstance("#" + PluginsAdvertiser.class.getName()); - private static final String FEATURE_IMPLEMENTATIONS_URL = "http://plugins.jetbrains.com/feature/getImplementations?"; + private static final String FEATURE_IMPLEMENTATIONS_URL = "https://plugins.jetbrains.com/feature/getImplementations?"; private static final String CASHED_EXTENSIONS = "extensions.xml"; public static final String IDEA_ULTIMATE_EDITION = "IntelliJ IDEA Ultimate Edition"; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/DefaultRemoteContentProvider.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/DefaultRemoteContentProvider.java index 81351083cc16..60515ed5592c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/DefaultRemoteContentProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/DefaultRemoteContentProvider.java @@ -29,7 +29,6 @@ import com.intellij.util.Url; import com.intellij.util.io.HttpRequests; import com.intellij.util.net.ssl.CertificateManager; import org.jetbrains.annotations.NotNull; -import org.jetbrains.io.Responses; import java.io.*; import java.net.HttpURLConnection; @@ -59,8 +58,7 @@ public class DefaultRemoteContentProvider extends RemoteContentProvider { try { HttpRequests.request(url.toExternalForm()) .connectTimeout(60 * 1000) - .readTimeout(60 * 1000) - .userAgent(Responses.getServerHeaderValue()) + .userAgent() .hostNameVerifier(CertificateManager.HOSTNAME_VERIFIER) .connect(new HttpRequests.RequestProcessor() { @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java index ea5e7a28d704..c8457978902f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java @@ -92,12 +92,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame { setContentPane(myScreen.getWelcomePanel()); setTitle("Welcome to " + ApplicationNamesInfo.getInstance().getFullProductName()); AppUIUtil.updateWindowIcon(this); - //Rectangle bounds = ScreenUtil.getMainScreenBounds(); - if (RecentProjectsManager.getInstance().getRecentProjectsActions(false).length > 0) { - setSize(JBUI.size(666, 460)); - } else { - setSize(JBUI.size(555, 460)); - } + setSize(JBUI.size(666, 460)); setResizable(false); //int x = bounds.x + (bounds.width - getWidth()) / 2; //int y = bounds.y + (bounds.height - getHeight()) / 2; diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java index 122003fc9419..acf89075bdb4 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java @@ -27,6 +27,7 @@ import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.openapi.editor.ex.*; import com.intellij.openapi.editor.impl.EditorImpl; import com.intellij.openapi.editor.impl.LineSet; +import com.intellij.openapi.editor.impl.RangeMarkerImpl; import com.intellij.openapi.editor.impl.RangeMarkerTree; import com.intellij.openapi.editor.markup.HighlighterLayer; import com.intellij.openapi.editor.markup.HighlighterTargetArea; @@ -399,7 +400,10 @@ public abstract class EditorTextFieldCellRenderer implements TableCellRenderer, @Override public void addDocumentListener(@NotNull DocumentListener listener) { } @Override public void addDocumentListener(@NotNull DocumentListener listener, @NotNull Disposable parentDisposable) { } @Override public void removeDocumentListener(@NotNull DocumentListener listener) { } - @NotNull @Override public RangeMarker createRangeMarker(int startOffset, int endOffset) { return null; } + @NotNull @Override public RangeMarker createRangeMarker(int startOffset, int endOffset) { + return new RangeMarkerImpl(this, startOffset, endOffset, true){ + }; + } @NotNull @Override public RangeMarker createRangeMarker(int startOffset, int endOffset, boolean surviveOnExternalChange) { return null; } @Override public void addPropertyChangeListener(@NotNull PropertyChangeListener listener) { } @Override public void removePropertyChangeListener(@NotNull PropertyChangeListener listener) { } diff --git a/platform/platform-impl/src/com/intellij/util/io/HttpRequestsImpl.java b/platform/platform-impl/src/com/intellij/util/io/HttpRequestsImpl.java new file mode 100644 index 000000000000..fba7ccc1dbc6 --- /dev/null +++ b/platform/platform-impl/src/com/intellij/util/io/HttpRequestsImpl.java @@ -0,0 +1,40 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.util.io; + +import com.intellij.openapi.application.Application; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.ex.ApplicationInfoEx; +import org.jetbrains.annotations.NotNull; + +class HttpRequestsImpl extends HttpRequests { + @Override + protected RequestBuilder createRequestBuilder(@NotNull String url) { + return new RequestBuilder(url) { + @NotNull + @Override + public RequestBuilder userAgent() { + Application app = ApplicationManager.getApplication(); + if (app != null && !app.isDisposed()) { + return userAgent(ApplicationInfoEx.getInstanceEx().getFullApplicationName()); + } + else { + return userAgent("IntelliJ IDEA (?)"); + } + } + }; + } +} diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index ead98f304b65..bd8746d3da67 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -265,6 +265,8 @@ + + diff --git a/platform/platform-resources/src/idea/PlatformApplicationInfo.xml b/platform/platform-resources/src/idea/PlatformApplicationInfo.xml index 94a1f7f83aea..9cd18f7db315 100644 --- a/platform/platform-resources/src/idea/PlatformApplicationInfo.xml +++ b/platform/platform-resources/src/idea/PlatformApplicationInfo.xml @@ -11,6 +11,6 @@ caption-url="/general/welcomeCaption.png" slogan-url="/general/developSlogan.png"/> - - + + diff --git a/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml b/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml index 80186c17bd3d..01decdc9925e 100644 --- a/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml +++ b/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml @@ -12,16 +12,16 @@ caption-url="/welcomeCaption_community.png" slogan-url="/developSlogan_community.png"/> - - - - - - - + + + + + + diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/broken.xml b/platform/platform-tests/testSrc/com/intellij/ide/updates/broken.xml index db0aed7edddc..71ce296ba617 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/updates/broken.xml +++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/broken.xml @@ -4,9 +4,9 @@ IC IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. IC IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. - + IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. @@ -36,38 +36,38 @@ RM RubyMine 3.0 is available. - Please visit http://www.jetbrains.com/ruby to learn more and download it. + Please visit https://www.jetbrains.com/ruby to learn more and download it. RubyMine 3.0 is available. - Please visit http://www.jetbrains.com/ruby to learn more and download it. + Please visit https://www.jetbrains.com/ruby to learn more and download it. RubyMine 3.0 Release Candidate 2 is available. - Please visit http://www.jetbrains.com/ruby to learn more and download it. + Please visit https://www.jetbrains.com/ruby to learn more and download it. RubyMine 3.0 is available. - Please visit http://www.jetbrains.com/ruby to learn more and download it. + Please visit https://www.jetbrains.com/ruby to learn more and download it. @@ -76,7 +76,7 @@ PY PyCharm 1.0.1 is available. @@ -86,7 +86,7 @@ PyCharm 1.0.1 is available. @@ -99,21 +99,21 @@ PS PhpStorm 1.0.2 is available. - Please visit http://www.jetbrains.com/phpstorm to download it. + Please visit https://www.jetbrains.com/phpstorm to download it. PhpStorm 1.0.2 is available. - Please visit http://www.jetbrains.com/phpstorm to download it. + Please visit https://www.jetbrains.com/phpstorm to download it. @@ -130,11 +130,11 @@ PhpStorm 2.0 is available. - Please visit http://www.jetbrains.com/phpstorm to download it. + Please visit https://www.jetbrains.com/phpstorm to download it. @@ -143,21 +143,21 @@ WS WebStorm 1.0.2 is available. - Please visit http://www.jetbrains.com/webstorm to download it. + Please visit https://www.jetbrains.com/webstorm to download it. WebStorm 1.0.2 is available. - Please visit http://www.jetbrains.com/webstorm to download it. + Please visit https://www.jetbrains.com/webstorm to download it. @@ -174,11 +174,11 @@ WebStorm 1.0.2 is available. - Please visit http://www.jetbrains.com/webstorm to download it. + Please visit https://www.jetbrains.com/webstorm to download it. diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-new9eap.xml b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-new9eap.xml index 46e79d59e5ab..c6b3f607dc06 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-new9eap.xml +++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-new9eap.xml @@ -3,21 +3,21 @@ IU IC IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. + url="https://www.jetbrains.com/idea/whatsnew"> IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel-release.xml b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel-release.xml index b85019fe6161..10193092a9c4 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel-release.xml +++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel-release.xml @@ -4,21 +4,21 @@ IC IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. + url="https://www.jetbrains.com/idea/whatsnew"> IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel.xml b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel.xml index 0404bc4f42e4..bd03598f86b8 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel.xml +++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel.xml @@ -4,21 +4,21 @@ IC IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. + url="https://www.jetbrains.com/idea/whatsnew"> IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newbuild.xml b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newbuild.xml index bb4c8d3f6151..bfb9f3406544 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newbuild.xml +++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newbuild.xml @@ -3,20 +3,20 @@ IU IC IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. - + IntelliJ IDEA 9.0.4 is available. - Please visit http://www.jetbrains.com/idea to learn more and download it. + Please visit https://www.jetbrains.com/idea to learn more and download it. diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-patchAvailable.xml b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-patchAvailable.xml index ee7aec67ac17..aeb1ffac90f7 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-patchAvailable.xml +++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/idea-patchAvailable.xml @@ -4,27 +4,27 @@ IC IntelliJ IDEA 14.0.2 build 139.659 is available. -