JDownloader2/jdownloader
1
0
Fork 0
mirror of https://github.com/mirror/jdownloader.git synced 2024-10-07 09:03:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
coalado 2012-02-09 17:36:50 +00:00
parent b956810cb0
commit a215c876d4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -82,7 +82,6 @@
<classpathentry kind="lib" path="ressourcen/libs/sevenzipjbindingMac.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/sevenzipjbindingWin.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/swingx.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/JDUpdater"/>
<classpathentry combineaccessrules="false" kind="src" path="/UpdateClient"/>
<classpathentry kind="lib" path="ressourcen/libs_ext/mqtt.jar"/>
<classpathentry kind="lib" path="ressourcen/libs_ext/htmlUnit/commons-codec-1.4.jar"/>

7
build/newBuild/build.xml
View File

@ -254,15 +254,14 @@
<mkdir dir="${working}" />
<manifest file="${working}/Manifest.MF">
<attribute name="Created-By" value="AppWork GmbH" />
<attribute name="Main-Class" value="org.jdownloader.update.Main" />
<attribute name="Main-Class" value="org.appwork.update.Main" />
</manifest>
<jar file="${working}/Updater.jar" manifest="${working}/Manifest.MF">
<zipfileset src="${dep.awu}/libs/miglayout.jar" excludes="META-INF/*" />
<fileset dir="${working}">
<include name="version.nfo" />
</fileset>
<fileset dir="${cls}">
<include name="org/jdownloader/update/**/*" />
<fileset dir="${cls}">
<include name="org/appwork/update/**/*" />
<include name="org/appwork/controlling/**/*" />
<include name="org/appwork/utils/logging/**/*" />
@ -293,7 +292,7 @@
</fileset>
<fileset dir="${dep.update}/themes">
<include name="themes/standard/org/jdownloader/updater/**/*" />
<include name="themes/standard/org/appwork/updater/**/*" />
</fileset>
<fileset dir="${dep.updateclient}/src">

4
src/org/jdownloader/update/JDUpdater.java
View File

@ -17,8 +17,11 @@ import org.appwork.shutdown.ShutdownController;
import org.appwork.shutdown.ShutdownEvent;
import org.appwork.storage.JSonStorage;
import org.appwork.storage.config.JsonConfig;
import org.appwork.update.Options;
import org.appwork.update.exchange.UpdateFile;
import org.appwork.update.exchange.UpdatePackage;
import org.appwork.update.standalone.UpdaterHttpClientImpl;
import org.appwork.update.standalone.gui.UpdateFoundDialog;
import org.appwork.update.updateclient.InstalledFile;
import org.appwork.update.updateclient.RestartEvent;
import org.appwork.update.updateclient.UpdateHttpClient;
@ -42,7 +45,6 @@ import org.jdownloader.images.NewTheme;
import org.jdownloader.plugins.controller.PluginClassLoader;
import org.jdownloader.plugins.controller.crawler.CrawlerPluginController;
import org.jdownloader.plugins.controller.host.HostPluginController;
import org.jdownloader.update.gui.UpdateFoundDialog;
public class JDUpdater extends Updater implements Runnable {
private static final JDUpdater INSTANCE = new JDUpdater();

2
src/org/jdownloader/update/RestartController.java
View File

@ -10,12 +10,12 @@ import jd.utils.JDUtilities;
import org.appwork.shutdown.ShutdownController;
import org.appwork.shutdown.ShutdownVetoException;
import org.appwork.shutdown.ShutdownVetoListener;
import org.appwork.update.standalone.gui.UpdateFoundDialog;
import org.appwork.utils.Application;
import org.appwork.utils.logging.Log;
import org.appwork.utils.os.CrossSystem;
import org.appwork.utils.swing.dialog.Dialog;
import org.appwork.utils.swing.dialog.DialogNoAnswerException;
import org.jdownloader.update.gui.UpdateFoundDialog;
public class RestartController implements ShutdownVetoListener {
private static final RestartController INSTANCE = new RestartController();

4
src/org/jdownloader/update/UpdaterGUI.java
View File

@ -17,10 +17,11 @@ import jd.gui.swing.jdgui.JDGui;
import net.miginfocom.swing.MigLayout;
import org.appwork.resources.AWUTheme;
import org.appwork.update.standalone.gui.UpdaterCoreGui;
import org.appwork.update.standalone.translate.T;
import org.appwork.update.updateclient.UpdaterState;
import org.appwork.update.updateclient.event.UpdaterEvent;
import org.appwork.update.updateclient.event.UpdaterListener;
import org.appwork.update.updateclient.gui.UpdaterCoreGui;
import org.appwork.utils.locale._AWU;
import org.appwork.utils.swing.EDTRunner;
import org.appwork.utils.swing.SwingUtils;
@ -28,7 +29,6 @@ import org.appwork.utils.swing.dialog.Dialog;
import org.appwork.utils.swing.dialog.DialogCanceledException;
import org.appwork.utils.swing.dialog.DialogClosedException;
import org.jdownloader.gui.translate._GUI;
import org.jdownloader.update.translate.T;
public class UpdaterGUI extends JFrame implements ActionListener, UpdaterListener {