Changeset 12515 for branches/HiveStatistics/sources/HeuristicLab.Operators.Programmable.Views/3.3

Timestamp:

06/25/15 18:21:19 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Operators.Programmable.Views/3.3

Files:

• ProgrammableOperatorView.Designer.cs (modified) (2 diffs)
• ProgrammableOperatorView.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.Designer.cs

@@ -55 +55 @@
       this.showCodeButton = new System.Windows.Forms.Button();
       this.compileButton = new System.Windows.Forms.Button();
+#if __MonoCS__
+      this.codeEditor = new HeuristicLab.CodeEditor.SimpleCodeEditor();
+#else
       this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
+#endif
       this.tabControl1 = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -324 +328 @@
     private HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
     private System.Windows.Forms.SplitContainer splitContainer1;
-    private HeuristicLab.CodeEditor.CodeEditor codeEditor;
+    private HeuristicLab.CodeEditor.CodeEditorBase codeEditor;
     private System.Windows.Forms.Button compileButton;
     private System.Windows.Forms.Button showCodeButton;

branches/HiveStatistics/sources/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs

@@ -131 +131 @@
     }
     private void showCodeButton_Click(object sender, EventArgs e) {
+#if __MonoCS__
+      new TextDialog("CodeViewer", ProgrammableOperator.CompilationUnitCode, true).ShowDialog(this);
+#else
       new CodeViewer(ProgrammableOperator.CompilationUnitCode).ShowDialog(this);
+#endif
     }
     private void codeEditor_Validated(object sender, EventArgs e) {
@@ -199 +203 @@
       try {
         ProgrammableOperator.Compile();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         ErrorHandling.ShowErrorDialog(this, ex);
       }