ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

infobox: make threadsafe (#2632)

Browse Source 
* Update InfoBox.java

* Update InfoBoxManager.java

* Update InfoBoxManagerTest.java

* fix tests
This commit is contained in:
Kyle
2020-05-28 13:41:34 +01:00
committed by GitHub
parent daf14999e1
commit 62d3e58a55
3 changed files with 106 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBox.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.ui.overlay.infobox;
import java.awt.Color;
import java.awt.image.BufferedImage;
import javax.annotation.Nonnull;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@@ -33,6 +34,7 @@ import net.runelite.client.plugins.Plugin;
public abstract class InfoBox
{
@Nonnull
@Getter(AccessLevel.PACKAGE)
private final Plugin plugin;
@@ -52,7 +54,7 @@ public abstract class InfoBox
@Setter
private String tooltip;
public InfoBox(BufferedImage image, Plugin plugin)
public InfoBox(BufferedImage image, @Nonnull Plugin plugin)
{
this.plugin = plugin;
setImage(image);

41
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java
View File

@@ -27,10 +27,9 @@ package net.runelite.client.ui.overlay.infobox;
import com.google.common.collect.ComparisonChain;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.Objects;
import java.util.function.Predicate;
import javax.inject.Inject;
@@ -45,7 +44,7 @@ import net.runelite.client.util.AsyncBufferedImage;
@Slf4j
public class InfoBoxManager
{
private final List<InfoBox> infoBoxes = new ArrayList<>();
private final List<InfoBox> infoBoxes = new CopyOnWriteArrayList<>();
private final RuneLiteConfig runeLiteConfig;
@Inject
@@ -90,21 +89,19 @@ public class InfoBoxManager
}
}
public void removeInfoBox(InfoBox infoBox)
public synchronized void removeInfoBox(InfoBox infoBox)
{
if (infoBoxes.remove(infoBox))
{
log.debug("Removed InfoBox {}", infoBox);
refreshInfoBoxes();
}
}
public void removeIf(Predicate<InfoBox> filter)
public synchronized void removeIf(Predicate<InfoBox> filter)
{
if (infoBoxes.removeIf(filter))
{
log.debug("Removed InfoBoxes for filter {}", filter);
refreshInfoBoxes();
}
}
@@ -113,25 +110,9 @@ public class InfoBoxManager
return Collections.unmodifiableList(infoBoxes);
}
public void cull()
public synchronized void cull()
{
boolean culled = false;
for (Iterator<InfoBox> it = infoBoxes.iterator(); it.hasNext();)
{
InfoBox box = it.next();
if (box.cull())
{
log.debug("Culling InfoBox {}", box);
it.remove();
culled = true;
}
}
if (culled)
{
refreshInfoBoxes();
}
infoBoxes.removeIf(InfoBox::cull);
}
public void updateInfoBoxImage(final InfoBox infoBox)
@@ -167,16 +148,6 @@ public class InfoBoxManager
g.dispose();
resultImage = scaledImage;
}
infoBox.setScaledImage(resultImage);
}
private void refreshInfoBoxes()
{
infoBoxes.sort((b1, b2) -> ComparisonChain
.start()
.compare(b1.getPriority(), b2.getPriority())
.compare(b1.getPlugin().getName(), b2.getPlugin().getName())
.result());
}
}