Changeset 709


Ignore:
Timestamp:
Mar 21, 2013, 10:40:09 AM (12 years ago)
Author:
alloc
Message:

AEI2: Refactorings for breaking out independent features into libraries

Location:
AE/installer2
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • AE/installer2/.classpath

    r651 r709  
    33        <classpathentry kind="src" path="src"/>
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    5         <classpathentry kind="lib" path="lib/swingbuilder/betterbeansbinding-core-1.3.0.jar"/>
    6         <classpathentry kind="lib" path="lib/swingbuilder/betterbeansbinding-el-1.3.0.jar"/>
    7         <classpathentry kind="lib" path="lib/swingbuilder/betterbeansbinding-swingbinding-1.3.0.jar"/>
    8         <classpathentry kind="lib" path="lib/swingbuilder/commons-lang-2.4.jar"/>
    9         <classpathentry kind="lib" path="lib/swingbuilder/javabuilder-core-1.1.0.jar"/>
    10         <classpathentry kind="lib" path="lib/swingbuilder/javabuilder-swing-1.1.0.jar"/>
    11         <classpathentry kind="lib" path="lib/swingbuilder/jsr305-1.3.7.jar"/>
    12         <classpathentry kind="lib" path="lib/swingbuilder/miglayout-3.7.1.jar"/>
    13         <classpathentry kind="lib" path="lib/swingbuilder/slf4j-api-1.6.1.jar"/>
    14         <classpathentry kind="lib" path="lib/swingbuilder/slf4j-simple-1.6.1.jar"/>
    15         <classpathentry kind="lib" path="lib/swingbuilder/snakeyaml-1.7.jar"/>
    16         <classpathentry kind="lib" path="lib/JSON-java.jar"/>
    17         <classpathentry kind="lib" path="lib/httpclient/httpclient-4.2.2.jar"/>
    18         <classpathentry kind="lib" path="lib/httpclient/httpcore-4.2.2.jar"/>
    19         <classpathentry kind="lib" path="lib/httpclient/commons-logging-1.1.1.jar"/>
    20         <classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
    21         <classpathentry kind="lib" path="lib/macify.jar"/>
    22         <classpathentry kind="lib" path="lib/commons-io-2.4.jar">
     5        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-core-1.3.0.jar"/>
     6        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-el-1.3.0.jar"/>
     7        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/betterbeansbinding-swingbinding-1.3.0.jar"/>
     8        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/commons-lang-2.4.jar"/>
     9        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/javabuilder-core-1.1.0.jar"/>
     10        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/javabuilder-swing-1.1.0.jar"/>
     11        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/jsr305-1.3.7.jar"/>
     12        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/miglayout-3.7.1.jar"/>
     13        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/slf4j-api-1.6.1.jar"/>
     14        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/slf4j-simple-1.6.1.jar"/>
     15        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/swingbuilder/snakeyaml-1.7.jar"/>
     16        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/JSON-java.jar"/>
     17        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/httpclient-4.2.2.jar"/>
     18        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/httpcore-4.2.2.jar"/>
     19        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/httpclient/commons-logging-1.1.1.jar"/>
     20        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/xstream-1.4.3.jar"/>
     21        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/macify.jar"/>
     22        <classpathentry kind="lib" path="/home/ci/Development/Oni/_Libraries/commons-io-2.4.jar">
    2323                <attributes>
    24                         <attribute name="javadoc_location" value="jar:platform:/resource/AEInstaller2/lib/commons-io-2.4-javadoc.jar!/"/>
     24                        <attribute name="javadoc_location" value="jar:platform:/resource/OniJavaLibraries/commons-io-2.4-javadoc.jar!/"/>
    2525                </attributes>
    2626        </classpathentry>
     27        <classpathentry combineaccessrules="false" kind="src" path="/ApplicationInvoker"/>
     28        <classpathentry combineaccessrules="false" kind="src" path="/ProgramSettings"/>
    2729        <classpathentry kind="output" path="bin"/>
    2830</classpath>

  • AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

    r699 r709  
    2424import net.oni2.aeinstaller.backend.DotNet;
    2525import net.oni2.aeinstaller.backend.Paths;
    26 import net.oni2.aeinstaller.backend.Settings;
    27 import net.oni2.aeinstaller.backend.Settings.Platform;
    2826import net.oni2.aeinstaller.backend.SizeFormatter;
    2927import net.oni2.aeinstaller.backend.depot.DepotManager;
    … …  
    3230import net.oni2.aeinstaller.gui.HTMLLinkLabel;
    3331import net.oni2.aeinstaller.gui.MainWin;
     32import net.oni2.settingsmanager.Settings;
     33import net.oni2.settingsmanager.Settings.Platform;
    3434
    3535import org.javabuilders.swing.SwingJavaBuilder;
    … …  
    127127
    128128                Settings.setDebug(debug);
    129                 Settings.deserializeFromFile();
     129                Settings.deserializeFromFile(Paths.getSettingsFilename());
    130130                Settings.setDebug(debug);
    131131                Settings.getInstance().setNoCacheUpdateMode(noCacheUpdate);

  • AE/installer2/src/net/oni2/aeinstaller/backend/DotNet.java

    r702 r709  
    66import java.util.Vector;
    77
    8 import net.oni2.aeinstaller.backend.Settings.Architecture;
    9 import net.oni2.aeinstaller.backend.Settings.Platform;
    10 import net.oni2.aeinstaller.backend.appexecution.AppExecution;
    11 import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
     8import net.oni2.applicationinvoker.AppExecution;
     9import net.oni2.applicationinvoker.AppExecutionResult;
     10import net.oni2.settingsmanager.Settings;
     11import net.oni2.settingsmanager.Settings.Architecture;
     12import net.oni2.settingsmanager.Settings.Platform;
    1213
    1314/**

  • AE/installer2/src/net/oni2/aeinstaller/backend/Paths.java

    r699 r709  
    55import java.net.URLDecoder;
    66
     7import net.oni2.settingsmanager.Settings;
     8
    79/**
    810 * @author Christian Illy
    911 */
    1012public class Paths {
     13
     14        /**
     15         * @return Mod Depot cache filename
     16         */
     17        public static File getDepotCacheFilename() {
     18                return new File(getPrefsPath(), "ModDepotCache.xml");
     19        }
     20
     21        /**
     22         * @return Settings filename of AEI
     23         */
     24        public static File getSettingsFilename() {
     25                return new File(getPrefsPath(), "AEI-Settings.xml");
     26        }
    1127
    1228        /**

  • AE/installer2/src/net/oni2/aeinstaller/backend/ToolLauncher.java

    r702 r709  
    44import java.util.Vector;
    55
    6 import net.oni2.aeinstaller.backend.Settings.Platform;
    7 import net.oni2.aeinstaller.backend.appexecution.AppExecution;
    86import net.oni2.aeinstaller.backend.packages.Package;
     7import net.oni2.applicationinvoker.AppExecution;
     8import net.oni2.settingsmanager.Settings;
     9import net.oni2.settingsmanager.Settings.Platform;
    910
    1011/**
Note: See TracChangeset for help on using the changeset viewer.