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-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-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/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-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/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/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-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. -