Skip to content

Commit 88b7c50

Browse files
committed
Upgrade to IntelliJ IDEA 2020.3
Closes gh-227
1 parent 62c0c40 commit 88b7c50

File tree

3 files changed

+11
-30
lines changed
  • spring-javaformat-intellij

3 files changed

+11
-30
lines changed

spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<name>Spring JavaFormat IntelliJ IDEA Plugin</name>
1212
<properties>
1313
<main.basedir>${basedir}/../..</main.basedir>
14+
<java.version>11</java.version>
1415
</properties>
1516
<dependencies>
1617
<!-- Compile -->

spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/StatusIndicator.java

+7-27
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
package io.spring.format.formatter.intellij;
1818

1919
import java.awt.event.MouseEvent;
20+
import java.util.concurrent.TimeUnit;
2021

2122
import javax.swing.Icon;
2223

2324
import com.intellij.openapi.application.ApplicationManager;
2425
import com.intellij.openapi.project.Project;
2526
import com.intellij.openapi.util.IconLoader;
26-
import com.intellij.openapi.wm.IdeFrame;
2727
import com.intellij.openapi.wm.StatusBar;
2828
import com.intellij.openapi.wm.StatusBarWidget;
2929
import com.intellij.openapi.wm.WindowManager;
30-
import com.intellij.openapi.wm.WindowManagerListener;
3130
import com.intellij.util.Consumer;
31+
import com.intellij.util.concurrency.AppExecutorUtil;
3232

3333
import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
3434

@@ -51,7 +51,7 @@ public void update(State state) {
5151
WindowManager windowManager = WindowManager.getInstance();
5252
final StatusBar statusBar = windowManager.getStatusBar(this.project);
5353
if (statusBar == null) {
54-
windowManager.addListener(new UpdateOnFrameCreateListener(state));
54+
AppExecutorUtil.getAppScheduledExecutorService().schedule(() -> retryUpdate(state), 1, TimeUnit.SECONDS);
5555
return;
5656
}
5757
if (state == State.ACTIVE) {
@@ -62,6 +62,10 @@ public void update(State state) {
6262
}
6363
}
6464

65+
private void retryUpdate(State state) {
66+
ApplicationManager.getApplication().invokeLater(() -> update(state));
67+
}
68+
6569
private void show(StatusBar statusBar) {
6670
if (this.widget == null) {
6771
this.widget = new Widget();
@@ -76,30 +80,6 @@ private void hide(final StatusBar statusBar) {
7680
}
7781
}
7882

79-
/**
80-
* {@link WindowManagerListener} used to defer setting the status if the IDE frame
81-
* isn't available.
82-
*/
83-
private class UpdateOnFrameCreateListener implements WindowManagerListener {
84-
85-
private final State state;
86-
87-
UpdateOnFrameCreateListener(State state) {
88-
this.state = state;
89-
}
90-
91-
@Override
92-
public void frameCreated(IdeFrame frame) {
93-
WindowManager.getInstance().removeListener(this);
94-
ApplicationManager.getApplication().invokeLater(() -> update(this.state));
95-
}
96-
97-
@Override
98-
public void beforeFrameReleased(IdeFrame frame) {
99-
}
100-
101-
}
102-
10383
/**
10484
* The {@link StatusBarWidget} component for the status.
10585
*/

spring-javaformat-intellij/spring-javaformat-intellij-runtime/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<name>Spring JavaFormat IntelliJ IDEA Runtime</name>
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
16-
<intellij.binary>https://download.jetbrains.com/idea/ideaIC-2020.2.tar.gz</intellij.binary>
17-
<intellij.source>https://github.com/JetBrains/intellij-community/archive/idea/202.6397.94.zip</intellij.source>
18-
<intellij.root>idea-IC-202.6397.94</intellij.root>
16+
<intellij.binary>https://download.jetbrains.com/idea/ideaIC-2020.3.tar.gz</intellij.binary>
17+
<intellij.source>https://github.com/JetBrains/intellij-community/archive/idea/203.5981.155.zip</intellij.source>
18+
<intellij.root>idea-IC-203.5981.155</intellij.root>
1919
</properties>
2020
<build>
2121
<plugins>

0 commit comments

Comments
 (0)