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

don't create swing components in other threads, leads to deadlock

Browse Source
This commit is contained in:
peter
2011-04-06 19:21:15 +02:00
parent 8080667544
commit 5435a801c1
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
+16 -11
View File
@@ -34,18 +34,18 @@ import java.util.concurrent.CopyOnWriteArrayList;
* @author peter
*/
public class Advertiser {
private final List<JLabel> myTexts = new CopyOnWriteArrayList<JLabel>();
private final List<String> myTexts = new CopyOnWriteArrayList<String>();
private final JPanel myComponent = new JPanel(new GridBagLayout()) {
@Override
public Dimension getPreferredSize() {
List<JLabel> texts = getTexts();
List<String> texts = getTexts();
if (texts.isEmpty()) {
return new Dimension(-1, 0);
}
int maxSize = 0;
for (JLabel label : texts) {
maxSize = Math.max(maxSize, label.getPreferredSize().width);
for (String label : texts) {
maxSize = Math.max(maxSize, createLabel(label).getPreferredSize().width);
}
Dimension sup = super.getPreferredSize();
@@ -78,18 +78,25 @@ public class Advertiser {
}
private void updateAdvertisements() {
List<JLabel> texts = getTexts();
List<String> texts = getTexts();
myNextLabel.setVisible(texts.size() > 1);
myTextPanel.removeAll();
if (!texts.isEmpty()) {
myTextPanel.add(texts.get(myCurrentItem % texts.size()));
String text = texts.get(myCurrentItem % texts.size());
myTextPanel.add(createLabel(text));
}
myComponent.revalidate();
myComponent.repaint();
}
private synchronized List<JLabel> getTexts() {
return new ArrayList<JLabel>(myTexts);
private static JLabel createLabel(String text) {
JLabel label = new JLabel(text + " ");
label.setFont(adFont());
return label;
}
private synchronized List<String> getTexts() {
return new ArrayList<String>(myTexts);
}
public void showRandomText() {
@@ -110,9 +117,7 @@ public class Advertiser {
}
public synchronized void addAdvertisement(@NotNull String text) {
JLabel label = new JLabel(text + " ");
label.setFont(adFont());
myTexts.add(label);
myTexts.add(text);
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {