JDownloader2/jdownloader
1
0
Fork 0
mirror of https://github.com/mirror/jdownloader.git synced 2024-11-23 03:59:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@48228 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Browse Source 
Former-commit-id: 8a6c83ace64a7370068c33336217fab8677e8e58
This commit is contained in:
coalado 2023-08-31 10:25:31 +00:00
parent e8a1ea1f9f
commit c2751b78ca
17 changed files with 91 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -57,7 +57,6 @@
<classpathentry kind="lib" path="ressourcen/libs/UPNP/seamless-http.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/UPNP/seamless-util.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/UPNP/seamless-xml.jar"/>
<classpathentry kind="lib" path="/AppWorkUtils/libs/proxyVole.jar" sourcepath="/ProxyVole"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/syntheticaAluOxide.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/syntheticaBlueLight.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/syntheticaClassy.jar"/>
@ -78,5 +77,6 @@
<classpathentry kind="lib" path="ressourcen/libs/bctls-jdk15on.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/flatlaf.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/bcutil-jdk15on.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/proxyVole.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
ressourcen/libs/antlr-runtime.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.antlr/antlr-runtime",
"files":["antlr-runtime.jar"],
"installedVersion":"3.4",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"BSD",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/bcpkix-jdk15on.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.bouncycastle/bcpkix-jdk15to18",
"files":["bcpkix-jdk15on.jar"],
"installedVersion":"1.76",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"\n <license>\n <name>Bouncy Castle Licence</name>\n <url>http://www.bouncycastle.org/licence.html</url>\n <distribution>repo</distribution>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/bcprov-jdk15on.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.bouncycastle/bcprov-jdk15to18",
"files":["bcprov-jdk15on.jar"],
"installedVersion":"1.76",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"\n <license>\n <name>Bouncy Castle Licence</name>\n <url>http://www.bouncycastle.org/licence.html</url>\n <distribution>repo</distribution>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/bctls-jdk15on.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.bouncycastle/bctls-jdk15to18",
"files":["bctls-jdk15on.jar"],
"installedVersion":"1.76",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"\n <license>\n <name>Bouncy Castle Licence</name>\n <url>http://www.bouncycastle.org/licence.html</url>\n <distribution>repo</distribution>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/bcutil-jdk15on.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.bouncycastle/bcutil-jdk15to18",
"files":["bcutil-jdk15on.jar"],
"installedVersion":"1.76",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"\n <license>\n <name>Bouncy Castle Licence</name>\n <url>http://www.bouncycastle.org/licence.html</url>\n <distribution>repo</distribution>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/jna.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"net.java.dev.jna/jna",
"files":["jna.jar"],
"installedVersion":"5.13.0",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"\n <license>\n <name>LGPL-2.1-or-later</name>\n <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>\n <distribution>repo</distribution>\n <comments>\n Java Native Access (JNA) is licensed under the LGPL, version 2.1 or\n later, or the Apache License, version 2.0. You can freely decide which\n license you want to apply to the project.\n </comments>\n </license>\n <license>\n <name>Apache-2.0</name>\n <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>\n <distribution>repo</distribution>\n <comments>\n Java Native Access (JNA) is licensed under the LGPL, version 2.1 or\n later, or the Apache License, version 2.0. You can freely decide which\n license you want to apply to the project.\n </comments>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/jna_platform.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"net.java.dev.jna/jna-platform",
"files":["jna_platform.jar"],
"installedVersion":"5.13.0",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:04 CEST",
"license":"\n <license>\n <name>LGPL-2.1-or-later</name>\n <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>\n <distribution>repo</distribution>\n <comments>\n Java Native Access (JNA) is licensed under the LGPL, version 2.1 or\n later, or the Apache License, version 2.0. You can freely decide which\n license you want to apply to the project.\n </comments>\n </license>\n <license>\n <name>Apache-2.0</name>\n <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>\n <distribution>repo</distribution>\n <comments>\n Java Native Access (JNA) is licensed under the LGPL, version 2.1 or\n later, or the Apache License, version 2.0. You can freely decide which\n license you want to apply to the project.\n </comments>\n </license>\n ",
"minJRE":null,
"provider":"maven",

BIN
ressourcen/libs/proxyVole.jar Normal file
View File

Binary file not shown.

12
ressourcen/libs/proxyVole.jar.dep.json Normal file
View File

@ -0,0 +1,12 @@
{
"artefact":"com.github.markusbernhardt/proxyvole",
"files":["proxyVole.jar"],
"installedVersion":"1.0.5-appwork.0.1",
"lastUpdate":"2023-08-31T12:18:19 CEST",
"license":"Apache License, Version 2.0",
"minJRE":null,
"provider":"manual",
"renames":null,
"version":"latest",
"confirm":true
}

2
ressourcen/libs/sequence-library.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"de.regnis.q.sequence/sequence-library",
"files":["sequence-library.jar"],
"installedVersion":"1.0.2",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:19 CEST",
"license":"\n <license>\n <name>Sequence Library License (BSD-like)</name>\n <url>https://svn.tmatesoft.com/repos/3rdparty/de.regnis.q.sequnce/trunk/LICENSE.txt</url>\n <distribution>repos</distribution>\n <comments>Sequence Library License (BSD-like)</comments>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/sqljet.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.tmatesoft.sqljet/sqljet",
"files":["sqljet.jar"],
"installedVersion":"1.1.10",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:19 CEST",
"license":"\n <license>\n <name>GNU General Public License (GPL)</name>\n <url>http://www.gnu.org/licenses/gpl.html</url>\n <distribution>repos</distribution>\n <comments>GPL license with a dual-licensing option for closed source usage</comments>\n </license>\n <license>\n <name>GNU General Public License Version 3 (GPL v3)</name>\n <url>https://www.gnu.org/licenses/gpl-3.0.txt</url>\n <distribution>repos</distribution>\n <comments>GPL Version 3 license with a dual-licensing option for closed source usage</comments>\n </license>\n ",
"minJRE":null,
"provider":"maven",

2
ressourcen/libs/svnkit.jar.dep.json
View File

@ -2,7 +2,7 @@
"artefact":"org.tmatesoft.svnkit/svnkit",
"files":["svnkit.jar"],
"installedVersion":"1.8.10",
"lastUpdate":"2023-08-31T11:52:39 CEST",
"lastUpdate":"2023-08-31T12:18:19 CEST",
"license":"\n <license>\n <name>TMate Open Source License</name>\n <url>https://svnkit.com/license.html</url>\n <distribution>repos</distribution>\n <comments>GPL-like license with a dual-licensing option for closed source usage</comments>\n </license>\n ",
"minJRE":null,
"provider":"maven",

32
src/jd/SecondLevelLaunch.java
View File

@ -41,20 +41,6 @@ import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JWindow;
import jd.controlling.AccountController;
import jd.controlling.ClipboardMonitoring;
import jd.controlling.DelayWriteController;
import jd.controlling.downloadcontroller.DownloadController;
import jd.controlling.downloadcontroller.DownloadWatchDog;
import jd.controlling.linkcollector.LinkCollector;
import jd.controlling.packagecontroller.AbstractPackageChildrenNodeFilter;
import jd.controlling.proxy.ProxyController;
import jd.gui.swing.jdgui.JDGui;
import jd.gui.swing.laf.LookAndFeelController;
import jd.http.Browser;
import jd.nutils.zip.SharedMemoryState;
import jd.plugins.DownloadLink;
import org.appwork.console.ConsoleDialog;
import org.appwork.controlling.SingleReachableState;
import org.appwork.shutdown.ShutdownController;
@ -68,7 +54,6 @@ import org.appwork.storage.config.events.GenericConfigEventListener;
import org.appwork.storage.config.handler.KeyHandler;
import org.appwork.sunwrapper.sun.awt.shell.ShellFolderWrapper;
import org.appwork.swing.components.tooltips.ToolTipController;
import org.appwork.tools.ide.iconsetmaker.IconSetMakerAdapter;
import org.appwork.txtresource.TranslationFactory;
import org.appwork.uio.ConfirmDialogInterface;
import org.appwork.uio.ExceptionDialogInterface;
@ -145,6 +130,20 @@ import com.btr.proxy.selector.pac.PacScriptSource;
import com.btr.proxy.selector.pac.ProxyEvaluationException;
import com.btr.proxy.selector.pac.RhinoPacScriptParser;
import jd.controlling.AccountController;
import jd.controlling.ClipboardMonitoring;
import jd.controlling.DelayWriteController;
import jd.controlling.downloadcontroller.DownloadController;
import jd.controlling.downloadcontroller.DownloadWatchDog;
import jd.controlling.linkcollector.LinkCollector;
import jd.controlling.packagecontroller.AbstractPackageChildrenNodeFilter;
import jd.controlling.proxy.ProxyController;
import jd.gui.swing.jdgui.JDGui;
import jd.gui.swing.laf.LookAndFeelController;
import jd.http.Browser;
import jd.nutils.zip.SharedMemoryState;
import jd.plugins.DownloadLink;
public class SecondLevelLaunch {
static {
statics();
@ -958,9 +957,6 @@ public class SecondLevelLaunch {
public Void edtRun() {
/* init gui here */
try {
if (!Application.isJared(null) && System.getProperty("iconsets") != null) {
Toolkit.getDefaultToolkit().addAWTEventListener(new IconSetMakerAdapter(), AWTEvent.MOUSE_EVENT_MASK);
}
lafInit.waitForEDT();
LoggerFactory.getDefaultLogger().info("InitGUI->" + (System.currentTimeMillis() - SecondLevelLaunch.startup));
JDGui.init();

27
src/jd/controlling/linkcrawler/CrawledLinkProperties.java Normal file
View File

@ -0,0 +1,27 @@
package jd.controlling.linkcrawler;
public interface CrawledLinkProperties {
public Boolean getSticky();
public void setSticky(Boolean b);
public boolean isEnabled();
public boolean setEnabled(boolean b);
public boolean isCrawlDeep();
public void setCrawlDeep(boolean crawlDeep);
public boolean isAutoConfirmEnabled();
public void setAutoConfirmEnabled(boolean autoAddEnabled);
public boolean isAutoStartEnabled();
public void setAutoStartEnabled(boolean autoStartEnabled);
public boolean isForcedAutoStartEnabled();
public void setForcedAutoStartEnabled(boolean forcedAutoStartEnabled);
}

27
src/jd/controlling/linkcrawler/CrawledLinkSessionProperties.java Normal file
View File

@ -0,0 +1,27 @@
package jd.controlling.linkcrawler;
public interface CrawledLinkSessionProperties {
public Boolean getSticky();
public void setSticky(Boolean b);
public boolean isEnabled();
public boolean setEnabled(boolean b);
public boolean isCrawlDeep();
public void setCrawlDeep(boolean crawlDeep);
public boolean isAutoConfirmEnabled();
public void setAutoConfirmEnabled(boolean autoAddEnabled);
public boolean isAutoStartEnabled();
public void setAutoStartEnabled(boolean autoStartEnabled);
public boolean isForcedAutoStartEnabled();
public void setForcedAutoStartEnabled(boolean forcedAutoStartEnabled);
}

9
src/org/jdownloader/tools/ide/icons/LaunchIconTool.java
View File

@ -1,9 +0,0 @@
package org.jdownloader.tools.ide.icons;
public class LaunchIconTool {
public static void main(String[] args) throws Throwable {
org.appwork.tools.ide.iconsetmaker.IconSetMaker.main(args);
}
}