From b384f0360ce6c1d36e9965519cf82bd3aaec4a10 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 12 Jun 2015 17:08:50 +0200 Subject: [PATCH] Use proper product name for Intellij IDEA --- CONTRIBUTING.adoc | 4 ++-- spring-boot-docs/src/main/asciidoc/howto.adoc | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 46e496766c..3a4a3b2068 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -23,8 +23,8 @@ added after the original pull request but before a merge. * Use the Spring Framework code format conventions. If you use Eclipse and you follow the ``Importing into eclipse'' instructions below you should get project specific formatting automatically. You can also import formatter settings using the - `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ, you can - use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] + `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ IDEA, you + can use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 1bca76648d..c066a9f1c6 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1900,19 +1900,19 @@ Spring Boot plugin declaration, e.g. ---- -This normally works pretty well with Eclipse and IntelliJ as long as they have their +This normally works pretty well with Eclipse and IntelliJ IDEA as long as they have their build configuration aligned with the Maven defaults (Eclipse m2e does this out of the box). -[[howto-reload-springloaded-gradle-and-intellij]] -==== Configuring Spring Loaded for use with Gradle and IntelliJ +[[howto-reload-springloaded-gradle-and-intellij-idea]] +==== Configuring Spring Loaded for use with Gradle and IntelliJ IDEA You need to jump through a few hoops if you want to use Spring Loaded in combination with -Gradle and IntelliJ. By default, IntelliJ will compile classes into a different location -than Gradle, causing Spring Loaded monitoring to fail. +Gradle and IntelliJ IDEA. By default, IntelliJ IDEA will compile classes into a different +location than Gradle, causing Spring Loaded monitoring to fail. -To configure IntelliJ correctly you can use the `idea` Gradle plugin: +To configure IntelliJ IDEA correctly you can use the `idea` Gradle plugin: [source,groovy,indent=0,subs="verbatim,attributes"] ---- @@ -1937,10 +1937,10 @@ To configure IntelliJ correctly you can use the `idea` Gradle plugin: ---- -NOTE: IntelliJ must be configured to use the same Java version as the command line Gradle -task and `springloaded` *must* be included as a `buildscript` dependency. +NOTE: IntelliJ IDEA must be configured to use the same Java version as the command line +Gradle task and `springloaded` *must* be included as a `buildscript` dependency. -You can also additionally enable '`Make Project Automatically`' inside Intellij to +You can also additionally enable '`Make Project Automatically`' inside Intellij IDEA to automatically compile your code whenever a file is saved.