Skip to content

Commit 0223bcb

Browse files
philwebbphilwebb
committed
Rename modules to refer to "IntelliJ IDEA"
Closes gh-216
1 parent 2873022 commit 0223bcb

26 files changed

+36
-36
lines changed

‎README.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ or use the https://dl.bintray.com/spring/javaformat-eclipse/[update site].
198198
=== IntelliJ IDEA
199199
The IntelliJ IDEA plugin provides custom formatter support for IntelliJ IDEA.
200200
The plugin is automatically activated whenever the Maven or Gradle plugins are discovered in a project build script.
201-
A Spring Java Format icon (image:spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/resources/spring-javaformat/formatOn.png[title="Icon"]) will also be displayed in the status bar to indicate the formatter is active.
201+
A Spring Java Format icon (image:spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/resources/spring-javaformat/formatOn.png[title="Icon"]) will also be displayed in the status bar to indicate the formatter is active.
202202
You can use the standard `code` -> `reformat code` action to format the code.
203203

204-
To install the plugin use the `spring-javaformat-intellij-plugin` jar file.
205-
You can download the latest version from https://repo.spring.io/release/io/spring/javaformat/spring-javaformat-intellij-plugin/{release-version}[repo.spring.io].
204+
To install the plugin use the `spring-javaformat-intellij-idea-plugin` jar file.
205+
You can download the latest version from https://repo.spring.io/release/io/spring/javaformat/spring-javaformat-intellij-idea-plugin/{release-version}[repo.spring.io].
206206

207207
=== About the conventions
208208
Most of the coding conventions and style comes from the Spring Framework and Spring Boot projects.

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
<module>spring-javaformat-maven</module>
582582
<module>spring-javaformat-gradle</module>
583583
<module>spring-javaformat-eclipse</module>
584-
<module>spring-javaformat-intellij</module>
584+
<module>spring-javaformat-intellij-idea</module>
585585
</modules>
586586
<profiles>
587587
<profile>

‎spring-javaformat-intellij/pom.xml renamed to ‎spring-javaformat-intellij-idea/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<artifactId>spring-javaformat-build</artifactId>
88
<version>0.0.26-SNAPSHOT</version>
99
</parent>
10-
<artifactId>spring-javaformat-intellij</artifactId>
10+
<artifactId>spring-javaformat-intellij-idea</artifactId>
1111
<packaging>pom</packaging>
1212
<name>Spring JavaFormat IntelliJ IDEA</name>
1313
<properties>
@@ -30,7 +30,7 @@
3030
</plugins>
3131
</build>
3232
<modules>
33-
<module>spring-javaformat-intellij-runtime</module>
34-
<module>spring-javaformat-intellij-plugin</module>
33+
<module>spring-javaformat-intellij-idea-runtime</module>
34+
<module>spring-javaformat-intellij-idea-plugin</module>
3535
</modules>
3636
</project>

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/pom.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
66
<groupId>io.spring.javaformat</groupId>
7-
<artifactId>spring-javaformat-intellij</artifactId>
7+
<artifactId>spring-javaformat-intellij-idea</artifactId>
88
<version>0.0.26-SNAPSHOT</version>
99
</parent>
10-
<artifactId>spring-javaformat-intellij-plugin</artifactId>
10+
<artifactId>spring-javaformat-intellij-idea-plugin</artifactId>
1111
<name>Spring JavaFormat IntelliJ IDEA Plugin</name>
1212
<properties>
1313
<main.basedir>${basedir}/../..</main.basedir>
@@ -34,79 +34,79 @@
3434
<!-- Provided -->
3535
<dependency>
3636
<groupId>io.spring.javaformat</groupId>
37-
<artifactId>spring-javaformat-intellij-runtime</artifactId>
37+
<artifactId>spring-javaformat-intellij-idea-runtime</artifactId>
3838
<version>${project.version}</version>
3939
<type>pom</type>
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>
43-
<groupId>io.spring.javaformat.intellij</groupId>
43+
<groupId>io.spring.javaformat.intellij.idea</groupId>
4444
<artifactId>extensions</artifactId>
4545
<version>${project.version}</version>
4646
<scope>provided</scope>
4747
</dependency>
4848
<dependency>
49-
<groupId>io.spring.javaformat.intellij</groupId>
49+
<groupId>io.spring.javaformat.intellij.idea</groupId>
5050
<artifactId>platform-api</artifactId>
5151
<version>${project.version}</version>
5252
<scope>provided</scope>
5353
</dependency>
5454
<dependency>
55-
<groupId>io.spring.javaformat.intellij</groupId>
55+
<groupId>io.spring.javaformat.intellij.idea</groupId>
5656
<artifactId>platform-impl</artifactId>
5757
<version>${project.version}</version>
5858
<scope>provided</scope>
5959
</dependency>
6060
<dependency>
61-
<groupId>io.spring.javaformat.intellij</groupId>
61+
<groupId>io.spring.javaformat.intellij.idea</groupId>
6262
<artifactId>platform-util-ui</artifactId>
6363
<version>${project.version}</version>
6464
<scope>provided</scope>
6565
</dependency>
6666
<dependency>
67-
<groupId>io.spring.javaformat.intellij</groupId>
67+
<groupId>io.spring.javaformat.intellij.idea</groupId>
6868
<artifactId>platform-service-container</artifactId>
6969
<version>${project.version}</version>
7070
<scope>provided</scope>
7171
</dependency>
7272
<dependency>
73-
<groupId>io.spring.javaformat.intellij</groupId>
73+
<groupId>io.spring.javaformat.intellij.idea</groupId>
7474
<artifactId>util</artifactId>
7575
<version>${project.version}</version>
7676
<scope>provided</scope>
7777
</dependency>
7878
<dependency>
79-
<groupId>io.spring.javaformat.intellij</groupId>
79+
<groupId>io.spring.javaformat.intellij.idea</groupId>
8080
<artifactId>idea</artifactId>
8181
<version>${project.version}</version>
8282
<scope>provided</scope>
8383
</dependency>
8484
<dependency>
85-
<groupId>io.spring.javaformat.intellij</groupId>
85+
<groupId>io.spring.javaformat.intellij.idea</groupId>
8686
<artifactId>maven</artifactId>
8787
<version>${project.version}</version>
8888
<scope>provided</scope>
8989
</dependency>
9090
<dependency>
91-
<groupId>io.spring.javaformat.intellij</groupId>
91+
<groupId>io.spring.javaformat.intellij.idea</groupId>
9292
<artifactId>maven-server-api</artifactId>
9393
<version>${project.version}</version>
9494
<scope>provided</scope>
9595
</dependency>
9696
<dependency>
97-
<groupId>io.spring.javaformat.intellij</groupId>
97+
<groupId>io.spring.javaformat.intellij.idea</groupId>
9898
<artifactId>gradle</artifactId>
9999
<version>${project.version}</version>
100100
<scope>provided</scope>
101101
</dependency>
102102
<dependency>
103-
<groupId>io.spring.javaformat.intellij</groupId>
103+
<groupId>io.spring.javaformat.intellij.idea</groupId>
104104
<artifactId>gradle-tooling-extension-api</artifactId>
105105
<version>${project.version}</version>
106106
<scope>provided</scope>
107107
</dependency>
108108
<dependency>
109-
<groupId>io.spring.javaformat.intellij</groupId>
109+
<groupId>io.spring.javaformat.intellij.idea</groupId>
110110
<artifactId>gradle-tooling-extension-impl</artifactId>
111111
<version>${project.version}</version>
112112
<scope>provided</scope>

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormat.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormat.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormatStartupActivity.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormatStartupActivity.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/StatusIndicator.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/StatusIndicator.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/DelegatingCodeStyleManager.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/DelegatingCodeStyleManager.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/EclipseDocumentAdapter.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/EclipseDocumentAdapter.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/EclipseRegionAdapter.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/EclipseRegionAdapter.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/SpringCodeStyleManager.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/SpringCodeStyleManager.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/SpringReformatter.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/SpringReformatter.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/FileMonitor.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/FileMonitor.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/GradleMonitor.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/GradleMonitor.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/MavenMonitor.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/MavenMonitor.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Monitor.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Monitor.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Monitors.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Monitors.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Trigger.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Trigger.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/resources/META-INF/plugin.xml renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/resources/META-INF/plugin.xml

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/resources/spring-javaformat/formatOn.png renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/resources/spring-javaformat/formatOn.png

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/DelegatingCodeStyleManagerTests.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/DelegatingCodeStyleManagerTests.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/EclipseDocumentAdapterTests.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/EclipseDocumentAdapterTests.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/EclipseRegionAdapterTests.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/EclipseRegionAdapterTests.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/SpringCodeStyleManagerTests.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/SpringCodeStyleManagerTests.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/SpringReformatterTests.java renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/test/java/io/spring/format/formatter/intellij/codestyle/SpringReformatterTests.java

File renamed without changes.

‎spring-javaformat-intellij/spring-javaformat-intellij-runtime/pom.xml renamed to ‎spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-runtime/pom.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>io.spring.javaformat</groupId>
8-
<artifactId>spring-javaformat-intellij</artifactId>
8+
<artifactId>spring-javaformat-intellij-idea</artifactId>
99
<version>0.0.26-SNAPSHOT</version>
1010
</parent>
11-
<artifactId>spring-javaformat-intellij-runtime</artifactId>
11+
<artifactId>spring-javaformat-intellij-idea-runtime</artifactId>
1212
<packaging>pom</packaging>
1313
<name>Spring JavaFormat IntelliJ IDEA Runtime</name>
1414
<properties>
@@ -152,7 +152,7 @@
152152
<configuration>
153153
<file>${project.build.directory}/intellij/platform-api.jar</file>
154154
<sources>${project.build.directory}/intellij-source/platform-api-sources.zip</sources>
155-
<groupId>io.spring.javaformat.intellij</groupId>
155+
<groupId>io.spring.javaformat.intellij.idea</groupId>
156156
<artifactId>platform-api</artifactId>
157157
<version>${project.version}</version>
158158
<packaging>jar</packaging>
@@ -169,7 +169,7 @@
169169
<configuration>
170170
<file>${project.build.directory}/intellij/platform-impl.jar</file>
171171
<sources>${project.build.directory}/intellij-source/platform-impl-sources.zip</sources>
172-
<groupId>io.spring.javaformat.intellij</groupId>
172+
<groupId>io.spring.javaformat.intellij.idea</groupId>
173173
<artifactId>platform-impl</artifactId>
174174
<version>${project.version}</version>
175175
<packaging>jar</packaging>
@@ -186,7 +186,7 @@
186186
<configuration>
187187
<file>${project.build.directory}/intellij/util.jar</file>
188188
<sources>${project.build.directory}/intellij-source/util-sources.zip</sources>
189-
<groupId>io.spring.javaformat.intellij</groupId>
189+
<groupId>io.spring.javaformat.intellij.idea</groupId>
190190
<artifactId>util</artifactId>
191191
<version>${project.version}</version>
192192
<packaging>jar</packaging>
@@ -203,7 +203,7 @@
203203
<configuration>
204204
<file>${project.build.directory}/intellij/platform-util-ui.jar</file>
205205
<sources>${project.build.directory}/intellij-source/platform-util-ui-sources.zip</sources>
206-
<groupId>io.spring.javaformat.intellij</groupId>
206+
<groupId>io.spring.javaformat.intellij.idea</groupId>
207207
<artifactId>platform-util-ui</artifactId>
208208
<version>${project.version}</version>
209209
<packaging>jar</packaging>
@@ -220,7 +220,7 @@
220220
<configuration>
221221
<file>${project.build.directory}/intellij/extensions.jar</file>
222222
<sources>${project.build.directory}/intellij-source/extensions-sources.zip</sources>
223-
<groupId>io.spring.javaformat.intellij</groupId>
223+
<groupId>io.spring.javaformat.intellij.idea</groupId>
224224
<artifactId>extensions</artifactId>
225225
<version>${project.version}</version>
226226
<packaging>jar</packaging>
@@ -237,7 +237,7 @@
237237
<configuration>
238238
<file>${project.build.directory}/intellij/platform-serviceContainer.jar</file>
239239
<sources>${project.build.directory}/intellij-source/platform-service-container-sources.zip</sources>
240-
<groupId>io.spring.javaformat.intellij</groupId>
240+
<groupId>io.spring.javaformat.intellij.idea</groupId>
241241
<artifactId>platform-service-container</artifactId>
242242
<version>${project.version}</version>
243243
<packaging>jar</packaging>
@@ -253,7 +253,7 @@
253253
</goals>
254254
<configuration>
255255
<file>${project.build.directory}/intellij/idea.jar</file>
256-
<groupId>io.spring.javaformat.intellij</groupId>
256+
<groupId>io.spring.javaformat.intellij.idea</groupId>
257257
<artifactId>idea</artifactId>
258258
<version>${project.version}</version>
259259
<packaging>jar</packaging>
@@ -270,7 +270,7 @@
270270
<configuration>
271271
<file>${project.build.directory}/intellij/maven.jar</file>
272272
<sources>${project.build.directory}/intellij-source/maven-sources.zip</sources>
273-
<groupId>io.spring.javaformat.intellij</groupId>
273+
<groupId>io.spring.javaformat.intellij.idea</groupId>
274274
<artifactId>maven</artifactId>
275275
<version>${project.version}</version>
276276
<packaging>jar</packaging>
@@ -286,7 +286,7 @@
286286
</goals>
287287
<configuration>
288288
<file>${project.build.directory}/intellij/maven-server-api.jar</file>
289-
<groupId>io.spring.javaformat.intellij</groupId>
289+
<groupId>io.spring.javaformat.intellij.idea</groupId>
290290
<artifactId>maven-server-api</artifactId>
291291
<version>${project.version}</version>
292292
<packaging>jar</packaging>
@@ -303,7 +303,7 @@
303303
<configuration>
304304
<file>${project.build.directory}/intellij/gradle-common.jar</file>
305305
<sources>${project.build.directory}/intellij-source/gradle-sources.zip</sources>
306-
<groupId>io.spring.javaformat.intellij</groupId>
306+
<groupId>io.spring.javaformat.intellij.idea</groupId>
307307
<artifactId>gradle</artifactId>
308308
<version>${project.version}</version>
309309
<packaging>jar</packaging>
@@ -320,7 +320,7 @@
320320
<configuration>
321321
<file>${project.build.directory}/intellij/gradle-tooling-extension-api.jar</file>
322322
<sources>${project.build.directory}/intellij-source/gradle-tooling-extension-api-sources.zip</sources>
323-
<groupId>io.spring.javaformat.intellij</groupId>
323+
<groupId>io.spring.javaformat.intellij.idea</groupId>
324324
<artifactId>gradle-tooling-extension-api</artifactId>
325325
<version>${project.version}</version>
326326
<packaging>jar</packaging>
@@ -337,7 +337,7 @@
337337
<configuration>
338338
<file>${project.build.directory}/intellij/gradle-tooling-extension-impl.jar</file>
339339
<sources>${project.build.directory}/intellij-source/gradle-tooling-extension-impl-sources.zip</sources>
340-
<groupId>io.spring.javaformat.intellij</groupId>
340+
<groupId>io.spring.javaformat.intellij.idea</groupId>
341341
<artifactId>gradle-tooling-extension-impl</artifactId>
342342
<version>${project.version}</version>
343343
<packaging>jar</packaging>

0 commit comments

Comments
 (0)