Skip to content

Commit 7af4f22

Browse files
committed
Remove runnable as causing write issues, seems that update of IntelliJ requires all writes to be done on UI thread or via "invokeLater" per write. With the current structure, this causes an issue writing maven dependencies (updating the pom.xml) as we need to edit the pom.xml twice.
Will need to consolidate writing options based on state to write once before reenabling async runnable.
1 parent dfa7c1b commit 7af4f22

File tree

1 file changed

+23
-44
lines changed
  • src/ServiceStackIDEA/src/main/java/net/servicestack/idea

1 file changed

+23
-44
lines changed

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddRef.java

Lines changed: 23 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ public void changedUpdate(DocumentEvent e) {
122122
}
123123

124124
public void warn() {
125-
if (nameTextField.getInputVerifier().verify(nameTextField) && addressUrlTextField.getInputVerifier().verify(addressUrlTextField)) {
126-
buttonOK.setEnabled(true);
127-
} else {
128-
buttonOK.setEnabled(false);
129-
}
125+
buttonOK.setEnabled(
126+
nameTextField.getInputVerifier().verify(nameTextField) &&
127+
addressUrlTextField.getInputVerifier().verify(addressUrlTextField)
128+
);
130129
}
131130
});
132131

@@ -147,27 +146,18 @@ public void changedUpdate(DocumentEvent e) {
147146
}
148147

149148
public void warn() {
150-
if (nameTextField.getInputVerifier().verify(nameTextField) && addressUrlTextField.getInputVerifier().verify(addressUrlTextField)) {
151-
buttonOK.setEnabled(true);
152-
} else {
153-
buttonOK.setEnabled(false);
154-
}
149+
buttonOK.setEnabled(
150+
nameTextField.getInputVerifier().verify(nameTextField) &&
151+
addressUrlTextField.getInputVerifier().verify(addressUrlTextField)
152+
);
155153
}
156154
});
157155

158-
buttonOK.addActionListener(new ActionListener() {
159-
public void actionPerformed(ActionEvent e) {
160-
processOK();
161-
}
162-
});
156+
buttonOK.addActionListener(e -> processOK());
163157

164158
packageBrowse.addActionListener(new BrowsePackageListener(packageBrowse, module.getProject(), "Browse packages"));
165159

166-
buttonCancel.addActionListener(new ActionListener() {
167-
public void actionPerformed(ActionEvent e) {
168-
onCancel();
169-
}
170-
});
160+
buttonCancel.addActionListener(e -> onCancel());
171161

172162
// call onCancel() when cross is clicked
173163
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -178,11 +168,7 @@ public void windowClosing(WindowEvent e) {
178168
});
179169

180170
// call onCancel() on ESCAPE
181-
contentPane.registerKeyboardAction(new ActionListener() {
182-
public void actionPerformed(ActionEvent e) {
183-
onCancel();
184-
}
185-
}, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
171+
contentPane.registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
186172
}
187173

188174
public void setSelectedPackage(@NotNull PsiPackage selectedPackage) {
@@ -241,24 +227,18 @@ private void processOK() {
241227
}
242228

243229

244-
Runnable r = new Runnable() {
245-
public void run() {
246-
try {
247-
onOK();
248-
} catch (Exception e1) {
249-
e1.printStackTrace();
250-
errorMessage = errorMessage != null ? errorMessage : "An error occurred adding reference - " + e1.getMessage();
251-
}
252-
if (errorMessage != null) {
253-
errorTextPane.setVisible(true);
254-
errorTextPane.setText(errorMessage);
255-
}
256-
buttonOK.setEnabled(true);
257-
buttonCancel.setEnabled(true);
258-
259-
}
260-
};
261-
SwingUtilities.invokeLater(r);
230+
try {
231+
onOK();
232+
} catch (Exception e1) {
233+
e1.printStackTrace();
234+
errorMessage = errorMessage != null ? errorMessage : "An error occurred adding reference - " + e1.getMessage();
235+
}
236+
if (errorMessage != null) {
237+
errorTextPane.setVisible(true);
238+
errorTextPane.setText(errorMessage);
239+
}
240+
buttonOK.setEnabled(true);
241+
buttonCancel.setEnabled(true);
262242
}
263243

264244
private void setPackageBrowseText(String packageName) {
@@ -375,7 +355,6 @@ private void onOK() {
375355
}
376356

377357
/**
378-
* @noinspection ALL
379358
*/
380359
public JComponent $$$getRootComponent$$$() {
381360
return contentPane;

0 commit comments

Comments
 (0)