Changeset 2673


Ignore:
Timestamp:
Feb 12, 2011, 2:41:26 PM (11 years ago)
Author:
Matthäus Wander
Message:

Code cleanup:

  • removed obsolete CryptoolStream from solution
  • removed obsolete DisplayLevel from PluginBase attributes
Location:
trunk
Files:
1 added
1 deleted
24 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/CrypPluginBase/Attributes/ContextMenuAttribute.cs

    r2661 r2673  
    4747            this.ArrImagesForControlValues = arrImagesForControlValues;
    4848        }
    49 
    50         [Obsolete("DisplayLevel is no longer used, see #122")]
    51         public ContextMenuAttribute(string caption, string toolTip, int order, DisplayLevel displayLevel, ContextMenuControlType controlType, int[] arrImagesForControlValues, params string[] controlValues)
    52             : this(caption, toolTip, order, controlType, arrImagesForControlValues, controlValues)
    53         {
    54         }
    5549    }
    5650}
  • trunk/CrypPluginBase/Attributes/PropertyInfoAttribute.cs

    r2661 r2673  
    9595        /// <param name="descriptionUrl">The description URL.</param>
    9696        /// <param name="mandatory">if set to <c>true</c> [mandatory].</param>
    97         /// <param name="displayLevel">The display level.</param>
    9897        /// <param name="quickWatchFormat">The quick watch format.</param>
    9998        /// <param name="quickWatchConversion">Methodname of converstion method.</param>
     
    105104            this.Direction = direction;
    106105            this.Mandatory = mandatory;
    107 //            this.DisplayLevel = displayLevel;
    108106            this.QuickWatchFormat = quickWatchFormat;
    109107            this.QuickWatchConversionMethod = quickWatchConversionMethod;
     
    116114        }
    117115
    118         [Obsolete("DisplayLevel is no longer used, see #122")]
    119         public PropertyInfoAttribute(Direction direction, string caption, string toolTip, string descriptionUrl, bool mandatory, bool hasDefaultValue, DisplayLevel displayLevel, QuickWatchFormat quickWatchFormat, string quickWatchConversionMethod)
    120             : this(direction, caption, toolTip, descriptionUrl, mandatory, hasDefaultValue, quickWatchFormat, quickWatchConversionMethod)
    121         {
    122         }
    123 
    124         [Obsolete("DisplayLevel is no longer used, see #122")]
    125         public PropertyInfoAttribute(Direction direction, string caption, string toolTip, string descriptionUrl, DisplayLevel displayLevel)
    126           : this (direction, caption, toolTip, descriptionUrl, false, false, displayLevel, QuickWatchFormat.None, null)
    127         {
    128         }
    129 
    130116        #endregion constructor
    131117    }
  • trunk/CrypPluginBase/Attributes/TaskPaneAttribute.cs

    r2661 r2673  
    158158            this.groupName = groupName;
    159159            this.Order = order;             
    160 //            this.DisplayLevel = displayLevel;
    161160            this.ControlType = controlType;           
    162161            this.ControlValues = controlValues;
     
    164163        }
    165164
    166         [Obsolete("DisplayLevel is no longer used, see #122")]
    167         public TaskPaneAttribute(string caption, string toolTip, string groupName, int order, bool changeableWhileExecuting, DisplayLevel displayLevel, ControlType controlType, params string[] controlValues)
    168             : this(caption, toolTip, groupName, order, changeableWhileExecuting, controlType, controlValues)
    169         {
    170         }
    171 
    172 
    173165        /// <summary>
    174166        /// Regex validation and ControlType.TextBox
     
    184176          this.RegularExpression = regularExpression;
    185177          this.ChangeableWhileExecuting = changeableWhileExecuting;
    186         }
    187 
    188         [Obsolete("DisplayLevel is no longer used, see #122")]
    189         public TaskPaneAttribute(string caption, string toolTip, string groupName, int order, bool changeableWhileExecuting, DisplayLevel displayLevel, ControlType controlType, ValidationType validationType, string regularExpression)
    190             : this(caption, toolTip, groupName, order, changeableWhileExecuting, controlType, validationType, regularExpression)
    191         {
    192178        }
    193179       
     
    208194        }
    209195
    210         [Obsolete("DisplayLevel is no longer used, see #122")]
    211         public TaskPaneAttribute(string caption, string toolTip, string groupName, int order, bool changeableWhileExecuting, DisplayLevel displayLevel, ControlType controlType, ValidationType validationType, int integerMinValue, int integerMaxValue)
    212             : this(caption, toolTip, groupName, order, changeableWhileExecuting, controlType, validationType, integerMinValue, integerMaxValue)
    213         {
    214         }
    215 
    216196        /// <summary>
    217197        /// NumericUpDown double.
     
    230210        }
    231211
    232         [Obsolete("DisplayLevel is no longer used, see #122")]
    233         public TaskPaneAttribute(string caption, string toolTip, string groupName, int order, bool changeableWhileExecuting, DisplayLevel displayLevel, ControlType controlType, ValidationType validationType, double doubleMinValue, double doubleMaxValue)
    234             : this(caption, toolTip, groupName, order, changeableWhileExecuting, controlType, validationType, doubleMinValue, doubleMaxValue)
    235         {
    236         }
    237 
    238212        /// <summary>
    239213        /// Slider
     
    249223          this.DoubleMaxValue = doubleMaxValue;
    250224          this.ChangeableWhileExecuting = changeableWhileExecuting;
    251         }
    252 
    253         [Obsolete("DisplayLevel is no longer used, see #122")]
    254         public TaskPaneAttribute(string caption, string toolTip, string groupName, int order, bool changeableWhileExecuting, DisplayLevel displayLevel, ControlType controlType, double doubleMinValue, double doubleMaxValue)
    255             :this(caption, toolTip, groupName, order, changeableWhileExecuting, controlType, doubleMinValue, doubleMaxValue)
    256         {
    257225        }
    258226
     
    270238          this.groupName = groupName;
    271239          this.Order = order;
    272 //          this.DisplayLevel = displayLevel;
    273240          this.ControlType = controlType;
    274241          this.ChangeableWhileExecuting = changeableWhileExecuting;
    275         }
    276 
    277         [Obsolete("DisplayLevel is no longer used, see #122")]
    278         public TaskPaneAttribute(string caption, string toolTip, string groupName, int order, bool changeableWhileExecuting, DisplayLevel displayLevel, ControlType controlType)
    279             :this(caption, toolTip, groupName, order, changeableWhileExecuting, controlType)
    280         {
    281242        }
    282243    }
  • trunk/CrypPluginBase/CrypPluginBase.csproj

    r2598 r2673  
    159159    <Compile Include="IO\IOutput.cs" />
    160160    <Compile Include="IO\IThroughput.cs" />
    161     <Compile Include="IO\CryptoolStream.cs" />
    162161    <Compile Include="Properties\AssemblyInfo.cs" />
    163162    <Compile Include="Utils\Graphics\Diagrams\Histogram\HistogramChart.xaml.cs">
  • trunk/CrypPlugins/BooleanFunctionParser/BooleanFunctionParserSettings.cs

    r2334 r2673  
    117117            "Extend the BFP for use as a slave for Cube Attack.",
    118118            1,
    119             DisplayLevel.Experienced,
    120119            ContextMenuControlType.CheckBox,
    121120            null,
     
    126125            1,
    127126            false,
    128             DisplayLevel.Experienced,
    129127            ControlType.CheckBox, "")]
    130128        public bool UseBFPforCube
  • trunk/CrypPlugins/CubeAttack/CubeAttack.cs

    r2529 r2673  
    6060            false,
    6161            false,
    62             DisplayLevel.Beginner,
    6362            QuickWatchFormat.Text,
    6463            null)]
     
    8584            false,
    8685            false,
    87             DisplayLevel.Beginner,
    8886            QuickWatchFormat.Text,
    8987            null)]
  • trunk/CrypPlugins/CubeAttack/CubeAttackSettings.cs

    r889 r2673  
    7272            "Select the cube attack modi",
    7373            1,
    74             DisplayLevel.Beginner,
    7574            ContextMenuControlType.ComboBox,
    7675            null,
     
    8382            1,
    8483            false,
    85             DisplayLevel.Beginner,
    8684            ControlType.ComboBox,
    8785            new string[] { "Preprocessing", "Online", "Manual Public Bit Input" })]
     
    103101            2,
    104102            false,
    105             DisplayLevel.Beginner,
    106103            ControlType.NumericUpDown,
    107104            ValidationType.RangeInteger,
     
    125122            3,
    126123            false,
    127             DisplayLevel.Beginner,
    128124            ControlType.NumericUpDown,
    129125            ValidationType.RangeInteger,
     
    147143            4,
    148144            false,
    149             DisplayLevel.Beginner,
    150145            ControlType.NumericUpDown,
    151146            ValidationType.RangeInteger,
     
    169164            5,
    170165            false,
    171             DisplayLevel.Beginner,
    172166            ControlType.NumericUpDown,
    173167            ValidationType.RangeInteger,
     
    191185            6,
    192186            false,
    193             DisplayLevel.Beginner,
    194187            ControlType.NumericUpDown,
    195188            ValidationType.RangeInteger,
     
    213206            7,
    214207            true,
    215             DisplayLevel.Beginner,
    216208            ControlType.NumericUpDown,
    217209            ValidationType.RangeInteger,
     
    235227            8,
    236228            false,
    237             DisplayLevel.Beginner,
    238229            ControlType.TextBox,
    239230            null)]
     
    259250            "With this checkbox enabled, superpolys will be loaded from the selected File and can be evaluated in the online phase.",
    260251            9,
    261             DisplayLevel.Experienced,
    262252            ContextMenuControlType.CheckBox,
    263253            null,
     
    268258            9,
    269259            false,
    270             DisplayLevel.Beginner,
    271260            ControlType.CheckBox,
    272261            "",
     
    289278            10,
    290279            false,
    291             DisplayLevel.Beginner,
    292280            ControlType.OpenFileDialog,
    293281            FileExtension = "All Files (*.*)|*.*")]
     
    310298            "With this checkbox enabled, log messages will be showed.",
    311299            11,
    312             DisplayLevel.Experienced,
    313300            ContextMenuControlType.CheckBox,
    314301            null,
     
    319306            11,
    320307            false,
    321             DisplayLevel.Beginner,
    322308            ControlType.CheckBox,
    323309            "",
  • trunk/CrypPlugins/Internet_frame_generator/Internet_frame_generator/Internet_frame_generator.cs

    r2529 r2673  
    5151            false,
    5252            false,
    53             DisplayLevel.Beginner,
    5453            QuickWatchFormat.Text,
    5554            "InputIntQuickWatchConverter")]
     
    7069            false,
    7170            false,
    72             DisplayLevel.Beginner,
    7371            QuickWatchFormat.Hex,
    7472            null)]
  • trunk/CrypPlugins/Internet_frame_generator/Internet_frame_generator/Internet_frame_generatorSettings.cs

    r230 r2673  
    2828            "Kind of packets to be generated",
    2929            1,
    30             DisplayLevel.Beginner,
    3130            ContextMenuControlType.ComboBox,
    3231            null,
     
    3736            1,
    3837            true,
    39             DisplayLevel.Beginner,
    4038            ControlType.ComboBox,
    4139            new String[] { "IPv4 packets", "ARP request packets" })]
     
    6260            2,
    6361            false,
    64             DisplayLevel.Beginner,
    6562            ControlType.TextBox,
    6663            ValidationType.RegEx,
  • trunk/CrypPlugins/PKCS5/PKCS5Settings.cs

    r2334 r2673  
    7474    [ContextMenu("Hash Function",
    7575      "Select the hash function (MD5, one out of the SHA family, TIGER or WHIRLPOOL)", 0,
    76       DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null,
     76      ContextMenuControlType.ComboBox, null,
    7777      new string[] { "MD5", "SHA1", "SHA256", "SHA384", "SHA512", "TIGER", "WHIRLPOOL" })]
    7878    [TaskPane("Select hash function",
    7979      "Select the hash function (MD5, one out of the SHA family, TIGER or WHIRLPOOL)", "", 0, true,
    80       DisplayLevel.Beginner, ControlType.ComboBox,
     80      ControlType.ComboBox,
    8181      new string[] { "MD5", "SHA1", "SHA256", "SHA384", "SHA512", "TIGER", "WHIRLPOOL" })]
    8282    public int SHAFunction
     
    104104      "The counter determines how often the hash function is applied." +
    105105      " A value bigger than 1000 is recommended.", "", 1, false,
    106       DisplayLevel.Beginner, ControlType.TextBox, ValidationType.RangeInteger, 1, 9999)]
     106      ControlType.TextBox, ValidationType.RangeInteger, 1, 9999)]
    107107    public int Count
    108108    {
     
    127127    [TaskPane("Length of output key",
    128128      "The length of the output in bits must be a multiple of 8.", "", 2, false,
    129       DisplayLevel.Beginner, ControlType.TextBox, ValidationType.RangeInteger, -64, 2048)]
     129      ControlType.TextBox, ValidationType.RangeInteger, -64, 2048)]
    130130    public int Length
    131131    {
  • trunk/CrypPlugins/PeerToPeerBaseProxy/P2PPeer.cs

    r1665 r2673  
    6666
    6767        [PropertyInfo(Direction.ControlSlave, "Master Peer", "One peer to rule them all", "", true, false,
    68             DisplayLevel.Beginner, QuickWatchFormat.Text, null)]
     68            QuickWatchFormat.Text, null)]
    6969        public IP2PControl P2PControlSlave
    7070        {
  • trunk/CrypPlugins/PlayfairAnalysis/PlayfairAnalysis.cs

    r2334 r2673  
    4242        private string inputString;
    4343        private string outputString;
    44         private List<CryptoolStream> listCryptoolStreamsOut = new List<CryptoolStream>();
    4544        private Thread playFairAttackThread;
    4645        private bool executionStopped;
     
    8685        */
    8786
    88         CryptoolStream csBigraphStatistic;
     87        ICryptoolStream csBigraphStatistic;
    8988        [PropertyInfo(Direction.InputData, "Bigraph Statistic", "Bigraph Statistic from Playfair Analysis Statistic Plugin", null)]
    90         public CryptoolStream CustomLogStat
     89        public ICryptoolStream CustomLogStat
    9190        {
    9291            get
    9392            {
    94                 if (this.csBigraphStatistic != null)
    95                 {
    96                     CryptoolStream cs = new CryptoolStream();
    97                     cs.OpenRead(this.csBigraphStatistic.FileName);
    98                     return cs;
    99                 }
    100                 return null;
     93                return csBigraphStatistic;
    10194            }
    10295
     
    130123
    131124        [PropertyInfo(Direction.OutputData, "CryptoolStream output", "The raw CryptoolStream data after playfair analysis", null)]
    132         public virtual CryptoolStream OutputData
     125        public virtual ICryptoolStream OutputData
    133126        {
    134127            get
    135128            {
    136                 if (outputString != null)
    137                 {
    138                     CryptoolStream cs = new CryptoolStream();
    139                     listCryptoolStreamsOut.Add(cs);
    140                     cs.OpenRead(Encoding.Default.GetBytes(outputString.ToCharArray()));
    141                     return cs;
    142                 }
    143                 else
    144                 {
    145                     return null;
    146                 }
     129                return new CStreamWriter(Encoding.Default.GetBytes(outputString.ToCharArray()));
    147130            }
    148131            set { }
     
    208191                int alphabetLength;
    209192                int offset = 0;
    210                 csBigraphStatistic = CustomLogStat;
    211 
    212                 alphabetLength = (int)csBigraphStatistic.Read(offset, 1)[0];
    213                 matrixSize = (int)(Math.Sqrt(alphabetLength));
    214 
    215                 BigraphStat = new Double[(int)Math.Pow(matrixSize, 2), (int)Math.Pow(matrixSize, 2)];
    216                 byte[] statisticBuffer = new byte[8 * BigraphStat.Length];
    217 
    218                 alphabet = "";
    219                 for (int i = 0; i < alphabetLength; i++)
    220                 {
    221                     alphabet += (char)csBigraphStatistic.Read(offset, 1)[0];
    222                 }
    223 
    224                
    225                 statisticBuffer = csBigraphStatistic.Read(offset, 8 * BigraphStat.Length);
    226                
    227 
    228                 for (int i = 0; i < (int)Math.Pow(matrixSize, 2); i++)
    229                 {                               
    230                     for (int j = 0; j < (int)Math.Pow(matrixSize, 2); j++)
    231                     {                       
    232                         BigraphStat[i, j] = BitConverter.ToDouble(statisticBuffer, offset);
    233                         offset += 8;
    234                     }                               
     193                using (CStreamReader reader = CustomLogStat.CreateReader())
     194                {
     195                    alphabetLength = (int)reader.ReadByte();
     196                    matrixSize = (int)(Math.Sqrt(alphabetLength));
     197
     198                    BigraphStat = new Double[(int)Math.Pow(matrixSize, 2), (int)Math.Pow(matrixSize, 2)];
     199                    byte[] statisticBuffer = new byte[8 * BigraphStat.Length];
     200
     201                    alphabet = "";
     202                    for (int i = 0; i < alphabetLength; i++)
     203                    {
     204                        alphabet += (char)reader.ReadByte();
     205                    }
     206
     207
     208                    reader.ReadFully(statisticBuffer, offset, 8 * BigraphStat.Length);
     209
     210
     211                    for (int i = 0; i < (int)Math.Pow(matrixSize, 2); i++)
     212                    {
     213                        for (int j = 0; j < (int)Math.Pow(matrixSize, 2); j++)
     214                        {
     215                            BigraphStat[i, j] = BitConverter.ToDouble(statisticBuffer, offset);
     216                            offset += 8;
     217                        }
     218                    }
    235219                }
    236220
     
    351335        public void Dispose()
    352336        {
    353             foreach (CryptoolStream stream in listCryptoolStreamsOut)
    354             {
    355                 stream.Close();
    356             }
    357             listCryptoolStreamsOut.Clear();
    358337        }
    359338
  • trunk/CrypPlugins/PlayfairAnalysisStatistic/PlayfairAnalysisStatistic.cs

    r2334 r2673  
    4141        private string sortedAlphabet;
    4242        private double[,] logStat;
    43         private double[] logStat2;
    4443        private byte[] logStatByte;
    4544
     
    7574        */
    7675
    77         CryptoolStream csBigraphStatistic;
     76        ICryptoolStream csBigraphStatistic;
    7877        [PropertyInfo(Direction.OutputData, "Bigraph Statistic", "Bigraph Statistic for Playfair Analysis Plugin", null)]
    79         public CryptoolStream OutputStream
     78        public ICryptoolStream OutputStream
    8079        {
    8180            get
    8281            {
    83                 if (this.csBigraphStatistic != null)
    84                 {
    85                     CryptoolStream cs = new CryptoolStream();
    86                     cs.OpenRead(this.csBigraphStatistic.FileName);
    87                     return cs;
    88                 }
    89                 return null;
     82                return csBigraphStatistic;
    9083            }
    9184
     
    218211                                }
    219212                            }
    220                            
    221 
    222                             csBigraphStatistic = new CryptoolStream();
    223                             csBigraphStatistic.OpenWrite();
    224                              
    225                            
    226 
    227                             csBigraphStatistic.Write(logStatByte);
     213
     214
     215                            csBigraphStatistic = new CStreamWriter(logStatByte);
    228216                            OnPropertyChanged("OutputStream");
    229217
  • trunk/CrypPlugins/PlayfairAnalysisStatistic/Properties/AssemblyInfo.cs

    r2670 r2673  
    66// set of attributes. Change these attribute values to modify the information
    77// associated with an assembly.
    8 [assembly: AssemblyTitle("PlayfairAnalysis")]
     8[assembly: AssemblyTitle("PlayfairAnalysisStatistic")]
    99[assembly: AssemblyDescription("")]
    1010[assembly: AssemblyConfiguration("")]
    1111[assembly: AssemblyCompany("")]
    12 [assembly: AssemblyProduct("PlayfairAnalysis")]
     12[assembly: AssemblyProduct("PlayfairAnalysisStatistic")]
    1313[assembly: AssemblyCopyright("Copyright © 2010")]
    1414[assembly: AssemblyTrademark("")]
  • trunk/CrypPlugins/Twofish/TwofishSetting.cs

    r419 r2673  
    5858    int action = 1;
    5959    [ContextMenu("Action", "Do you want the input data to be encrypted or decrypted?", 2,
    60       DisplayLevel.Beginner, ContextMenuControlType.ComboBox,
     60      ContextMenuControlType.ComboBox,
    6161      new int[] { 1, 2 }, "Encrypt", "Decrypt")]
    6262    [TaskPane("Action",
    6363      "Do you want the input data to be encrypted or decrypted?", "", 0, false,
    64        DisplayLevel.Beginner, ControlType.ComboBox,
     64       ControlType.ComboBox,
    6565       new string[] { "Encrypt", "Decrypt" })]
    6666    public int Action
     
    8383    [ContextMenu("Chaining mode",
    8484          "Select the block cipher mode of operation.", 2,
    85           DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null,
     85          ContextMenuControlType.ComboBox, null,
    8686          new string[] { "Electronic Code Book (ECB)", "Cipher Block Chaining (CBC)" })]
    8787    [TaskPane("Chaining mode", "Select the block cipher mode of operation.", "", 5, false,
    88           DisplayLevel.Experienced, ControlType.ComboBox,
     88          ControlType.ComboBox,
    8989          new string[] {"Electronic Code Book (ECB)", "Cipher Block Chaining (CBC)"} ) ]
    9090    public int Mode
     
    109109      "Select the key size. Note that providing a longer key will result in cutting the overlapping bytes, " +
    110110      "providing a shorter key will result in filling up with zeroes.", 3,
    111       DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, "128 Bits", "192 Bits", "256 Bits")]
     111      ContextMenuControlType.ComboBox, null, "128 Bits", "192 Bits", "256 Bits")]
    112112    [TaskPane("KeySize",
    113113      "Select the key size. Note that providing a longer key will result in cutting the overlapping bytes, "+
    114114      "providing a shorter key will result in filling up with zeroes.", "", 3, false,
    115       DisplayLevel.Beginner, ControlType.ComboBox, new String[] { "128 Bits", "192 Bits", "256 Bits" })]
     115      ControlType.ComboBox, new String[] { "128 Bits", "192 Bits", "256 Bits" })]
    116116    public int KeySize
    117117    {
  • trunk/CrypPlugins/WEP/WEP/WEP.cs

    r2670 r2673  
    6767            false,
    6868            false,
    69             DisplayLevel.Beginner,
    7069            QuickWatchFormat.Hex,
    7170            null)]
     
    9190            true,
    9291            false,
    93             DisplayLevel.Beginner,
    9492            QuickWatchFormat.Hex,
    9593            null)]
     
    110108            false,
    111109            false,
    112             DisplayLevel.Beginner,
    113110            QuickWatchFormat.Hex,
    114111            null)]
  • trunk/CrypPlugins/WEP/WEP/WEPSettings.cs

    r230 r2673  
    2929            "Do you want to encrypt or decrypt data?",
    3030            1,
    31             DisplayLevel.Beginner,
    3231            ContextMenuControlType.ComboBox,
    3332            new int[] { 1, 2 },
     
    3938            1,
    4039            false,
    41             DisplayLevel.Beginner,
    4240            ControlType.ComboBox,
    4341            new String[] { "Encrypt", "Decrypt" })]
  • trunk/CrypPlugins/WEPAttacks/WEPAttacks/WEPAttacks.cs

    r2670 r2673  
    6868            false,
    6969            false,
    70             DisplayLevel.Beginner,
    7170            QuickWatchFormat.Hex,
    7271            null)]
     
    9190            false,
    9291            false,
    93             DisplayLevel.Beginner,
    9492            QuickWatchFormat.Text,
    9593            null)]
     
    110108            false,
    111109            false,
    112             DisplayLevel.Beginner,
    113110            QuickWatchFormat.Hex,
    114111            null)]
  • trunk/CrypPlugins/WEPAttacks/WEPAttacks/WEPAttacksSettings.cs

    r230 r2673  
    2929            "Kind of attack",
    3030            1,
    31             DisplayLevel.Beginner,
    3231            ContextMenuControlType.ComboBox,
    3332            null,
     
    3837            1,
    3938            false,
    40             DisplayLevel.Beginner,
    4139            ControlType.ComboBox,
    4240            new string[] { "\"FMS\"", "\"KoreK\"", "\"PTW\"" })]
     
    6361            2,
    6462            false,
    65             DisplayLevel.Beginner,
    6663            ControlType.CheckBox,
    6764            new string[] { "Data comes from file" })]
     
    9592            3,
    9693            false,
    97             DisplayLevel.Beginner,
    9894            ControlType.RadioButton,
    9995            new string[]{"Data comes from file (finish, if attack is not successful)",
  • trunk/CrypPlugins/WorkspaceManager/Model/Tools/ColorHelper.cs

    r2616 r2673  
    8686            if (typeof(bool).Equals(type) || typeof(bool[]).Equals(type)) return Colors.Maroon;
    8787
    88             if (typeof(CryptoolStream).Equals(type)) return Colors.Orange;
    89             if (typeof(Stream).Equals(type) || typeof(ICryptoolStream).Equals(type)) return Colors.DarkOrange;
     88            if (typeof(ICryptoolStream).Equals(type)) return Colors.Orange;
     89            if (typeof(Stream).Equals(type)) return Colors.DarkOrange;
    9090            if (typeof(string).Equals(type) || typeof(string[]).Equals(type)) return Colors.Gray;
    9191
  • trunk/CrypTool 2.0.sln

    r2649 r2673  
    720720                {0B94492B-6B12-4233-940A-6AF6024BDA74}.Release|x86.Build.0 = Release|x86
    721721                {AA75627F-6087-4DEA-9AAB-F19A7835DD1C}.Debug|x86.ActiveCfg = Debug|x86
     722                {AA75627F-6087-4DEA-9AAB-F19A7835DD1C}.Debug|x86.Build.0 = Debug|x86
    722723                {AA75627F-6087-4DEA-9AAB-F19A7835DD1C}.Release|x86.ActiveCfg = Release|x86
    723724                {4C135886-4BC1-4092-A65E-3BA920876559}.Debug|x86.ActiveCfg = Debug|x86
     725                {4C135886-4BC1-4092-A65E-3BA920876559}.Debug|x86.Build.0 = Debug|x86
    724726                {4C135886-4BC1-4092-A65E-3BA920876559}.Release|x86.ActiveCfg = Release|x86
    725727                {D7C63148-5AEB-41B2-B39D-E21902EF7121}.Debug|x86.ActiveCfg = Debug|x86
Note: See TracChangeset for help on using the changeset viewer.