From 0bb3949faaf4641b5a05436c8379865b78061ffc Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Fri, 27 Jun 2014 08:35:44 +0000
Subject: [PATCH] IDE: move a piece of common code to TSourceEditorManager.

git-svn-id: trunk@45688 -
---
 ide/sourceeditor.pp       |  7 +++++++
 ide/sourcefilemanager.pas | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index bb53c1d4df..4b63425345 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -1057,6 +1057,7 @@ type
     property SourceEditors[Index: integer]: TSourceEditor read GetSrcEditors;   // reintroduced
     property  SourceEditorsByPage[WindowIndex, PageIndex: integer]: TSourceEditor
               read GetSourceEditorsByPage;
+    procedure SetWindowByIDAndPage(AWindowID, APageIndex: integer);
     function  SourceEditorIntfWithFilename(const Filename: string): TSourceEditor; reintroduce;
     function FindSourceEditorWithEditorComponent(EditorComp: TComponent): TSourceEditor; // With SynEdit
   protected
@@ -9677,6 +9678,12 @@ begin
   Result := TSourceEditor(ActiveEditor);
 end;
 
+procedure TSourceEditorManager.SetWindowByIDAndPage(AWindowID, APageIndex: integer);
+begin
+  ActiveSourceWindowIndex := IndexOfSourceWindowWithID(AWindowID);
+  ActiveSourceWindow.PageIndex:= APageIndex;
+end;
+
 function TSourceEditorManager.SourceEditorIntfWithFilename(
   const Filename: string): TSourceEditor;
 begin
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 60d08ca1f6..0f768700a6 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -400,8 +400,7 @@ begin
 
     if FNewUnitInfo.OpenEditorInfoCount > 0 then begin
       FNewEditorInfo := FNewUnitInfo.OpenEditorInfo[0];
-      SourceEditorManager.ActiveSourceWindowIndex := SourceEditorManager.IndexOfSourceWindowWithID(FNewEditorInfo.WindowID);
-      SourceEditorManager.ActiveSourceWindow.PageIndex:= FNewEditorInfo.PageIndex;
+      SourceEditorManager.SetWindowByIDAndPage(FNewEditorInfo.WindowID, FNewEditorInfo.PageIndex);
     end
     else begin
       FNewEditorInfo := FNewUnitInfo.GetClosedOrNewEditorInfo;
@@ -468,7 +467,6 @@ begin
   exit(mrOK);
 end;
 
-
 function TFileOpenClose.PrepareFile: TModalResult;
 begin
   FUnitIndex:=Project1.IndexOfFilename(FFilename);
@@ -486,15 +484,11 @@ begin
   Result := mrOK;
 end;
 
-
 function TFileOpenClose.ChangeEditorPage: TModalResult;
 // file already open -> change source notebook page
 begin
   //DebugLn(['TFileOpenClose.ChangeEditorPage file already open ',FNewUnitInfo.Filename,' WindowIndex=',FNewEditorInfo.WindowID,' PageIndex=',FNewEditorInfo.PageIndex]);
-  with SourceEditorManager do begin
-    ActiveSourceWindowIndex := IndexOfSourceWindowWithID(FNewEditorInfo.WindowID);
-    ActiveSourceWindow.PageIndex:= FNewEditorInfo.PageIndex;
-  end;
+  SourceEditorManager.SetWindowByIDAndPage(FNewEditorInfo.WindowID, FNewEditorInfo.PageIndex);
   if ofDoLoadResource in FFlags then
     Result:=OpenResource
   else