Skip to content

Commit ef7b199

Browse files
author
updating-bot
committed
mirroring bot - 2024/12/05
1 parent 7a16e5e commit ef7b199

File tree

7 files changed

+307
-325
lines changed

7 files changed

+307
-325
lines changed

‎svn_trunk/src/jd/plugins/PluginForHost.java‎

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -2532,112 +2532,113 @@ public void extendLinkgrabberContextMenu(JComponent parent, final PluginView<Cra
25322532
parent.add(changeURLMenuItem);
25332533
}
25342534
}
2535-
if (allPvs.size() == 1) {
2536-
final JMenu setVariants = new JMenu(_GUI.T.PluginForHost_extendLinkgrabberContextMenu_generic_convert());
2537-
setVariants.setIcon(DomainInfo.getInstance(getHost()).getFavIcon());
2538-
setVariants.setEnabled(false);
2539-
final JMenu addVariants = new JMenu("Add converted variant...");
2540-
addVariants.setIcon(new BadgeIcon(DomainInfo.getInstance(getHost()), new AbstractIcon(IconKey.ICON_ADD, 16), 4, 4));
2541-
addVariants.setEnabled(false);
2542-
// setVariants.setVisible(false);
2543-
// addVariants.setVisible(false);
2544-
new Thread("Collect Variants") {
2545-
public void run() {
2546-
try {
2547-
Thread.sleep(2000);
2548-
} catch (InterruptedException e1) {
2549-
e1.printStackTrace();
2535+
if (allPvs.size() != 1) {
2536+
return;
2537+
}
2538+
final JMenu setVariants = new JMenu(_GUI.T.PluginForHost_extendLinkgrabberContextMenu_generic_convert());
2539+
setVariants.setIcon(DomainInfo.getInstance(getHost()).getFavIcon());
2540+
setVariants.setEnabled(false);
2541+
final JMenu addVariants = new JMenu("Add converted variant...");
2542+
addVariants.setIcon(new BadgeIcon(DomainInfo.getInstance(getHost()), new AbstractIcon(IconKey.ICON_ADD, 16), 4, 4));
2543+
addVariants.setEnabled(false);
2544+
// setVariants.setVisible(false);
2545+
// addVariants.setVisible(false);
2546+
new Thread("Collect Variants") {
2547+
public void run() {
2548+
try {
2549+
Thread.sleep(2000);
2550+
} catch (InterruptedException e1) {
2551+
e1.printStackTrace();
2552+
}
2553+
HashSet<GenericVariants> map = new HashSet<GenericVariants>();
2554+
final ArrayList<GenericVariants> list = new ArrayList<GenericVariants>();
2555+
for (CrawledLink cl : pv.getChildren()) {
2556+
if (cl.getDownloadLink() == null || !cl.getDownloadLink().getBooleanProperty("GENERIC_VARIANTS", false) || !cl.getDownloadLink().hasVariantSupport()) {
2557+
continue;
25502558
}
2551-
HashSet<GenericVariants> map = new HashSet<GenericVariants>();
2552-
final ArrayList<GenericVariants> list = new ArrayList<GenericVariants>();
2553-
for (CrawledLink cl : pv.getChildren()) {
2554-
if (cl.getDownloadLink() == null || !cl.getDownloadLink().getBooleanProperty("GENERIC_VARIANTS", false) || !cl.getDownloadLink().hasVariantSupport()) {
2555-
continue;
2556-
}
2557-
List<GenericVariants> v = cl.getDownloadLink().getVariants(GenericVariants.class);
2558-
if (v != null) {
2559-
for (LinkVariant lv : v) {
2560-
if (lv instanceof GenericVariants) {
2561-
if (map.add((GenericVariants) lv)) {
2562-
list.add((GenericVariants) lv);
2563-
}
2559+
List<GenericVariants> v = cl.getDownloadLink().getVariants(GenericVariants.class);
2560+
if (v != null) {
2561+
for (LinkVariant lv : v) {
2562+
if (lv instanceof GenericVariants) {
2563+
if (map.add((GenericVariants) lv)) {
2564+
list.add((GenericVariants) lv);
25642565
}
25652566
}
25662567
}
25672568
}
2568-
if (list.size() == 0) {
2569-
return;
2569+
}
2570+
if (list.size() == 0) {
2571+
return;
2572+
}
2573+
Collections.sort(list, new Comparator<GenericVariants>() {
2574+
@Override
2575+
public int compare(GenericVariants o1, GenericVariants o2) {
2576+
return o1.name().compareTo(o2.name());
25702577
}
2571-
Collections.sort(list, new Comparator<GenericVariants>() {
2572-
@Override
2573-
public int compare(GenericVariants o1, GenericVariants o2) {
2574-
return o1.name().compareTo(o2.name());
2575-
}
2576-
});
2577-
new EDTRunner() {
2578-
@Override
2579-
protected void runInEDT() {
2580-
setVariants.setEnabled(true);
2581-
addVariants.setEnabled(true);
2582-
setVariants.setVisible(true);
2583-
addVariants.setVisible(true);
2584-
for (final GenericVariants gv : list) {
2585-
setVariants.add(new JMenuItem(new BasicAction() {
2586-
{
2587-
setName(gv._getName(link));
2588-
}
2578+
});
2579+
new EDTRunner() {
2580+
@Override
2581+
protected void runInEDT() {
2582+
setVariants.setEnabled(true);
2583+
addVariants.setEnabled(true);
2584+
setVariants.setVisible(true);
2585+
addVariants.setVisible(true);
2586+
for (final GenericVariants gv : list) {
2587+
setVariants.add(new JMenuItem(new BasicAction() {
2588+
{
2589+
setName(gv._getName(link));
2590+
}
25892591

2590-
@Override
2591-
public void actionPerformed(ActionEvent e) {
2592-
java.util.List<CheckableLink> checkableLinks = new ArrayList<CheckableLink>(1);
2593-
for (CrawledLink cl : pv.getChildren()) {
2594-
// List<GenericVariants> variants = new ArrayList<GenericVariants>();
2595-
for (LinkVariant v : getVariantsByLink(cl.getDownloadLink())) {
2596-
if (v.equals(gv)) {
2597-
LinkCollector.getInstance().setActiveVariantForLink(cl, gv);
2598-
checkableLinks.add(cl);
2599-
break;
2600-
}
2592+
@Override
2593+
public void actionPerformed(ActionEvent e) {
2594+
java.util.List<CheckableLink> checkableLinks = new ArrayList<CheckableLink>(1);
2595+
for (CrawledLink cl : pv.getChildren()) {
2596+
// List<GenericVariants> variants = new ArrayList<GenericVariants>();
2597+
for (LinkVariant v : getVariantsByLink(cl.getDownloadLink())) {
2598+
if (v.equals(gv)) {
2599+
LinkCollector.getInstance().setActiveVariantForLink(cl, gv);
2600+
checkableLinks.add(cl);
2601+
break;
26012602
}
26022603
}
2603-
LinkChecker<CheckableLink> linkChecker = new LinkChecker<CheckableLink>(true);
2604-
linkChecker.check(checkableLinks);
2605-
}
2606-
}));
2607-
addVariants.add(new JMenuItem(new BasicAction() {
2608-
{
2609-
setName(gv._getName(link));
26102604
}
2605+
LinkChecker<CheckableLink> linkChecker = new LinkChecker<CheckableLink>(true);
2606+
linkChecker.check(checkableLinks);
2607+
}
2608+
}));
2609+
addVariants.add(new JMenuItem(new BasicAction() {
2610+
{
2611+
setName(gv._getName(link));
2612+
}
26112613

2612-
@Override
2613-
public void actionPerformed(ActionEvent e) {
2614-
java.util.List<CheckableLink> checkableLinks = new ArrayList<CheckableLink>(1);
2615-
for (CrawledLink cl : pv.getChildren()) {
2616-
List<GenericVariants> variants = new ArrayList<GenericVariants>();
2617-
for (LinkVariant v : getVariantsByLink(cl.getDownloadLink())) {
2618-
if (v.equals(gv)) {
2619-
CrawledLink newLink = LinkCollector.getInstance().addAdditional(cl, gv);
2620-
if (newLink != null) {
2621-
checkableLinks.add(newLink);
2622-
} else {
2623-
Toolkit.getDefaultToolkit().beep();
2624-
}
2625-
break;
2614+
@Override
2615+
public void actionPerformed(ActionEvent e) {
2616+
java.util.List<CheckableLink> checkableLinks = new ArrayList<CheckableLink>(1);
2617+
for (CrawledLink cl : pv.getChildren()) {
2618+
List<GenericVariants> variants = new ArrayList<GenericVariants>();
2619+
for (LinkVariant v : getVariantsByLink(cl.getDownloadLink())) {
2620+
if (v.equals(gv)) {
2621+
CrawledLink newLink = LinkCollector.getInstance().addAdditional(cl, gv);
2622+
if (newLink != null) {
2623+
checkableLinks.add(newLink);
2624+
} else {
2625+
Toolkit.getDefaultToolkit().beep();
26262626
}
2627+
break;
26272628
}
26282629
}
2629-
LinkChecker<CheckableLink> linkChecker = new LinkChecker<CheckableLink>(true);
2630-
linkChecker.check(checkableLinks);
26312630
}
2632-
}));
2633-
}
2631+
LinkChecker<CheckableLink> linkChecker = new LinkChecker<CheckableLink>(true);
2632+
linkChecker.check(checkableLinks);
2633+
}
2634+
}));
26342635
}
2635-
};
2636+
}
26362637
};
2637-
}.start();
2638-
parent.add(setVariants);
2639-
parent.add(addVariants);
2640-
}
2638+
};
2639+
}.start();
2640+
parent.add(setVariants);
2641+
parent.add(addVariants);
26412642
}
26422643

26432644
public void extendDownloadsTableContextMenu(JComponent parent, PluginView<DownloadLink> pv, Collection<PluginView<DownloadLink>> views) {
@@ -3308,8 +3309,7 @@ public String getStringValue(final MultiHostHost mhost) {
33083309
if (mhost.getUnavailableTimeMillis() > 0) {
33093310
return mhost.getUnavailableStatusText();
33103311
} else if (!mhost.isUnlimitedLinks() && mhost.getLinksLeft() <= 0) {
3311-
// TODO: Add translation
3312-
return "No links left";
3312+
return _GUI.T.account_error_no_links_left();
33133313
} else if (!mhost.isUnlimitedTraffic() && mhost.getTrafficLeft() <= 0) {
33143314
return _GUI.T.account_error_no_traffic_left();
33153315
} else if (text != null) {

0 commit comments

Comments
 (0)