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

AEI2: Refactorings for breaking out independent features into libraries

Location:
AE/installer2/src/net/oni2/aeinstaller
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java

    r648 r708  
    33import java.util.TreeSet;
    44
    5 import net.oni2.aeinstaller.backend.Settings;
     5import net.oni2.settingsmanager.Settings;
    66
    77/**

  • AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java

    r672 r708  
    1717
    1818import net.oni2.aeinstaller.backend.Paths;
    19 import net.oni2.aeinstaller.backend.Settings;
    2019import net.oni2.aeinstaller.backend.depot.model.File;
    2120import net.oni2.aeinstaller.backend.depot.model.Node;
    … …  
    280279                                                result.add(nm);
    281280                                        } catch (NumberFormatException e) {
    282                                                 System.err.println("Node " + nm.getNid() + " does not have a package number!!!");
     281                                                System.err.println("Node " + nm.getNid()
     282                                                                + " does not have a package number!!!");
    283283                                        }
    284284                                }
    … …  
    349349                try {
    350350                        FileOutputStream fos = new FileOutputStream(
    351                                         Settings.getDepotCacheFilename());
     351                                        Paths.getDepotCacheFilename());
    352352                        XStream xs = getXStream();
    353353                        xs.toXML(this, fos);
    … …  
    363363                try {
    364364                        FileInputStream fis = new FileInputStream(
    365                                         Settings.getDepotCacheFilename());
     365                                        Paths.getDepotCacheFilename());
    366366                        XStream xs = getXStream();
    367367                        Object obj = xs.fromXML(fis);

  • AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

    r703 r708  
    2424import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
    2525import net.oni2.aeinstaller.backend.Paths;
    26 import net.oni2.aeinstaller.backend.Settings;
    27 import net.oni2.aeinstaller.backend.Settings.Platform;
    28 import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
    2926import net.oni2.aeinstaller.backend.packages.EBSLInstallType;
    3027import net.oni2.aeinstaller.backend.packages.Package;
    3128import net.oni2.aeinstaller.backend.packages.PackageManager;
     29import net.oni2.applicationinvoker.AppExecutionResult;
     30import net.oni2.settingsmanager.Settings;
     31import net.oni2.settingsmanager.Settings.Platform;
    3232
    3333import org.apache.commons.io.FileUtils;

  • AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java

    r702 r708  
    88import net.oni2.aeinstaller.backend.DotNet;
    99import net.oni2.aeinstaller.backend.Paths;
    10 import net.oni2.aeinstaller.backend.Settings;
    11 import net.oni2.aeinstaller.backend.Settings.Platform;
    12 import net.oni2.aeinstaller.backend.appexecution.AppExecution;
    13 import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
     10import net.oni2.applicationinvoker.AppExecution;
     11import net.oni2.applicationinvoker.AppExecutionResult;
     12import net.oni2.settingsmanager.Settings;
     13import net.oni2.settingsmanager.Settings.Platform;
    1414
    1515/**

  • AE/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java

    r702 r708  
    88import net.oni2.aeinstaller.backend.DotNet;
    99import net.oni2.aeinstaller.backend.Paths;
    10 import net.oni2.aeinstaller.backend.appexecution.AppExecution;
    11 import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
     10import net.oni2.applicationinvoker.AppExecution;
     11import net.oni2.applicationinvoker.AppExecutionResult;
    1212
    1313/**

  • AE/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

    r699 r708  
    1616import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
    1717import net.oni2.aeinstaller.backend.Paths;
    18 import net.oni2.aeinstaller.backend.Settings;
    19 import net.oni2.aeinstaller.backend.Settings.Platform;
    2018import net.oni2.aeinstaller.backend.depot.DepotConfig;
    2119import net.oni2.aeinstaller.backend.depot.DepotManager;
    … …  
    2321import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
    2422import net.oni2.aeinstaller.backend.oni.Installer;
     23import net.oni2.settingsmanager.Settings;
     24import net.oni2.settingsmanager.Settings.Platform;
    2525
    2626/**

  • AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

    r702 r708  
    4242import net.oni2.aeinstaller.backend.ImageResizer;
    4343import net.oni2.aeinstaller.backend.Paths;
    44 import net.oni2.aeinstaller.backend.Settings;
    4544import net.oni2.aeinstaller.backend.ToolLauncher;
    46 import net.oni2.aeinstaller.backend.Settings.Platform;
    4745import net.oni2.aeinstaller.backend.SizeFormatter;
    48 import net.oni2.aeinstaller.backend.appexecution.AppExecution;
    4946import net.oni2.aeinstaller.backend.depot.DepotManager;
    5047import net.oni2.aeinstaller.backend.oni.InstallProgressListener;
    … …  
    6865import net.oni2.aeinstaller.gui.settings.SettingsDialog;
    6966import net.oni2.aeinstaller.gui.toolmanager.ToolManager;
     67import net.oni2.applicationinvoker.AppExecution;
     68import net.oni2.settingsmanager.Settings;
     69import net.oni2.settingsmanager.Settings.Platform;
    7070
    7171import org.javabuilders.BuildResult;
    … …  
    193193                Settings.getInstance().put("win_main_width", getWidth());
    194194                Settings.getInstance().put("win_main_height", getHeight());
    195                 Settings.getInstance().serializeToFile();
     195                Settings.getInstance().serializeToFile(Paths.getSettingsFilename());
    196196        }
    197197

  • AE/installer2/src/net/oni2/aeinstaller/gui/corepackages/CorePackagesDialog.java

    r701 r708  
    1212import javax.swing.KeyStroke;
    1313
    14 import net.oni2.aeinstaller.backend.Settings;
    1514import net.oni2.aeinstaller.backend.packages.Package;
    1615import net.oni2.aeinstaller.gui.modtable.ModSelectionListener;
    … …  
    1817import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
    1918import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
     19import net.oni2.settingsmanager.Settings;
    2020
    2121import org.javabuilders.BuildResult;

  • AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java

    r673 r708  
    3535import javax.swing.table.TableRowSorter;
    3636
    37 import net.oni2.aeinstaller.backend.Settings;
    3837import net.oni2.aeinstaller.backend.packages.Package;
    3938import net.oni2.aeinstaller.backend.packages.Type;
    4039import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
     40import net.oni2.settingsmanager.Settings;
    4141
    4242/**

  • AE/installer2/src/net/oni2/aeinstaller/gui/settings/LaFComboModel.java

    r636 r708  
    99import javax.swing.event.ListDataListener;
    1010
    11 import net.oni2.aeinstaller.backend.Settings;
     11import net.oni2.settingsmanager.Settings;
    1212
    1313/**

  • AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

    r646 r708  
    1414import javax.swing.UIManager;
    1515
    16 import net.oni2.aeinstaller.backend.Settings;
     16import net.oni2.settingsmanager.Settings;
    1717
    1818import org.javabuilders.BuildResult;

  • AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

    r701 r708  
    1717import javax.swing.KeyStroke;
    1818
    19 import net.oni2.aeinstaller.backend.Settings;
    2019import net.oni2.aeinstaller.backend.oni.Installer;
    2120import net.oni2.aeinstaller.backend.packages.Package;
    … …  
    2524import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
    2625import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
     26import net.oni2.settingsmanager.Settings;
    2727
    2828import org.javabuilders.BuildResult;
Note: See TracChangeset for help on using the changeset viewer.