-Sort wait queue fix
This commit is contained in:
tonikelope 2019-10-21 03:23:42 +02:00
parent e763c844a7
commit f99ee8ba9c
7 changed files with 17 additions and 44 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId>
<version>6.71</version>
<version>6.72</version>
<packaging>jar</packaging>
<dependencies>
<dependency>

View File

@ -3,7 +3,6 @@ package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.DBTools.*;
import static com.tonikelope.megabasterd.MainPanel.*;
import static com.tonikelope.megabasterd.MiscTools.*;
import java.awt.Component;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
@ -118,19 +117,6 @@ public class DownloadManager extends TransferenceManager {
getTransference_waitstart_queue().addAll(aux);
getTransference_waitstart_queue().forEach((t1) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
});
});
getTransference_finished_queue().forEach((t2) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) t2.getView());
getScroll_panel().add((Component) t2.getView());
});
});
}
} else {

View File

@ -53,7 +53,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
public static final String VERSION = "6.71";
public static final String VERSION = "6.72";
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
public static final int STREAMER_PORT = 1337;

View File

@ -413,7 +413,6 @@ public final class MainPanelView extends javax.swing.JFrame {
jTabbedPane1.setTitleAt(1, LabelTranslatorSingleton.getInstance().translate("Uploads"));
jTabbedPane1.setDropTarget(new DropTarget() {
//Thanks to -> https://stackoverflow.com/users/6286694/abika
public boolean canImport(DataFlavor[] flavors) {
for (DataFlavor flavor : flavors) {
if (flavor.isFlavorJavaFileListType()) {

View File

@ -570,23 +570,25 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
}
}
synchronized (getQueue_sort_lock()) {
if (!isPreprocessing_transferences() && !isProvisioning_transferences()) {
sortTransferenceWaitStartQueue();
getTransference_waitstart_queue().forEach((up) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) up.getView());
getScroll_panel().add((Component) up.getView());
});
sortTransferenceWaitStartQueue();
getTransference_waitstart_queue().forEach((up) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) up.getView());
getScroll_panel().add((Component) up.getView());
});
getTransference_finished_queue().forEach((up) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) up.getView());
getScroll_panel().add((Component) up.getView());
});
});
getTransference_finished_queue().forEach((up) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) up.getView());
getScroll_panel().add((Component) up.getView());
});
}
});
}
_frozen = false;
setProvisioning_transferences(false);
secureNotify();

View File

@ -1,7 +1,6 @@
package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.MiscTools.*;
import java.awt.Component;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
@ -54,19 +53,6 @@ public class UploadManager extends TransferenceManager {
getTransference_waitstart_queue().addAll(aux);
getTransference_waitstart_queue().forEach((t1) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) t1.getView());
getScroll_panel().add((Component) t1.getView());
});
});
getTransference_finished_queue().forEach((t2) -> {
swingInvoke(() -> {
getScroll_panel().remove((Component) t2.getView());
getScroll_panel().add((Component) t2.getView());
});
});
}
} else {
getTransference_waitstart_queue().add(upload);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 KiB

After

Width:  |  Height:  |  Size: 192 KiB