- Timestamp:
- 01/21/15 10:12:08 (10 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
/branches/CodeEditor (added) merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Operators.Programmable.Views/3.3/HeuristicLab.Operators.Programmable.Views-3.3.csproj
r11623 r11807 128 128 </ItemGroup> 129 129 <ItemGroup> 130 <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3. 3\HeuristicLab.CodeEditor-3.3.csproj">131 <Project>{ 489CFE09-FDF7-4C89-BAB5-BD09CADD61AD}</Project>132 <Name>HeuristicLab.CodeEditor-3. 3</Name>130 <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj"> 131 <Project>{C38691AE-ECB4-489A-A05D-B035554E0168}</Project> 132 <Name>HeuristicLab.CodeEditor-3.4</Name> 133 133 <Private>False</Private> 134 134 </ProjectReference> -
trunk/sources/HeuristicLab.Operators.Programmable.Views/3.3/Plugin.cs.frame
r11174 r11807 28 28 [Plugin("HeuristicLab.Operators.Programmable.Views", "3.3.10.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Operators.Programmable.Views-3.3.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.CodeEditor", "3. 3")]30 [PluginDependency("HeuristicLab.CodeEditor", "3.4")] 31 31 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 32 32 [PluginDependency("HeuristicLab.Core", "3.3")] -
trunk/sources/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs
r11171 r11807 82 82 base.OnContentChanged(); 83 83 if (ProgrammableOperator == null) { 84 codeEditor.UserCode = "";84 codeEditor.UserCode = string.Empty; 85 85 assembliesTreeView.Nodes.Clear(); 86 86 parameterCollectionView.Content = null; 87 87 } else { 88 88 codeEditor.Prefix = GetGeneratedPrefix(); 89 codeEditor.Suffix = String.Format(" {0} \n }}\n}}", ProgrammableOperator.MethodSuffix);89 codeEditor.Suffix = String.Format(" {0}{1} }}{1}}}", ProgrammableOperator.MethodSuffix, Environment.NewLine); 90 90 codeEditor.UserCode = ProgrammableOperator.Code; 91 if (codeEditor.UserCode == "")92 codeEditor.UserCode = " \n \n \n \n";91 if (codeEditor.UserCode == string.Empty) 92 codeEditor.UserCode = string.Format(" {0}", Environment.NewLine); 93 93 InitializeAssemblyList(); 94 94 InitializeNamespacesList(); 95 foreach (var a in ProgrammableOperator.SelectedAssemblies) { 96 codeEditor.AddAssembly(a); 97 } 95 codeEditor.AddAssemblies(ProgrammableOperator.SelectedAssemblies); 98 96 codeEditor.ScrollAfterPrefix(); 99 codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors, "ProgrammableOperator"); 100 showCodeButton.Enabled = 101 ProgrammableOperator.CompilationUnitCode != null && 102 ProgrammableOperator.CompilationUnitCode.Length > 0; 97 codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors); 98 showCodeButton.Enabled = !string.IsNullOrEmpty(ProgrammableOperator.CompilationUnitCode); 103 99 parameterCollectionView.Content = ProgrammableOperator.Parameters; 104 100 if (ProgrammableOperator.CompileErrors == null) {
Note: See TracChangeset
for help on using the changeset viewer.