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

Merge branch origin/master

Browse Source
This commit is contained in:
Elizaveta Shashkova
2014-12-19 16:48:27 +03:00
parent 49402e927e 55ac3d026d
commit 959badd293
95 changed files with 467 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NOTICE.txt
+1 -1
View File
@@ -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/
build/conf/nsis/idea.nsi
+2 -2
View File
@@ -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
build/scripts/libLicenses.gant
+1 -1
View File
@@ -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")
community-resources/src/idea/IdeaApplicationInfo.xml
+13 -13
View File
@@ -1,6 +1,6 @@
<component>
<version codename="Community Edition" major="14" minor="1" eap="true"/>
<company name="JetBrains s.r.o." url="http://www.jetbrains.com/?fromIDE"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<install-over minbuild="129.1" maxbuild="139.9999" version="14"/>
<logo url="/idea_community_logo.png" textcolor="aaaaaa" progressColor="FDA916" progressY="230" progressTailIcon="/community_progress_tail.png"/>
@@ -13,25 +13,25 @@
caption-url="/welcomeCaption_community.png"
slogan-url="/developSlogan_community.png"/>
<third-party url="http://www.jetbrains.org/"/>
<third-party url="https://www.jetbrains.org/"/>
<editor background-url="/idea_logo_welcome.png"/>
<update-urls check="http://www.jetbrains.com/updates/updates.xml"
patches="http://download.jetbrains.com/idea/"/>
<update-urls check="https://www.jetbrains.com/updates/updates.xml"
patches="https://download.jetbrains.com/idea/"/>
<help file="ideahelp.jar" root="idea"/>
<documentation url="http://www.jetbrains.com/idea/documentation"/>
<support url="http://www.jetbrains.com/support/idea/index.html"/>
<feedback eap-url="http://youtrack.jetbrains.com/newissue?project=IDEA&amp;clearDraft=true&amp;c=Affected+versions+$BUILD&amp;description=$DESCR"
release-url="http://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<plugins url="http://plugins.jetbrains.com"/>
<whatsnew url="http://www.jetbrains.com/idea/whatsnew/index.html"/>
<keymap win="http://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf"
mac="http://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf"/>
<documentation url="https://www.jetbrains.com/idea/documentation"/>
<support url="https://www.jetbrains.com/support/idea/index.html"/>
<feedback eap-url="https://youtrack.jetbrains.com/newissue?project=IDEA&amp;clearDraft=true&amp;c=Affected+versions+$BUILD&amp;description=$DESCR"
release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<plugins url="https://plugins.jetbrains.com"/>
<whatsnew url="https://www.jetbrains.com/idea/whatsnew/index.html"/>
<keymap win="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf"
mac="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf"/>
<plugins-page category="VCS Integration" title="Select VCS Integration Plugins"/>
<plugins-page title="Select Other Plugins"/>
<statistics settings="http://jetbrains.com/idea/statistics/stat-assistant.xml" service="http://jetbrains.com/idea/statistics/index.jsp"/>
<statistics settings="https://www.jetbrains.com/idea/statistics/stat-assistant.xml" service="https://www.jetbrains.com/idea/statistics/index.jsp"/>
</component>
java/compiler/impl/src/com/intellij/openapi/compiler/generic/GenericCompiler.java
+1 -1
View File
@@ -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<Key, SourceState, OutputState> implements Compiler {
java/compiler/openapi/src/com/intellij/openapi/compiler/ClassInstrumentingCompiler.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/ClassPostProcessingCompiler.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerFilter.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java
+1 -1
View File
@@ -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<FileType> inputTypes, Set<FileType> outputTypes);
java/compiler/openapi/src/com/intellij/openapi/compiler/CopyingCompiler.java
+1 -1
View File
@@ -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{
java/compiler/openapi/src/com/intellij/openapi/compiler/GeneratingCompiler.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java
+1 -1
View File
@@ -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{
java/compiler/openapi/src/com/intellij/openapi/compiler/JavaSourceTransformingCompiler.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/PackagingCompiler.java
+1 -1
View File
@@ -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{
java/compiler/openapi/src/com/intellij/openapi/compiler/SourceGeneratingCompiler.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/SourceProcessingCompiler.java
+1 -1
View File
@@ -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 {
java/compiler/openapi/src/com/intellij/openapi/compiler/TranslatingCompiler.java
+1 -1
View File
@@ -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 {
java/idea-ui/src/com/intellij/openapi/wm/impl/welcomeScreen/DevelopPluginsAction.java
+1 -1
View File
@@ -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) {
java/idea-ui/src/com/intellij/platform/templates/IC_template_groups.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<template-groups xmlns="http://www.jetbrains.com/projectTemplates">
<template-groups xmlns="https://www.jetbrains.com/projectTemplates">
<group>
<name>Java Samples</name>
<path>Java</path>
java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<template-groups xmlns="http://www.jetbrains.com/projectTemplates">
<template-groups xmlns="https://www.jetbrains.com/projectTemplates">
<group>
<name>Java Samples</name>
<path>Java</path>
java/idea-ui/src/com/intellij/platform/templates/IU_template_groups.xsd
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.jetbrains.com/projectTemplates">
targetNamespace="https://www.jetbrains.com/projectTemplates">
<xs:element name="template-groups" type="template-groupsType"/>
<xs:complexType name="groupType">
<xs:sequence>
java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarStatisticsService.java
+1 -2
View File
@@ -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();
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
+2 -2
View File
@@ -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
}
java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java
+1 -1
View File
@@ -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
}
platform/core-api/src/com/intellij/psi/stubs/package-info.java
+1 -1
View File
@@ -1,5 +1,5 @@
/**
* @see <a href="http://confluence.jetbrains.com/display/IDEADEV/Indexing+and+PSI+Stubs+in+IntelliJ+IDEA">Indexing and PSI Stubs in IntelliJ IDEA</a>
* @see <a href="https://confluence.jetbrains.com/display/IDEADEV/Indexing+and+PSI+Stubs+in+IntelliJ+IDEA">Indexing and PSI Stubs in IntelliJ IDEA</a>
*
* @see <a href="http://devnet.jetbrains.com/message/5485343#_ga=1.104383616.1427417469.1367843132">Lifecycle of stub creation</a>
*/
platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+4 -4
View File
@@ -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<PluginChooserPage> myPluginChooserPages = new ArrayList<PluginChooserPage>();
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;
}
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+1 -1
View File
@@ -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() {
platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java
+1 -1
View File
@@ -68,7 +68,7 @@ public abstract class AbstractExternalSystemSettings<
/**
* Every time particular external system setting is changed corresponding message is sent via ide
* <a href="http://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+Messaging+infrastructure">messaging sub-system</a>.
* <a href="https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+Messaging+infrastructure">messaging sub-system</a>.
* 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}
platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadConnectionService.java
+1 -1
View File
@@ -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");
}
}
platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java
+33 -47
View File
@@ -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<String, String> 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<String, String> readSettings(String... attributes) {
Map<String, String> settings = ContainerUtil.newLinkedHashMap();
private Map<String, String> readSettings(final String... attributes) {
final Map<String, String> settings = ContainerUtilRt.newLinkedHashMap();
try {
String url = getSettingsUrl();
HttpConfigurable.getInstance().prepareURL(url);
String text = FileUtil.loadTextAndClose(getStream(new URL(url)));
if (text.startsWith("<html>") || text.startsWith("<!DOCTYPE html>")) {
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<Void>() {
@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;
}
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+1 -1
View File
@@ -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
platform/lang-impl/src/com/intellij/openapi/options/colors/pages/GeneralColorsPage.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class GeneralColorsPage implements ColorSettingsPage, InspectionColorSett
"\n" +
"<todo>//TODO: Visit JB Web resources:</todo>\n"+
"JetBrains Home Page: <hyperlink_f>http://www.jetbrains.com</hyperlink_f>\n" +
"JetBrains Developer Community: <hyperlink>http://www.jetbrains.com/devnet</hyperlink>\n" +
"JetBrains Developer Community: <hyperlink>https://www.jetbrains.com/devnet</hyperlink>\n" +
"\n" +
"Search:\n" +
" <search_result_wr>result</search_result_wr> = \"<search_text>text</search_text>, <search_text>text</search_text>, <search_text>text</search_text>\";\n" +
platform/lang-impl/src/com/intellij/platform/templates/github/DownloadUtil.java
+1 -2
View File
@@ -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<Object>() {
@Override
public Object process(@NotNull HttpRequests.Request request) throws IOException {
platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
+1 -1
View File
@@ -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();
}
platform/platform-api/src/com/intellij/util/io/HttpRequests.java
+26 -6
View File
@@ -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;
* });
* }</pre>
*/
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> {
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> T connect(@NotNull RequestProcessor<T> 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> T wrapAndProcess(RequestBuilder builder, RequestProcessor<T> 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();
platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsConnectionService.java
+6 -6
View File
@@ -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<String> getDisabledGroups() {
final String disabledGroupsString = getSettingValue(DISABLED);
if (disabledGroupsString == null) return Collections.<String>emptySet();
if (disabledGroupsString == null) {
return Collections.emptySet();
}
final List<String> disabledGroupsList = StringUtil.split(disabledGroupsString, ",");
return ContainerUtil.map2Set(disabledGroupsList, new Function<String, String>() {
platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java
+1 -1
View File
@@ -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
platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsUsagesCollector.java
+3 -3
View File
@@ -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<UsageDescriptor> getProjectUsages(@NotNull Project project) throws CollectUsagesException {
@@ -26,9 +26,9 @@ public class IdeSettingsUsagesCollector extends AbstractApplicationUsagesCollect
@NotNull
private static Set<Pair<Object, IdeSettingsDescriptor>> getProviders(@Nullable Project project, boolean projectComponent) {
Set<Pair<Object, IdeSettingsDescriptor>> pairs = new HashSet<Pair<Object, IdeSettingsDescriptor>>();
Set<Pair<Object, IdeSettingsDescriptor>> pairs = new THashSet<Pair<Object, IdeSettingsDescriptor>>();
for (IdeSettingsDescriptor descriptor : IdeSettingsStatisticsService.getInstance().getSettingDescriptors()) {
final Pair<Object, IdeSettingsDescriptor> pair = getProvider(project, descriptor, projectComponent);
Pair<Object, IdeSettingsDescriptor> pair = getProvider(project, descriptor, projectComponent);
if (pair != null) {
pairs.add(pair);
}
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AdditionalTextAttributesEP.java
+1 -3
View File
@@ -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
platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java
+11 -8
View File
@@ -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);
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
+1 -1
View File
@@ -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";
platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/DefaultRemoteContentProvider.java
+1 -3
View File
@@ -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<Object>() {
@Override
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+1 -6
View File
@@ -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;
platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java
+5 -1
View File
@@ -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) { }
platform/platform-impl/src/com/intellij/util/io/HttpRequestsImpl.java
+40
View File
@@ -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 (?)");
}
}
};
}
}
platform/platform-resources/src/META-INF/PlatformExtensions.xml
+2
View File
@@ -265,6 +265,8 @@
<applicationService serviceImplementation="com.intellij.openapi.editor.ex.EditorSettingsExternalizable"/>
<applicationService serviceInterface="com.intellij.util.io.HttpRequests" serviceImplementation="com.intellij.util.io.HttpRequestsImpl"/>
<scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.FilePackageSetParserExtension"/>
<applicationService serviceInterface="com.intellij.openapi.ui.popup.StackingPopupDispatcher" serviceImplementation="com.intellij.ui.popup.StackingPopupDispatcherImpl"/>
platform/platform-resources/src/idea/PlatformApplicationInfo.xml
+2 -2
View File
@@ -11,6 +11,6 @@
caption-url="/general/welcomeCaption.png"
slogan-url="/general/developSlogan.png"/>
<update-urls check="http://www.jetbrains.com/updates/update.xml" download="http://www.jetbrains.com/idea/download/"/>
<eap-update-urls check="http://www.jetbrains.com/updates/eap-update.xml" download="http://www.intellij.net/eap/products/idea/download.jsp"/>
<update-urls check="https://www.jetbrains.com/updates/update.xml" download="https://www.jetbrains.com/idea/download/"/>
<eap-update-urls check="https://www.jetbrains.com/updates/eap-update.xml" download="http://www.intellij.net/eap/products/idea/download.jsp"/>
</component>
platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml
+8 -8
View File
@@ -12,16 +12,16 @@
caption-url="/welcomeCaption_community.png"
slogan-url="/developSlogan_community.png"/>
<update-urls check="http://www.jetbrains.com/updates/updates.xml"
<update-urls check="https://www.jetbrains.com/updates/updates.xml"
patches="http://download.jetbrains.com/idea/"/>
<help file="ideahelp.jar" root="idea"/>
<documentation url="http://www.jetbrains.com/idea/documentation"/>
<support url="http://www.jetbrains.com/support/idea/index.html"/>
<feedback eap-url="http://youtrack.jetbrains.com" release-url="http://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<plugins url="http://plugins.jetbrains.com/"/>
<whatsnew url="http://www.jetbrains.com/idea/whatsnew/index.html"/>
<keymap win="http://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard.pdf"
mac="http://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard_Mac.pdf"/>
<documentation url="https://www.jetbrains.com/idea/documentation"/>
<support url="https://www.jetbrains.com/support/idea/index.html"/>
<feedback eap-url="http://youtrack.jetbrains.com" release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<plugins url="https://plugins.jetbrains.com/"/>
<whatsnew url="https://www.jetbrains.com/idea/whatsnew/index.html"/>
<keymap win="https://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard.pdf"
mac="https://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard_Mac.pdf"/>
<plugins-page category="VCS Integration" title="Select VCS Integration Plugins"/>
<plugins-page title="Select Other Plugins"/>
platform/platform-tests/testSrc/com/intellij/ide/updates/broken.xml
+2 -2
View File
@@ -4,9 +4,9 @@
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</mes
platform/platform-tests/testSrc/com/intellij/ide/updates/current.xml
+26 -26
View File
@@ -4,20 +4,20 @@
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" url="http://www.jetbrains.com/idea/whatsnew">
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
@@ -36,38 +36,38 @@
<product name="RubyMine">
<code>RM</code>
<channel id="rm20" name="RubyMine 2.0.2" status="Release"
url="http://www.jetbrains.com/ruby"
url="https://www.jetbrains.com/ruby"
feedback="http://youtrack.jetbrains.net">
<build number="97.122" version="3.0">
<message>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.
</message>
</build>
</channel>
<channel id="rm25" name="RubyMine 3.0" status="Release"
url="http://www.jetbrains.com/ruby/"
url="https://www.jetbrains.com/ruby/"
feedback="http://youtrack.jetbrains.net">
<build number="97.122" version="3.0">
<message>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.
</message>
</build>
</channel>
<channel id="rm30" name="RubyMine 3.0" status="Release"
url="http://www.jetbrains.com/ruby/"
url="https://www.jetbrains.com/ruby/"
feedback="http://youtrack.jetbrains.net">
<build number="97.122" version="3.0">
<message>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.
</message>
</build>
</channel>
<channel id="rm25EAP" name="RubyMine 3.0" status="EAP"
url="http://www.jetbrains.com/ruby/"
url="https://www.jetbrains.com/ruby/"
feedback="http://youtrack.jetbrains.net">
<build number="97.122" version="3.0">
<message>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.
</message>
</build>
</channel>
@@ -76,7 +76,7 @@
<product name="PyCharm">
<code>PY</code>
<channel id="pycharm" name="PyCharm 1.0" status="EAP"
url="http://www.jetbrains.com/pycharm"
url="https://www.jetbrains.com/pycharm"
feedback="http://youtrack.jetbrains.net">
<build number="97.87" version="1.0.1">
<message>PyCharm 1.0.1 is available.
@@ -86,7 +86,7 @@
</channel>
<channel id="pycharm10" name="PyCharm 1.0" status="Release"
url="http://www.jetbrains.com/pycharm"
url="https://www.jetbrains.com/pycharm"
feedback="http://youtrack.jetbrains.net">
<build number="97.87" version="1.0.1">
<message>PyCharm 1.0.1 is available.
@@ -99,21 +99,21 @@
<product name="PhpStorm">
<code>PS</code>
<channel id="WI1EAP" name="PhpStorm 1.0.2" status="EAP"
url="http://www.jetbrains.com/phpstorm"
url="https://www.jetbrains.com/phpstorm"
feedback="http://devnet.jetbrains.net/community/wi/">
<build number="95.503" version="1.0.2">
<message>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.
</message>
</build>
</channel>
<channel id="WI1" name="PhpStorm 1.0.2" status="release"
url="http://www.jetbrains.com/phpstorm"
url="https://www.jetbrains.com/phpstorm"
feedback="http://devnet.jetbrains.net/community/wi/">
<build number="95.503" version="1.0.2">
<message>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.
</message>
</build>
</channel>
@@ -130,11 +130,11 @@
</channel>
<channel id="WI2" name="PhpStorm 2.0" status="release"
url="http://www.jetbrains.com/phpstorm"
url="https://www.jetbrains.com/phpstorm"
feedback="http://devnet.jetbrains.net/community/wi/">
<build number="95.503" version="2.0">
<message>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.
</message>
</build>
</channel>
@@ -143,21 +143,21 @@
<product name="WebStorm">
<code>WS</code>
<channel id="WI1EAP" name="WebStorm 1.0.2" status="EAP"
url="http://www.jetbrains.com/webstorm"
url="https://www.jetbrains.com/webstorm"
feedback="http://devnet.jetbrains.net/community/wi/">
<build number="95.503" version="1.0.2">
<message>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.
</message>
</build>
</channel>
<channel id="WI1" name="WebStorm 1.0.2" status="release"
url="http://www.jetbrains.com/webstorm"
url="https://www.jetbrains.com/webstorm"
feedback="http://devnet.jetbrains.net/community/wi/">
<build number="95.503" version="1.0.2">
<message>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.
</message>
</build>
</channel>
@@ -174,11 +174,11 @@
</channel>
<channel id="WI2" name="WebStorm 2.0" status="release"
url="http://www.jetbrains.com/webstorm"
url="https://www.jetbrains.com/webstorm"
feedback="http://devnet.jetbrains.net/community/wi/">
<build number="95.503" version="1.0.2">
<message>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.
</message>
</build>
</channel>
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-new9eap.xml
+4 -4
View File
@@ -3,21 +3,21 @@
<code>IU</code>
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew">
url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel-release.xml
+4 -4
View File
@@ -4,21 +4,21 @@
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew">
url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newChannel.xml
+4 -4
View File
@@ -4,21 +4,21 @@
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew">
url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-newbuild.xml
+4 -4
View File
@@ -3,20 +3,20 @@
<code>IU</code>
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" url="http://www.jetbrains.com/idea/whatsnew">
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-patchAvailable.xml
+7 -7
View File
@@ -4,27 +4,27 @@
<code>IC</code>
<channel id="IDEA14" name="IntelliJ IDEA 14" status="release"
url="http://www.jetbrains.com/idea/download"
url="https://www.jetbrains.com/idea/download"
feedback="http://youtrack.jetbrains.net"
majorVersion="14">
<build number="139.659" version="14.0.2" releaseDate="20141103">
<message>IntelliJ IDEA 14.0.2 build 139.659 is available.</message>
<button name="Download" url="http://www.jetbrains.com/idea/download" download="true"/>
<button name="What's New" url="http://www.jetbrains.com/idea/whatsnew/index.html"/>
<button name="Release Notes" url="http://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+14.0.2+Release+Notes"/>
<button name="Download" url="https://www.jetbrains.com/idea/download" download="true"/>
<button name="What's New" url="https://www.jetbrains.com/idea/whatsnew/index.html"/>
<button name="Release Notes" url="https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+14.0.2+Release+Notes"/>
<patch from="139.224" size="30" />
<patch from="139.225" size="30" />
</build>
</channel>
<channel id="IDEA_14_EAP" name="IntelliJ IDEA 14 EAP" status="eap"
url="http://confluence.jetbrains.com/display/IDEADEV/IDEA+14+EAP"
url="https://confluence.jetbrains.com/display/IDEADEV/IDEA+14+EAP"
feedback="http://youtrack.jetbrains.net"
majorVersion="14">
<build number="139.659" version="14.0.2" releaseDate="20141103">
<message>IntelliJ IDEA 14.0.2 build 139.659 is available.</message>
<button name="Download" url="http://confluence.jetbrains.com/display/IDEADEV/IDEA+14+EAP" download="true"/>
<button name="Release Notes" url="http://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+14+139.659.2+Release+Notes"/>
<button name="Download" url="https://confluence.jetbrains.com/display/IDEADEV/IDEA+14+EAP" download="true"/>
<button name="Release Notes" url="https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+14+139.659.2+Release+Notes"/>
<patch from="139.658" size="10" />
<patch from="139.224" size="30" />
<patch from="139.225" size="30" />
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-same.xml
+4 -4
View File
@@ -3,21 +3,21 @@
<code>IU</code>
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" majorVersion="9"
url="http://www.jetbrains.com/idea/whatsnew">
url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
platform/platform-tests/testSrc/com/intellij/ide/updates/oneProductOnly.xml
+4 -4
View File
@@ -4,20 +4,20 @@
<code>IC</code>
<channel id="maiaEAP" name="IntelliJ IDEA 9 updates" status="release"
url="http://www.jetbrains.com/idea/whatsnew"
url="https://www.jetbrains.com/idea/whatsnew"
feedback="http://youtrack.jetbrains.net">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
</channel>
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" url="http://www.jetbrains.com/idea/whatsnew">
<channel id="idea90" name="IntelliJ IDEA 9 updates" status="release" url="https://www.jetbrains.com/idea/whatsnew">
<build number="95.627" version="9.0.4">
<message>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.
</message>
<patch from="95.429" size="2"/>
</build>
platform/platform-tests/testSrc/com/intellij/ide/updates/updates.xml
+3 -3
View File
@@ -4,13 +4,13 @@
<code>IC</code>
<code></code>
<channel id="IU8EAP" name="Diana EAP" status="EAP" url="http://www.jetbrains.net/confluence/display/IDEADEV/Diana+EAP" feedback="http://youtrack.jetbrains.net">
<channel id="IU8EAP" name="Diana EAP" status="EAP" url="https://www.jetbrains.net/confluence/display/IDEADEV/Diana+EAP" feedback="http://youtrack.jetbrains.net">
<build number="9939" name="8.1.4 Release Candidate">
<patch from="9922" size="1"/>
</build>
</channel>
<channel id="maiaEAP" name="Maia EAP" status="EAP" url="http://www.jetbrains.net/confluence/display/IDEADEV/Maia+EAP" feedback="http://youtrack.jetbrains.net">
<channel id="maiaEAP" name="Maia EAP" status="EAP" url="https://www.jetbrains.net/confluence/display/IDEADEV/Maia+EAP" feedback="http://youtrack.jetbrains.net">
<build number="91.100">
<message>If you have the TeamCity plugin installed,&lt;br&gt; make sure to update it to version from 4.5.5 or latest EAP</message>
</build>
@@ -20,7 +20,7 @@
</channel>
<channel name="IntelliJ IDEA Ultimate 9 updates" status="release" url="http://www.jetbrains.com/idea">
<channel name="IntelliJ IDEA Ultimate 9 updates" status="release" url="https://www.jetbrains.com/idea">
</channel>
</product>
platform/platform-tests/testSrc/com/intellij/usagesStatistics/RemotelyConfigurableStatServiceTest.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class RemotelyConfigurableStatServiceTest {
RemotelyConfigurableStatisticsService service =
new RemotelyConfigurableStatisticsService(new StatisticsConnectionService() {
@Override
public Boolean isTransmissionPermitted() {
public boolean isTransmissionPermitted() {
return false;
}
},
platform/script-debugger/backend/src/org/jetbrains/debugger/ValueModifier.java
+1 -1
View File
@@ -6,7 +6,7 @@ import org.jetbrains.debugger.values.Value;
public interface ValueModifier {
// expression can contains reference to another variables in current scope, so, we should evaluate it before set
// http://youtrack.jetbrains.com/issue/WEB-2342#comment=27-512122
// https://youtrack.jetbrains.com/issue/WEB-2342#comment=27-512122
// we don't worry about performance in case of simple primitive values - boolean/string/numbers,
// it works quickly and we don't want to complicate our code and debugger SDK
platform/util/src/com/intellij/ui/JBAutoscroller.java
+153 -1
View File
@@ -22,8 +22,13 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumnModel;
import java.awt.*;
import java.awt.event.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
public class JBAutoscroller implements ActionListener {
private static final int SCROLL_UPDATE_INTERVAL = 15;
@@ -45,7 +50,11 @@ public class JBAutoscroller implements ActionListener {
}
public static void installOn(@NotNull JComponent component, @Nullable ScrollDeltaProvider handler) {
INSTANCE.doInstallOn(component, handler);
getInstance().doInstallOn(component, handler);
}
private static JBAutoscroller getInstance() {
return INSTANCE;
}
private void doInstallOn(@NotNull JComponent component, @Nullable ScrollDeltaProvider handler) {
@@ -55,6 +64,12 @@ public class JBAutoscroller implements ActionListener {
component.putClientProperty(SCROLL_HANDLER_KEY, handler);
}
if (component instanceof JTable) {
JTable t = (JTable)component;
new MoveTableCellEditorOnAutoscrollFix(t);
new ScrollOnTableSelectionChangeFix(t);
}
component.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
@@ -140,6 +155,10 @@ public class JBAutoscroller implements ActionListener {
return scrolled;
}
private boolean isRunningOn(@NotNull JComponent component) {
return myLatestDragEvent != null && myLatestDragEvent.getComponent() == component;
}
private static boolean scroll(@Nullable JScrollBar scrollBar, int delta) {
if (scrollBar == null || delta == 0) return false;
@@ -178,4 +197,137 @@ public class JBAutoscroller implements ActionListener {
super(source, id, when, modifiers, x, y, xAbs, yAbs, clickCount, popupTrigger, button);
}
}
// JTable's UI only updates cell editor location upon it's cell painting which doesn't occur if the cell becomes obscure.
// Moving cell editor prevents it from being 'stuck' on autoscroll.
private static class MoveTableCellEditorOnAutoscrollFix implements AdjustmentListener, PropertyChangeListener {
private final JTable myTable;
public MoveTableCellEditorOnAutoscrollFix(JTable table) {
myTable = table;
JScrollPane scrollPane = UIUtil.getParentOfType(JScrollPane.class, myTable);
assert scrollPane != null : "MoveTableCellEditorOnAutoscrollFix can only be applied to tables having a scrollpane as it's parent!";
scrollPane.addPropertyChangeListener(this);
addScrollBarListener(scrollPane.getHorizontalScrollBar());
addScrollBarListener(scrollPane.getVerticalScrollBar());
}
@Override
public void propertyChange(PropertyChangeEvent evt) {
String propertyName = evt.getPropertyName();
if ("horizontalScrollBar".equals(propertyName) || "verticalScrollBar".equals(propertyName)) {
removeScrollBarListener(ObjectUtils.tryCast(evt.getOldValue(), JScrollBar.class));
addScrollBarListener(ObjectUtils.tryCast(evt.getNewValue(), JScrollBar.class));
}
}
private void addScrollBarListener(@Nullable JScrollBar to) {
if (to != null) {
to.addAdjustmentListener(this);
}
}
private void removeScrollBarListener(@Nullable JScrollBar from) {
if (from != null) {
from.removeAdjustmentListener(this);
}
}
@Override
public void adjustmentValueChanged(AdjustmentEvent e) {
moveCellEditor();
}
private void moveCellEditor() {
int column = myTable.getEditingColumn();
int row = myTable.getEditingRow();
Component editor = myTable.getEditorComponent();
if (column == -1 || row == -1 || editor == null) return;
Rectangle cellRect = myTable.getCellRect(row, column, false);
Rectangle visibleRect = myTable.getVisibleRect();
if (visibleRect.intersects(cellRect)) return;
Rectangle editorBounds = editor.getBounds();
if (!visibleRect.intersects(editorBounds)) return;
editorBounds.x = cellRect.x;
editorBounds.y = cellRect.y;
editor.setBounds(editorBounds);
}
}
// Disabling swing autoscroll on a JTable leads to table not being scrolled on selection changes.
// Particularly, scrollRectToVisible in javax.swing.JTable#changeSelection won't be called.
private static class ScrollOnTableSelectionChangeFix implements ListSelectionListener, PropertyChangeListener {
private final JTable myTable;
public ScrollOnTableSelectionChangeFix(JTable table) {
myTable = table;
myTable.addPropertyChangeListener("selectionModel", this);
myTable.addPropertyChangeListener("columnModel", this);
addSelectionListener(getRowSelectionModel());
addSelectionListener(getColumnSelectionModel());
}
@Override
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting() || getInstance().isRunningOn(myTable)) return;
ListSelectionModel rsm = getRowSelectionModel();
int row = rsm != null ? rsm.getLeadSelectionIndex() : -1;
ListSelectionModel csm = getColumnSelectionModel();
int col = csm != null ? csm.getLeadSelectionIndex() : -1;
if (row >= 0 && row < myTable.getRowCount() && col >= 0 && col < myTable.getColumnCount()) {
myTable.scrollRectToVisible(myTable.getCellRect(row, col, false));
}
}
@Override
public void propertyChange(PropertyChangeEvent evt) {
ListSelectionModel oldSelectionModel = null;
ListSelectionModel newSelectionModel = null;
if ("selectionModel".equals(evt.getPropertyName())) {
oldSelectionModel = (ListSelectionModel)evt.getOldValue();
newSelectionModel = (ListSelectionModel)evt.getNewValue();
}
else if ("columnModel".equals(evt.getPropertyName())) {
TableColumnModel oldColumnModel = (TableColumnModel)evt.getOldValue();
oldSelectionModel = oldColumnModel != null ? oldColumnModel.getSelectionModel() : null;
TableColumnModel newColumnModel = (TableColumnModel)evt.getNewValue();
newSelectionModel = newColumnModel != null ? newColumnModel.getSelectionModel() : null;
}
removeSelectionListener(oldSelectionModel);
addSelectionListener(newSelectionModel);
}
@Nullable
private ListSelectionModel getRowSelectionModel() {
return myTable.getSelectionModel();
}
@Nullable
private ListSelectionModel getColumnSelectionModel() {
return myTable.getColumnModel().getSelectionModel();
}
private void removeSelectionListener(@Nullable ListSelectionModel from) {
if (from != null) {
from.removeListSelectionListener(this);
}
}
private void addSelectionListener(@Nullable ListSelectionModel to) {
if (to != null) {
to.addListSelectionListener(this);
}
}
}
}
plugins/commander/src/META-INF/plugin.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<name>Commander</name>
<description>Provides a two-panel view for navigating and working with the project structure</description>
<version>1.0.0</version>
<vendor url="http://www.jetbrains.com" logo="/general/ijLogo.png">JetBrains</vendor>
<vendor url="https://www.jetbrains.com">JetBrains</vendor>
<resource-bundle>com.intellij.ide.commander.CommanderBundle</resource-bundle>
<extensions defaultExtensionNs="com.intellij">
plugins/copyright/src/META-INF/java.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin url="http://www.jetbrains.com/idea">
<idea-plugin url="https://www.jetbrains.com/idea">
<extensions defaultExtensionNs="com.intellij.copyright">
<updater filetype="JSPX" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspxFileCopyright$UpdateJspxCopyrightsProvider"/>
<updater filetype="JSP" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspFileCopyright$UpdateJspCopyrightsProvider"/>
plugins/coverage/src/META-INF/junit-integration.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin url="http://www.jetbrains.com/idea">
<idea-plugin url="https://www.jetbrains.com/idea">
<extensions defaultExtensionNs="com.intellij">
<junitListener implementation="com.intellij.coverage.listeners.IDEAJUnitCoverageListener"/>
</extensions>
plugins/coverage/src/META-INF/testng-integration.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin url="http://www.jetbrains.com/idea">
<idea-plugin url="https://www.jetbrains.com/idea">
<extensions defaultExtensionNs="com.theoryinpractice.testng">
<listener implementation="com.intellij.coverage.listeners.IDEATestNGCoverageListener"/>
</extensions>
plugins/devkit/resources/fileTemplates/j2ee/plugin.xml.ft
+2 -2
View File
@@ -15,10 +15,10 @@
]]>
</change-notes>
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
<!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
<idea-version since-build="131"/>
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
<!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
on how to target different products -->
<!-- uncomment to enable plugin in all products
<depends>com.intellij.modules.lang</depends>
plugins/eclipse/resources/META-INF/plugin.xml
+1 -1
View File
@@ -16,7 +16,7 @@
</description>
<version>3.0</version>
<vendor url="http://www.jetbrains.com" logo="/general/ijLogo.png">JetBrains s.r.o.</vendor>
<vendor url="https://www.jetbrains.com">JetBrains s.r.o.</vendor>
<extensions defaultExtensionNs="com.intellij">
<classpathStorageProvider implementation="org.jetbrains.idea.eclipse.config.EclipseClasspathStorageProvider"/>
<compileServer.plugin classpath="eclipse-jps-plugin.jar;common-eclipse-util.jar"/>
plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin url="http://www.jetbrains.com/idea">
<idea-plugin url="https://www.jetbrains.com/idea">
<extensionPoints>
<extensionPoint qualifiedName="com.intellij.remoteServer.util.deploymentDetector"
plugins/git4idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -15,7 +15,7 @@
</description>
<version>8.1</version>
<category>VCS Integration</category>
<vendor url="http://svn.jetbrains.org/idea/Trunk/bundled/git4idea/" logo="/general/ijLogo.png">JetBrains</vendor>
<vendor url="http://svn.jetbrains.org/idea/Trunk/bundled/git4idea/">JetBrains</vendor>
<depends>com.intellij.modules.vcs</depends>
<xi:include href="/META-INF/remote-servers-git.xml" xpointer="xpointer(/idea-plugin/*)">
plugins/google-app-engine/resources/META-INF/google-app-engine-maven-support.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin url="http://www.jetbrains.com/idea">
<idea-plugin url="https://www.jetbrains.com/idea">
<extensions defaultExtensionNs="org.jetbrains.idea.maven">
<importer implementation="com.intellij.appengine.maven.AppEngineFacetImporter"/>
</extensions>
plugins/gradle/resources/i18n/GradleDocumentationBundle.properties
+1 -1
View File
@@ -105,7 +105,7 @@ gradle.documentation.org.gradle.api.Project.apply.plugin.findbugs=\
gradle.documentation.org.gradle.api.Project.apply.plugin.idea.non-html=\
Generates files and applies IDEA specific customizations that are used by Intellij IDEA IDE thus making it possible to import the project into IDEA.
gradle.documentation.org.gradle.api.Project.apply.plugin.idea=\
<p>Generates files and applies IDEA specific customizations that are used by <a class="ulink" href="http://www.jetbrains.com/idea/index.html" target="_top">Intellij IDEA IDE</a>, \
<p>Generates files and applies IDEA specific customizations that are used by <a class="ulink" href="https://www.jetbrains.com/idea/index.html" target="_top">Intellij IDEA IDE</a>, \
thus making it possible to import the project into IDEA.\
</p>
gradle.documentation.org.gradle.api.Project.apply.plugin.jdepend.non-html=\
plugins/gradle/src/META-INF/plugin.xml
+1 -1
View File
@@ -14,7 +14,7 @@
~
-->
<idea-plugin url="http://confluence.jetbrains.com/display/IDEADEV/Gradle+integration">
<idea-plugin url="https://confluence.jetbrains.com/display/IDEADEV/Gradle+integration">
<name>Gradle</name>
<id>org.jetbrains.plugins.gradle</id>
<vendor>JetBrains</vendor>
plugins/gradle/tooling-extension-impl/testData/testGradleSourcesSetsInterpretation/build.gradle
+2 -2
View File
@@ -67,7 +67,7 @@ project("withIdeaPluginCustomization1") {
}
}
// see http://youtrack.jetbrains.com/issue/IDEA-119365
// see https://youtrack.jetbrains.com/issue/IDEA-119365
project("withIdeaPluginCustomization2") {
apply plugin: 'java'
apply plugin: 'idea'
@@ -80,7 +80,7 @@ project("withIdeaPluginCustomization2") {
}
}
// see http://youtrack.jetbrains.com/issue/IDEA-120562
// see https://youtrack.jetbrains.com/issue/IDEA-120562
project("withIdeaPluginCustomization3") {
apply plugin: 'java'
apply plugin: 'idea'
plugins/gradle/tooling-extension-impl/testData/testModelBuildScriptClasspathBuilder/build.gradle
+2 -2
View File
@@ -27,10 +27,10 @@ project("baseModule") {
allprojects {
configurations.all {
// check for configuration which is not in unresolved state - http://youtrack.jetbrains.com/issue/IDEA-124839
// check for configuration which is not in unresolved state - https://youtrack.jetbrains.com/issue/IDEA-124839
exclude group: 'some-group'
// check for usage of custom resolutionStrategy - http://youtrack.jetbrains.com/issue/IDEA-125592
// check for usage of custom resolutionStrategy - https://youtrack.jetbrains.com/issue/IDEA-125592
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
println details.target
}
plugins/java-decompiler/plugin/src/META-INF/plugin.xml
+1 -1
View File
@@ -7,7 +7,7 @@
no more dull "{ /* compiled code */ }" in method bodies!
</description>
<version>0.1</version>
<vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
<vendor email="support@jetbrains.com" url="https://www.jetbrains.com">JetBrains</vendor>
<idea-version since-build="135"/>
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java
+1 -1
View File
@@ -254,7 +254,7 @@ public class Maven3ServerEmbedderImpl extends MavenRemoteObject implements Maven
getComponent(RepositorySystem.class).createLocalRepository(new File(myMavenSettings.getLocalRepository()));
final String customRepoId = System.getProperty("maven3.localRepository.id");
if(customRepoId != null) {
// see details at http://youtrack.jetbrains.com/issue/IDEA-121292
// see details at https://youtrack.jetbrains.com/issue/IDEA-121292
localRepository.setId(customRepoId);
}
return localRepository;
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class MavenArtifactSearchPanel extends JPanel {
pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
pane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); // Don't remove this line.
// Without VERTICAL_SCROLLBAR_ALWAYS policy our custom layout
// works incorrectly, see http://youtrack.jetbrains.com/issue/IDEA-72986
// works incorrectly, see https://youtrack.jetbrains.com/issue/IDEA-72986
add(pane, BorderLayout.CENTER);
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java
+1 -1
View File
@@ -337,7 +337,7 @@ public class MavenIndicesManager implements Disposable {
Element root = doc.getRootElement();
if (root == null) return;
// Store artifact to set to remove duplicate created by old IDEA (http://youtrack.jetbrains.com/issue/IDEA-72105)
// Store artifact to set to remove duplicate created by old IDEA (https://youtrack.jetbrains.com/issue/IDEA-72105)
Collection<MavenArchetype> result = new LinkedHashSet<MavenArchetype>();
List<Element> children = root.getChildren(ELEMENT_ARCHETYPE);
plugins/maven/src/main/resources/META-INF/groovy-support.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin url="http://www.jetbrains.com/idea">
<idea-plugin url="https://www.jetbrains.com/idea">
<extensions defaultExtensionNs="org.jetbrains.idea.maven">
<importer implementation="org.jetbrains.idea.maven.plugins.groovy.Groovy_1_0_Importer"/>
<importer implementation="org.jetbrains.idea.maven.plugins.groovy.Groovy_1_1_plus_Importer"/>
plugins/properties/testData/propertiesFile/enter/Performance.properties
+4 -4
View File
@@ -3995,7 +3995,7 @@ gem.inspection.notification.no.matching.sdk.body=Please install Sdk specified in
gems.inspection.minitest.gem=Minitest support
gems.inspection.minitest.gem.reporter.not.installed=<html><body> \
RubyMine test runner requires ''minitest-reporters'' gem({0}) for integration with MiniTest framework.<br/> \
See <a href='http://www.jetbrains.com/ruby/webhelp/minitest.html'>minitest integration</a> for more information.\
See <a href='https://www.jetbrains.com/ruby/webhelp/minitest.html'>minitest integration</a> for more information.\
</body></html>
gems.inspection.gem.quick.fix.add.name=Add gem dependency to ''{0}'' gem
gems.inspection.gem.quick.fix.add.name.and.version=Add gem dependency to ''{0}'' gem, version {1}
@@ -4016,7 +4016,7 @@ gems.debugger.in.gemfile=<html><body> \
It looks like there is the 'debugger' gem in your Gemfile.\
This may cause some problems during debugging.<br/>\
Are you sure you want to continue?<br/>\
If you are not, check <a href="http://www.jetbrains.com/ruby/webhelp/debugging.html">help topic</a>.\
If you are not, check <a href="https://www.jetbrains.com/ruby/webhelp/debugging.html">help topic</a>.\
</body></html>
# gem command
@@ -19487,7 +19487,7 @@ gem.inspection.notification.no.matching.sdk.body=Please install Sdk specified in
gems.inspection.minitest.gem=Minitest support
gems.inspection.minitest.gem.reporter.not.installed=<html><body> \
RubyMine test runner requires ''minitest-reporters'' gem({0}) for integration with MiniTest framework.<br/> \
See <a href='http://www.jetbrains.com/ruby/webhelp/minitest.html'>minitest integration</a> for more information.\
See <a href='https://www.jetbrains.com/ruby/webhelp/minitest.html'>minitest integration</a> for more information.\
</body></html>
gems.inspection.gem.quick.fix.add.name=Add gem dependency to ''{0}'' gem
gems.inspection.gem.quick.fix.add.name.and.version=Add gem dependency to ''{0}'' gem, version {1}
@@ -19508,7 +19508,7 @@ gems.debugger.in.gemfile=<html><body> \
It looks like there is the 'debugger' gem in your Gemfile.\
This may cause some problems during debugging.<br/>\
Are you sure you want to continue?<br/>\
If you are not, check <a href="http://www.jetbrains.com/ruby/webhelp/debugging.html">help topic</a>.\
If you are not, check <a href="https://www.jetbrains.com/ruby/webhelp/debugging.html">help topic</a>.\
</body></html>
# gem command
plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackIntellisense.java
+1 -1
View File
@@ -26,7 +26,7 @@ import static com.intellij.openapi.editor.HighlighterColors.TEXT;
/**
* Auxiliary class for extracting data from YouTrack intellisense responses.
* See http://confluence.jetbrains.com/display/YTD5/Intellisense+for+issue+search for format details.
* See https://confluence.jetbrains.com/display/YTD5/Intellisense+for+issue+search for format details.
* <p/>
* It also provides two additional classes to represent tokens highlighting and
* available completion items from response: {@link com.intellij.tasks.youtrack.YouTrackIntellisense.HighlightRange}
plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class YouTrackRepositoryType extends BaseRepositoryType<YouTrackRepositor
@Nullable
@Override
public String getAdvertiser() {
return "<html>Not YouTrack customer yet? Get <a href='http://www.jetbrains.com/youtrack/download/get_youtrack.html?idea_integration'>YouTrack</a></html>";
return "<html>Not YouTrack customer yet? Get <a href='https://www.jetbrains.com/youtrack/download/get_youtrack.html?idea_integration'>YouTrack</a></html>";
}
@NotNull
plugins/xslt-debugger/src/META-INF/plugin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin version="2" url="http://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger">
<idea-plugin version="2" url="https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger">
<name>XSLT-Debugger</name>
<id>XSLT-Debugger</id>
python/edu/build/idea.nsi
+3 -3
View File
@@ -894,7 +894,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}" \
@@ -945,7 +945,7 @@ Function ConfirmDesktopShortcut
deletePythonFileInfo:
Delete "$TEMP\python.txt"
getPythonFileInfo:
inetc::get "http://www.jetbrains.com/updates/python.txt" "$TEMP\python.txt"
inetc::get "https://www.jetbrains.com/updates/python.txt" "$TEMP\python.txt"
${LineSum} "$TEMP\python.txt" $R0
IfErrors cantOpenFile
StrCmp $R0 ${PYTHON_VERSIONS} getPythonInfo
@@ -1318,6 +1318,6 @@ finish_uninstall:
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
python/edu/course-creator/resources/META-INF/plugin.xml
+2 -2
View File
@@ -10,9 +10,9 @@
<change-notes><![CDATA[
]]>
</change-notes>
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
<!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
<!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
on how to target different products -->
<!-- uncomment to enable plugin in all products
<depends>com.intellij.modules.lang</depends>
python/edu/learn-python/src/com/jetbrains/python/edu/StudyTaskManager.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class StudyTaskManager implements ProjectComponent, PersistentStateCompon
String content = "<html>If you'd like to learn" +
" more about PyCharm " +
"Educational Edition, " +
"click <a href=\"http://www.jetbrains.com/pycharm-educational/quickstart/\">here</a> to watch a tutorial</html>";
"click <a href=\"https://www.jetbrains.com/pycharm-educational/quickstart/\">here</a> to watch a tutorial</html>";
final Notification notification =
new Notification("Watch Tutorials!", "", content, NotificationType.INFORMATION, new UrlOpeningListener(true));
Notifications.Bus.notify(notification);
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyWatchTutorialAction.java
+1 -1
View File
@@ -12,6 +12,6 @@ public class StudyWatchTutorialAction extends DumbAwareAction {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
BrowserUtil.browse("http://www.jetbrains.com/pycharm-educational/quickstart/");
BrowserUtil.browse("https://www.jetbrains.com/pycharm-educational/quickstart/");
}
}
python/edu/resources/idea/PyCharmEduApplicationInfo.xml
+5 -5
View File
@@ -1,5 +1,5 @@
<component>
<company name="JetBrains s.r.o." url="http://www.jetbrains.com/?fromIDE"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
<version major="1" minor="0.1" eap="false"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<logo url="/pycharm_edu_logo.png" textcolor="5a8179" progressColor="ffaa16" progressY="230" progressTailIcon="/community_progress_tail.png"/>
@@ -11,13 +11,13 @@
<welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png" caption-url="PyCharmCoreWelcomeCaption.png" slogan-url="/developSlogan.png"/>
<third-party url="http://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
<third-party url="https://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
<update-urls logo-url="/Logo_welcomeScreen.png"
check="http://www.jetbrains.com/updates/updates.xml"
check="https://www.jetbrains.com/updates/updates.xml"
patches="http://download.jetbrains.com/python/"/>
<feedback eap-url="http://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"
release-url="http://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"
release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<help file="pycharm-eduhelp.jar" root="pycharm-edu"/>
</component>
python/helpers/python-skeletons/README.md
+1 -1
View File
@@ -231,7 +231,7 @@ where `<config directory>` is:
* Windows: `<User home>\.IntelliJIdeaXX\config`
Please send your PyCharm/IntelliJ-related bug reports and feature requests to
[PyCharm issue tracker](http://youtrack.jetbrains.com/issues/PY).
[PyCharm issue tracker](https://youtrack.jetbrains.com/issues/PY).
Feedback
python/pluginResources/META-INF/plugin.xml
+3 -3
View File
@@ -1,4 +1,4 @@
<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="http://confluence.jetbrains.com/display/PYH/">
<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
<!-- Components and extensions declared in this file work ONLY in Python plugin, not in standalone PyCharm.
Anything related to Python/Java integration must go in this file. -->
@@ -12,7 +12,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
<br>
<a href="http://blog.jetbrains.com/pycharm">PyCharm blog</a><br>
<a href="http://forum.jetbrains.com/forum/PyCharm">Discussion forum</a><br>
<a href="http://youtrack.jetbrains.com/issues/PY">Issue tracker</a><br>
<a href="https://youtrack.jetbrains.com/issues/PY">Issue tracker</a><br>
]]></description>
<!-- <PyCharm version> <Beta>? <Branch number>.<Build number> -->
@@ -20,7 +20,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
<depends>com.intellij.modules.java</depends>
<vendor url="http://www.jetbrains.com/pycharm/" logo="/com/jetbrains/python/python.png">JetBrains</vendor>
<vendor url="https://www.jetbrains.com/pycharm/">JetBrains</vendor>
<xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/python-plugin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
python/resources/idea/PyCharmCoreApplicationInfo.xml
+5 -5
View File
@@ -1,5 +1,5 @@
<component>
<company name="JetBrains s.r.o." url="http://www.jetbrains.com/?fromIDE"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
<version major="4" minor="0" eap="true"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<logo url="/pycharm_core_logo.png" textcolor="ffffff" progressColor="ffaa16" progressY="230" progressTailIcon="/community_progress_tail.png"/>
@@ -11,13 +11,13 @@
<welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png" caption-url="PyCharmCoreWelcomeCaption.png" slogan-url="/developSlogan.png"/>
<third-party url="http://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
<third-party url="https://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
<update-urls logo-url="/Logo_welcomeScreen.png"
check="http://www.jetbrains.com/updates/updates.xml"
check="https://www.jetbrains.com/updates/updates.xml"
patches="http://download.jetbrains.com/python/"/>
<feedback eap-url="http://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"
release-url="http://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"
release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<help file="pycharmhelp.jar" root="pycharm"/>
</component>
python/testSrc/com/jetbrains/env/python/dotNet/package-info.java
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/**
* IronPython tests. Install IronPython, .NET and add "iron" to "tags.txt" file. Check for more info: http://confluence.jetbrains.com/display/PYINT/Env+Tests
* IronPython tests. Install IronPython, .NET and add "iron" to "tags.txt" file. Check for more info: https://confluence.jetbrains.com/display/PYINT/Env+Tests
* @author Ilya.Kazakevich
*/
package com.jetbrains.env.python.dotNet;
resources/src/idea/TeamServerApplicationInfo.xml
+2 -2
View File
@@ -11,6 +11,6 @@
caption-url="/general/welcomeCaption.png"
slogan-url="/general/developSlogan.png"/>
<update-urls check="http://www.jetbrains.com/updates/update.xml" download="http://www.jetbrains.com/idea/download/"/>
<eap-update-urls check="http://www.jetbrains.com/updates/eap-update.xml" download="http://www.intellij.net/eap/products/idea/download.jsp"/>
<update-urls check="https://www.jetbrains.com/updates/update.xml" download="https://www.jetbrains.com/idea/download/"/>
<eap-update-urls check="https://www.jetbrains.com/updates/eap-update.xml" download="http://www.intellij.net/eap/products/idea/download.jsp"/>
</component>
spellchecker/testSrc/com/intellij/spellchecker/inspector/SplitterTest.java
+2 -2
View File
@@ -274,12 +274,12 @@ public class SplitterTest extends TestCase {
}
public void testUrl() {
String text = "http://www.jetbrains.com/idea";
String text = "https://www.jetbrains.com/idea";
correctListToCheck(PlainTextSplitter.getInstance(), text);
}
public void testUrlThenSpaces() {
String text = "http://www.jetbrains.com/idea asdasdasd sdfsdf";
String text = "https://www.jetbrains.com/idea asdasdasd sdfsdf";
correctListToCheck(PlainTextSplitter.getInstance(), text, "asdasdasd", "sdfsdf");
}
updater/testData/Readme.txt
+5 -5
View File
@@ -71,13 +71,13 @@ Uninstalling IntelliJ IDEA
Licensing & pricing
==========================
Licensing and pricing information can be found at http://www.jetbrains.com/idea/buy/index.html.
Licensing and pricing information can be found at https://www.jetbrains.com/idea/buy/index.html.
IntelliJ IDEA Overview
==========================
For general info and facts on IntelliJ IDEA, you can refer to IntelliJ IDEA Info Kit at
http://www.jetbrains.com/idea/documentation/product_info_kit.html.
https://www.jetbrains.com/idea/documentation/product_info_kit.html.
IDEA Development Package
@@ -102,7 +102,7 @@ IDEA Development Package
* StarTeam, Perforce, Subversion, Visual SourceSafe integration
* Tomcat, Weblogic, WebSphere, Geronimo, JBoss, GlassFish, JSR45 integration
Download page: http://www.jetbrains.com/idea/download/index.html
Download page: https://www.jetbrains.com/idea/download/index.html
Source code of additional open source plugins shipped with IntelliJ IDEA is available in the Subversion
repository at:
@@ -139,7 +139,7 @@ IntelliJ Community Site
Support
=======
For technical support and assistance, you may find necessary information at the Support page
(http://www.jetbrains.com/support/index.html) or contact us at support@jetbrains.com.
(https://www.jetbrains.com/support/index.html) or contact us at support@jetbrains.com.
Bug Reporting:
@@ -158,7 +158,7 @@ Contacting us:
=============
You are encouraged to visit our IntelliJ IDEA web site at http://www.jetbrains.com/idea/
You are encouraged to visit our IntelliJ IDEA web site at https://www.jetbrains.com/idea/
or to contact us via e-mail at feedback@jetbrains.com if you have any comments about
this release. In particular, we are very interested in any ease-of-use, user
interface suggestions that you may have. We will be posting regular updates