Merge pull request #46 from gnustep/NSDataAsset_branch

NSDataAsset branch

Headers/AppKit/AppKit.h

@@ -72,6 +72,7 @@
 #import <AppKit/NSControl.h>
 #import <AppKit/NSCursor.h>
 #import <AppKit/NSCustomImageRep.h>
+#import <AppKit/NSDataAsset.h>
 #import <AppKit/NSDataLink.h>
 #import <AppKit/NSDataLinkManager.h>
 #import <AppKit/NSDataLinkPanel.h>

Headers/AppKit/NSDataAsset.h

@@ -0,0 +1,68 @@
+/* Definition of class NSDataAsset
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Fri Jan 17 10:25:34 EST 2020
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#ifndef _NSDataAsset_h_GNUSTEP_GUI_INCLUDE
+#define _NSDataAsset_h_GNUSTEP_GUI_INCLUDE
+
+#import <Foundation/NSObject.h>
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_11, GS_API_LATEST)
+
+#if	defined(__cplusplus)
+extern "C" {
+#endif
+
+@class NSData, NSBundle, NSString; 
+  
+typedef NSString* NSDataAssetName;
+  
+@interface NSDataAsset : NSObject <NSCopying>
+{
+  NSDataAssetName _name;
+  NSBundle *_bundle;
+  NSData *_data;
+  NSString *_typeIdentifier;
+}
+  
+// Initializing the Data Asset
+- (instancetype) initWithName: (NSDataAssetName)name;
+- (instancetype) initWithName: (NSDataAssetName)name bundle: (NSBundle *)bundle;
+
+// Accessing data...
+- (NSData *) data;
+
+// Getting data asset information
+- (NSDataAssetName) name;
+- (NSString *) typeIdentifier;
+
+@end
+
+#if	defined(__cplusplus)
+}
+#endif
+
+#endif	/* GS_API_MACOSX */
+
+#endif	/* _NSDataAsset_h_GNUSTEP_GUI_INCLUDE */
+

MISSING

@@ -13,7 +13,6 @@ MISSING HEADERS
 > NSCollectionViewLayout.h
 > NSCollectionViewTransitionLayout.h
 > NSColorSampler.h
-> NSDataAsset.h
 > NSDictionaryController.h
 > NSDiffableDataSource.h
 > NSDraggingItem.h

Source/GNUmakefile

@@ -90,6 +90,7 @@ NSController.m \
 NSCursor.m \
 NSCustomImageRep.m \
 NSCustomTouchBarItem.m \
+NSDataAsset.m \
 NSDataLink.m \
 NSDataLinkManager.m \
 NSDataLinkPanel.m \
@@ -379,6 +380,7 @@ NSController.h \
 NSCursor.h \
 NSCustomImageRep.h \
 NSCustomTouchBarItem.h \
+NSDataAsset.h \
 NSDataLink.h \
 NSDataLinkManager.h \
 NSDataLinkPanel.h \

Source/NSDataAsset.m

@@ -0,0 +1,85 @@
+/* Implementation of class NSDataAsset
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Fri Jan 17 10:25:34 EST 2020
+
+   This file is part of the GNUstep Library.
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
+*/
+
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSData.h>
+#import <AppKit/NSDataAsset.h>
+
+@implementation NSDataAsset
+
+// Initializing the Data Asset
+- (instancetype) initWithName: (NSDataAssetName)name
+{
+  return [self initWithName: name bundle: nil];
+}
+
+- (instancetype) initWithName: (NSDataAssetName)name bundle: (NSBundle *)bundle
+{
+  self = [super init];
+  if (self != nil)
+    {
+      ASSIGNCOPY(_name, name);
+      ASSIGN(_bundle, bundle);
+      _data = nil;
+      _typeIdentifier = nil;
+    }
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(_name);
+  RELEASE(_bundle);
+  RELEASE(_data);
+  RELEASE(_typeIdentifier);
+  [super dealloc];
+}
+
+- (id) copyWithZone: (NSZone *)zone
+{
+  NSDataAsset *copy = [[NSDataAsset allocWithZone: zone] initWithName: _name bundle: _bundle];
+  ASSIGNCOPY(copy->_data, _data);
+  ASSIGNCOPY(copy->_typeIdentifier, _typeIdentifier);
+  return copy;
+}
+
+// Accessing data...
+- (NSData *) data
+{
+  return _data;
+}
+
+// Getting data asset information
+- (NSDataAssetName) name
+{
+  return _name;
+}
+
+- (NSString *) typeIdentifier
+{
+  return _typeIdentifier;
+}
+@end
+