Fix bug #28644

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@37931 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2014-05-31 10:58-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* GormCore/GormDocumentController.h: add declaration of
+	openDocumentForContentsOfURL:
+	* GormCore/GormDocumentController.m: add implementation of
+	openDocumentForContentsOfURL:
+	* GormCore/GormDocument.m: Add implementation of revertContentsOfURL:..
+	Fix bug#28644
+
 2014-05-30 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
 	* Palettes/2Controls/GormColorWellAttributesInspector.h
 	  fix typo in header guard
@@ -12,6 +21,7 @@
 	* GormCore/GormInspectorsManager.m
 	Explicitely cast NSIntegers to avoid warning and problems.
 
+>>>>>>> .r37930
 2014-05-27 03:26-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* GormCore/GormInspectorsManager.m

GormCore/GormDocument.m

@@ -54,6 +54,7 @@
 #include "GormWrapperBuilder.h"
 #include "GormWrapperLoader.h"
 #include "GormDocumentWindow.h"
+#include "GormDocumentController.h"
 
 @interface GormDisplayCell : NSButtonCell
 @end
@@ -3628,6 +3629,19 @@ static void _real_close(GormDocument *self,
   [filePrefsManager setFileTypeName: type];
 }
 
+- (BOOL) revertToContentsOfURL: (NSURL *)url
+                        ofType: (NSString *)type
+                         error: (NSError **)error
+{
+  GormDocumentController *dc = [NSDocumentController sharedDocumentController];
+  
+  // [dc performSelector:@selector(openDocumentWithContentsOfURL:) withObject:url afterDelay:2];
+  [self close];
+  [dc openDocumentWithContentsOfURL:url];
+
+  return YES;
+}
+
 //// PRIVATE METHODS...
 
 - (NSString *) classForObject: (id)obj

GormCore/GormDocumentController.h

@@ -44,6 +44,7 @@ typedef enum
 }
 
 - (void) buildDocumentForType: (GormDocumentType)documentType;
+- (id) openDocumentWithContentsOfURL:(NSURL *)url;
 
 @end
 

GormCore/GormDocumentController.m

@@ -200,4 +200,9 @@
   [super newDocument: sender];
   [self buildDocumentForType: documentType];
 }
+
+- (id) openDocumentWithContentsOfURL:(NSURL *)url
+{
+  return  [self openDocumentWithContentsOfURL:url display:YES];
+}
 @end