Changeset 938


Ignore:
Timestamp:
05/01/09 01:08:43 (5 years ago)
Author:
lowjoel
Message:

Rename these references as a result of r936

Location:
branches/eraser6
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • branches/eraser6/DefaultPlugins/EraseDoD.cs

    r905 r938  
    5050            { 
    5151                //Set passes 1, 4 and 5 to be a random value 
    52                 Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     52                Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    5353                int rand = prng.Next(); 
    5454 
  • branches/eraser6/DefaultPlugins/EraseFirstLast16KB.cs

    r925 r938  
    4343                { 
    4444                    method = ErasureMethodManager.GetInstance( 
    45                         ManagerLibrary.Instance.Settings.DefaultFileErasureMethod); 
     45                        ManagerLibrary.Settings.DefaultFileErasureMethod); 
    4646                } 
    4747                catch (Exception) 
  • branches/eraser6/DefaultPlugins/EraseRCMP_TSSIT_OPS_II.cs

    r905 r938  
    5252            get 
    5353            { 
    54                 Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     54                Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    5555                int rand = prng.Next(); 
    5656 
  • branches/eraser6/DefaultPlugins/EraseUSAF5020.cs

    r905 r938  
    5252            get 
    5353            { 
    54                 Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     54                Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    5555                int rand = prng.Next(); 
    5656 
  • branches/eraser6/DefaultPlugins/EraseUSArmyAR380_19.cs

    r905 r938  
    5252            get 
    5353            { 
    54                 Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     54                Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    5555                int rand = prng.Next(); 
    5656 
  • branches/eraser6/DefaultPlugins/Plugin.cs

    r908 r938  
    105105        public DefaultPluginSettings() 
    106106        { 
    107             settings = Manager.ManagerLibrary.Instance.SettingsManager.ModuleSettings; 
     107            settings = Manager.ManagerLibrary.SettingsManager.ModuleSettings; 
    108108        } 
    109109 
  • branches/eraser6/DefaultPlugins/SettingsForm.cs

    r908 r938  
    5555            { 
    5656                Guid defaultMethodGuid = 
    57                     ManagerLibrary.Instance.Settings.DefaultFileErasureMethod; 
     57                    ManagerLibrary.Settings.DefaultFileErasureMethod; 
    5858                foreach (object item in fl16MethodCmb.Items) 
    5959                    if (((ErasureMethod)item).Guid == defaultMethodGuid) 
  • branches/eraser6/Eraser/Program.cs

    r917 r938  
    12441244        private EraserSettings() 
    12451245        { 
    1246             settings = Manager.ManagerLibrary.Instance.SettingsManager.ModuleSettings; 
     1246            settings = Manager.ManagerLibrary.SettingsManager.ModuleSettings; 
    12471247        } 
    12481248 
  • branches/eraser6/Eraser/SettingsPanel.cs

    r921 r938  
    7373            //The item is checked if the plugin was given the green light to load 
    7474            item.Checked = e.Instance.Plugin != null || 
    75                 (Manager.ManagerLibrary.Instance.Settings.PluginApprovals.ContainsKey( 
     75                (Manager.ManagerLibrary.Settings.PluginApprovals.ContainsKey( 
    7676                    e.Instance.AssemblyInfo.Guid) && Manager.ManagerLibrary.Instance. 
    7777                    Settings.PluginApprovals[e.Instance.AssemblyInfo.Guid] 
     
    157157 
    158158            foreach (Object method in eraseFilesMethod.Items) 
    159                 if (((ErasureMethod)method).Guid == ManagerLibrary.Instance.Settings.DefaultFileErasureMethod) 
     159                if (((ErasureMethod)method).Guid == ManagerLibrary.Settings.DefaultFileErasureMethod) 
    160160                { 
    161161                    eraseFilesMethod.SelectedItem = method; 
     
    164164 
    165165            foreach (Object method in eraseUnusedMethod.Items) 
    166                 if (((ErasureMethod)method).Guid == ManagerLibrary.Instance.Settings.DefaultUnusedSpaceErasureMethod) 
     166                if (((ErasureMethod)method).Guid == ManagerLibrary.Settings.DefaultUnusedSpaceErasureMethod) 
    167167                { 
    168168                    eraseUnusedMethod.SelectedItem = method; 
     
    171171 
    172172            foreach (Object prng in erasePRNG.Items) 
    173                 if (((Prng)prng).Guid == ManagerLibrary.Instance.Settings.ActivePrng) 
     173                if (((Prng)prng).Guid == ManagerLibrary.Settings.ActivePrng) 
    174174                { 
    175175                    erasePRNG.SelectedItem = prng; 
     
    177177                } 
    178178 
    179             foreach (string path in ManagerLibrary.Instance.Settings.PlausibleDeniabilityFiles) 
     179            foreach (string path in ManagerLibrary.Settings.PlausibleDeniabilityFiles) 
    180180                plausibleDeniabilityFiles.Items.Add(path); 
    181181 
    182182            uiContextMenu.Checked = settings.IntegrateWithShell; 
    183183            lockedAllow.Checked = 
    184                 ManagerLibrary.Instance.Settings.EraseLockedFilesOnRestart; 
     184                ManagerLibrary.Settings.EraseLockedFilesOnRestart; 
    185185            lockedConfirm.Checked = 
    186                 ManagerLibrary.Instance.Settings.ConfirmEraseOnRestart; 
     186                ManagerLibrary.Settings.ConfirmEraseOnRestart; 
    187187            lockedAllow_CheckedChanged(lockedAllow, new EventArgs()); 
    188188            schedulerMissedImmediate.Checked = 
    189                 ManagerLibrary.Instance.Settings.ExecuteMissedTasksImmediately; 
     189                ManagerLibrary.Settings.ExecuteMissedTasksImmediately; 
    190190            schedulerMissedIgnore.Checked = 
    191                 !ManagerLibrary.Instance.Settings.ExecuteMissedTasksImmediately; 
     191                !ManagerLibrary.Settings.ExecuteMissedTasksImmediately; 
    192192            plausibleDeniability.Checked = 
    193                 ManagerLibrary.Instance.Settings.PlausibleDeniability; 
     193                ManagerLibrary.Settings.PlausibleDeniability; 
    194194            plausibleDeniability_CheckedChanged(plausibleDeniability, new EventArgs()); 
    195195            schedulerClearCompleted.Checked = settings.ClearCompletedTasks; 
     
    212212                { 
    213213                    eraseFilesMethod.SelectedIndex = 0; 
    214                     ManagerLibrary.Instance.Settings.DefaultFileErasureMethod = 
     214                    ManagerLibrary.Settings.DefaultFileErasureMethod = 
    215215                        ((ErasureMethod)eraseFilesMethod.SelectedItem).Guid; 
    216216                } 
     
    222222                { 
    223223                    eraseUnusedMethod.SelectedIndex = 0; 
    224                     ManagerLibrary.Instance.Settings.DefaultUnusedSpaceErasureMethod = 
     224                    ManagerLibrary.Settings.DefaultUnusedSpaceErasureMethod = 
    225225                        ((ErasureMethod)eraseUnusedMethod.SelectedItem).Guid; 
    226226                } 
     
    232232                { 
    233233                    erasePRNG.SelectedIndex = 0; 
    234                     ManagerLibrary.Instance.Settings.ActivePrng = 
     234                    ManagerLibrary.Settings.ActivePrng = 
    235235                        ((Prng)erasePRNG.SelectedItem).Guid; 
    236236                } 
     
    350350        { 
    351351            EraserSettings settings = EraserSettings.Get(); 
    352             ManagerSettings managerSettings = ManagerLibrary.Instance.Settings; 
     352            ManagerSettings managerSettings = ManagerLibrary.Settings; 
    353353 
    354354            //Save the settings that don't fail first. 
  • branches/eraser6/Manager/DirectExecutor.cs

    r926 r938  
    8080            RecurringSchedule schedule = (RecurringSchedule)task.Schedule; 
    8181            if (schedule.MissedPreviousSchedule && 
    82                 ManagerLibrary.Instance.Settings.ExecuteMissedTasksImmediately) 
     82                ManagerLibrary.Settings.ExecuteMissedTasksImmediately) 
    8383                //OK, we've missed the schedule and the user wants the thing 
    8484                //to follow up immediately. 
     
    482482                        //Then run the erase task 
    483483                        method.Erase(stream, long.MaxValue, 
    484                             PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng), 
     484                            PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng), 
    485485                            delegate(long lastWritten, int currentPass) 
    486486                            { 
     
    687687                    //Erase the file 
    688688                    method.Erase(stream, long.MaxValue, PrngManager.GetInstance( 
    689                         ManagerLibrary.Instance.Settings.ActivePrng), null); 
     689                        ManagerLibrary.Settings.ActivePrng), null); 
    690690                } 
    691691                finally 
     
    777777                                 itemTotal = method.CalculateEraseDataSize(null, strm.Length); 
    778778                            method.Erase(strm, long.MaxValue, 
    779                                 PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng), 
     779                                PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng), 
    780780                                delegate(long lastWritten, int currentPass) 
    781781                                { 
  • branches/eraser6/Manager/FileSystem.cs

    r905 r938  
    6868        { 
    6969            //Get a random file name 
    70             Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     70            Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    7171            string resultPrefix = info == null ? string.Empty : info.FullName + 
    7272                Path.DirectorySeparatorChar; 
     
    113113 
    114114            //Find a random entry. 
    115             Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     115            Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    116116            string result = string.Empty; 
    117117            while (result.Length == 0) 
     
    230230            //If the user wants plausible deniability, find a random file on the same 
    231231            //volume and write it over. 
    232             if (Manager.ManagerLibrary.Instance.Settings.PlausibleDeniability) 
     232            if (Manager.ManagerLibrary.Settings.PlausibleDeniability) 
    233233            { 
    234234                //Get the template file to copy 
     
    236236                { 
    237237                    string shadowFile = null; 
    238                     List<string> entries = ManagerLibrary.Instance.Settings.PlausibleDeniabilityFiles.GetRange( 
    239                         0, ManagerLibrary.Instance.Settings.PlausibleDeniabilityFiles.Count); 
    240                     Prng prng = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     238                    List<string> entries = ManagerLibrary.Settings.PlausibleDeniabilityFiles.GetRange( 
     239                        0, ManagerLibrary.Settings.PlausibleDeniabilityFiles.Count); 
     240                    Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    241241                    do 
    242242                    { 
     
    353353                        //Then run the erase task 
    354354                        method.Erase(strm, long.MaxValue, 
    355                             PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng), 
     355                            PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng), 
    356356                            null); 
    357357                    } 
  • branches/eraser6/Manager/Method.cs

    r937 r938  
    137137 
    138138            //Randomize. 
    139             Prng rand = PrngManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePrng); 
     139            Prng rand = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng); 
    140140            for (int i = 0; i < result.Length; ++i) 
    141141            { 
  • branches/eraser6/Manager/Plugins.cs

    r935 r938  
    207207            //The plugin was not disabled or it was loaded for the first time. Check 
    208208            //the plugin for the presence of a valid signature. 
    209             Dictionary<Guid, bool> approvals = ManagerLibrary.Instance.Settings.PluginApprovals; 
     209            Dictionary<Guid, bool> approvals = ManagerLibrary.Settings.PluginApprovals; 
    210210            if ((reflectAssembly.GetName().GetPublicKey().Length == 0 || 
    211211                !MsCorEEAPI.VerifyStrongName(filePath) || 
  • branches/eraser6/Manager/Settings.cs

    r921 r938  
    195195        public ManagerSettings() 
    196196        { 
    197             settings = ManagerLibrary.Instance.SettingsManager.ModuleSettings; 
     197            settings = ManagerLibrary.SettingsManager.ModuleSettings; 
    198198        } 
    199199 
  • branches/eraser6/Manager/Task.cs

    r935 r938  
    385385                    return method; 
    386386                return ErasureMethodManager.GetInstance( 
    387                     ManagerLibrary.Instance.Settings.DefaultFileErasureMethod); 
     387                    ManagerLibrary.Settings.DefaultFileErasureMethod); 
    388388            } 
    389389            set 
     
    448448                    return method; 
    449449                return ErasureMethodManager.GetInstance( 
    450                     ManagerLibrary.Instance.Settings.DefaultUnusedSpaceErasureMethod); 
     450                    ManagerLibrary.Settings.DefaultUnusedSpaceErasureMethod); 
    451451            } 
    452452            set 
Note: See TracChangeset for help on using the changeset viewer.