From f44e640e8ba072e4901fcef321fb6698c2ebcb55 Mon Sep 17 00:00:00 2001
From: Sergii Stoian <stoyan255@gmail.com>
Date: Mon, 3 Jan 2005 12:30:47 +0000
Subject: [PATCH] Fixed bug #11448. Fixed bug with editor on close.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@20516 72102866-910b-0410-8b05-ffd578937521
---
 Documentation/ChangeLog   |  7 +++++++
 Library/PCEditor.m        |  4 ++--
 Library/PCProjectEditor.m | 12 +++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog
index 2974658..b2737e9 100644
--- a/Documentation/ChangeLog
+++ b/Documentation/ChangeLog
@@ -20,6 +20,13 @@
 	* Modules/ApplicationProject/Resources/Main.gorm: Connect delegate to
 	AppController (bug #11478).
 
+	* Library/PCProjectEditor.m:
+	(editorForFile:categoryPath:windowed:): Call orderFrontEditorForFile:
+	to show already opened file (bug #11448).
+
+	* Library/PCEditor.m:
+	(_createEditorViewWithFrame:): Remove return of autoreleased ivar.
+
 2004-12-24 Serg Stoyan <stoyan255@ukr.net>
 
 	* "Build Tool" setting from Project Inspector was moved to PC 
diff --git a/Library/PCEditor.m b/Library/PCEditor.m
index eddd2f3..1a120e0 100644
--- a/Library/PCEditor.m
+++ b/Library/PCEditor.m
@@ -138,7 +138,7 @@
 
   [[ev textContainer] setContainerSize:NSMakeSize(fr.size.width, 1e7)];
 
-  return AUTORELEASE(ev);
+  return ev;
 }
 
 @end
@@ -283,7 +283,7 @@
 - (void)dealloc
 {
 #ifdef DEVELOPMENT
-  NSLog(@"PCEditor: dealloc");
+  NSLog(@"PCEditor: %@ dealloc", _path);
 #endif
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
diff --git a/Library/PCProjectEditor.m b/Library/PCProjectEditor.m
index 5efbd33..dea63a2 100644
--- a/Library/PCProjectEditor.m
+++ b/Library/PCProjectEditor.m
@@ -257,10 +257,8 @@ NSString *PCEditorDidResignActiveNotification =
     }
 
   [editor setWindowed:yn];
-  if (yn)
-    {
-      [editor show];
-    }
+
+  [self orderFrontEditorForFile:path];
 
   return editor;
 }
@@ -486,10 +484,10 @@ NSString *PCEditorDidResignActiveNotification =
     }
   else
     {
-      [[project projectBrowser] reloadLastColumnAndNotify:YES];
-
-      [[project projectWindow] makeFirstResponder:scrollView];
       [componentView setContentView:scrollView];
+      [[project projectWindow] makeFirstResponder:scrollView];
+
+      [[project projectBrowser] reloadLastColumnAndNotify:YES];
     }
 }