diff --git a/openbis-ipad/openBIS/Research/openBISData/main.m b/openbis-ipad/openBIS/Research/openBISData/main.m new file mode 100644 index 0000000000000000000000000000000000000000..81b29525d7694ec57ea8fda572a319e46181a642 --- /dev/null +++ b/openbis-ipad/openBIS/Research/openBISData/main.m @@ -0,0 +1,70 @@ +// +// main.m +// openBISData +// +// Created by Ramakrishnan Chandrasekhar on 10/3/12. +// Copyright (c) 2012 ETHZ, CISD. All rights reserved. +// + +static NSManagedObjectModel *managedObjectModel() +{ + static NSManagedObjectModel *model = nil; + if (model != nil) { + return model; + } + + NSString *path = @"openBISData"; + path = [path stringByDeletingPathExtension]; + NSURL *modelURL = [NSURL fileURLWithPath:[path stringByAppendingPathExtension:@"momd"]]; + model = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL]; + + return model; +} + +static NSManagedObjectContext *managedObjectContext() +{ + static NSManagedObjectContext *context = nil; + if (context != nil) { + return context; + } + + @autoreleasepool { + context = [[NSManagedObjectContext alloc] init]; + + NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:managedObjectModel()]; + [context setPersistentStoreCoordinator:coordinator]; + + NSString *STORE_TYPE = NSSQLiteStoreType; + + NSString *path = [[NSProcessInfo processInfo] arguments][0]; + path = [path stringByDeletingPathExtension]; + NSURL *url = [NSURL fileURLWithPath:[path stringByAppendingPathExtension:@"sqlite"]]; + + NSError *error; + NSPersistentStore *newStore = [coordinator addPersistentStoreWithType:STORE_TYPE configuration:nil URL:url options:nil error:&error]; + + if (newStore == nil) { + NSLog(@"Store Configuration Failure %@", ([error localizedDescription] != nil) ? [error localizedDescription] : @"Unknown Error"); + } + } + return context; +} + +int main(int argc, const char * argv[]) +{ + + @autoreleasepool { + // Create the managed object context + NSManagedObjectContext *context = managedObjectContext(); + + // Custom code here... + // Save the managed object context + NSError *error = nil; + if (![context save:&error]) { + NSLog(@"Error while saving %@", ([error localizedDescription] != nil) ? [error localizedDescription] : @"Unknown Error"); + exit(1); + } + } + return 0; +} + diff --git a/openbis-ipad/openBIS/Research/openBISData/openBISData-Prefix.pch b/openbis-ipad/openBIS/Research/openBISData/openBISData-Prefix.pch new file mode 100644 index 0000000000000000000000000000000000000000..809826ab04380907c989ffd222c001d3880072df --- /dev/null +++ b/openbis-ipad/openBIS/Research/openBISData/openBISData-Prefix.pch @@ -0,0 +1,8 @@ +// +// Prefix header for all source files of the 'openBISData' target in the 'openBISData' project +// + +#ifdef __OBJC__ + #import <Foundation/Foundation.h> + #import <CoreData/CoreData.h> +#endif diff --git a/openbis-ipad/openBIS/Research/openBISData/openBISData.1 b/openbis-ipad/openBIS/Research/openBISData/openBISData.1 new file mode 100644 index 0000000000000000000000000000000000000000..a8d05c54f549143f046a975f74c4c998627373a0 --- /dev/null +++ b/openbis-ipad/openBIS/Research/openBISData/openBISData.1 @@ -0,0 +1,79 @@ +.\"Modified from man(1) of FreeBSD, the NetBSD mdoc.template, and mdoc.samples. +.\"See Also: +.\"man mdoc.samples for a complete listing of options +.\"man mdoc for the short list of editing options +.\"/usr/share/misc/mdoc.template +.Dd 10/3/12 \" DATE +.Dt openBISData 1 \" Program name and manual section number +.Os Darwin +.Sh NAME \" Section Header - required - don't modify +.Nm openBISData, +.\" The following lines are read in generating the apropos(man -k) database. Use only key +.\" words here as the database is built based on the words here and in the .ND line. +.Nm Other_name_for_same_program(), +.Nm Yet another name for the same program. +.\" Use .Nm macro to designate other names for the documented program. +.Nd This line parsed for whatis database. +.Sh SYNOPSIS \" Section Header - required - don't modify +.Nm +.Op Fl abcd \" [-abcd] +.Op Fl a Ar path \" [-a path] +.Op Ar file \" [file] +.Op Ar \" [file ...] +.Ar arg0 \" Underlined argument - use .Ar anywhere to underline +arg2 ... \" Arguments +.Sh DESCRIPTION \" Section Header - required - don't modify +Use the .Nm macro to refer to your program throughout the man page like such: +.Nm +Underlining is accomplished with the .Ar macro like this: +.Ar underlined text . +.Pp \" Inserts a space +A list of items with descriptions: +.Bl -tag -width -indent \" Begins a tagged list +.It item a \" Each item preceded by .It macro +Description of item a +.It item b +Description of item b +.El \" Ends the list +.Pp +A list of flags and their descriptions: +.Bl -tag -width -indent \" Differs from above in tag removed +.It Fl a \"-a flag as a list item +Description of -a flag +.It Fl b +Description of -b flag +.El \" Ends the list +.Pp +.\" .Sh ENVIRONMENT \" May not be needed +.\" .Bl -tag -width "ENV_VAR_1" -indent \" ENV_VAR_1 is width of the string ENV_VAR_1 +.\" .It Ev ENV_VAR_1 +.\" Description of ENV_VAR_1 +.\" .It Ev ENV_VAR_2 +.\" Description of ENV_VAR_2 +.\" .El +.Sh FILES \" File used or created by the topic of the man page +.Bl -tag -width "/Users/joeuser/Library/really_long_file_name" -compact +.It Pa /usr/share/file_name +FILE_1 description +.It Pa /Users/joeuser/Library/really_long_file_name +FILE_2 description +.El \" Ends the list +.\" .Sh DIAGNOSTICS \" May not be needed +.\" .Bl -diag +.\" .It Diagnostic Tag +.\" Diagnostic informtion here. +.\" .It Diagnostic Tag +.\" Diagnostic informtion here. +.\" .El +.Sh SEE ALSO +.\" List links in ascending order by section, alphabetically within a section. +.\" Please do not reference files that do not exist without filing a bug report +.Xr a 1 , +.Xr b 1 , +.Xr c 1 , +.Xr a 2 , +.Xr b 2 , +.Xr a 3 , +.Xr b 3 +.\" .Sh BUGS \" Document known, unremedied bugs +.\" .Sh HISTORY \" Document history if command behaves in a unique manner \ No newline at end of file diff --git a/openbis-ipad/openBIS/Research/openBISData/openBISData.xcdatamodeld/.xccurrentversion b/openbis-ipad/openBIS/Research/openBISData/openBISData.xcdatamodeld/.xccurrentversion new file mode 100644 index 0000000000000000000000000000000000000000..0c67376ebacb410fd873cac1d8d8dd431b262c02 --- /dev/null +++ b/openbis-ipad/openBIS/Research/openBISData/openBISData.xcdatamodeld/.xccurrentversion @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict/> +</plist> diff --git a/openbis-ipad/openBIS/Research/readme.md b/openbis-ipad/openBIS/Research/readme.md new file mode 100644 index 0000000000000000000000000000000000000000..f6418e1e9875ef5771d80b883c2ccd8ca4961164 --- /dev/null +++ b/openbis-ipad/openBIS/Research/readme.md @@ -0,0 +1,4 @@ +Summary +======= + +This folder contains some code that is used to test out ideas. It is not intended for use in production. \ No newline at end of file diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj b/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj index 6ec4e996bcdecbb2915357afdb5762003271d6c9..e534f95ca50414c30426b68bbba3cf1d30e877d5 100644 --- a/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj +++ b/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj @@ -28,6 +28,18 @@ 36F71EAB161C3AEA00C87277 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F71E7E161C3AE900C87277 /* CoreData.framework */; }; 36F71EB3161C3AEA00C87277 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 36F71EB1161C3AEA00C87277 /* InfoPlist.strings */; }; 36F71EB6161C3AEA00C87277 /* openBISTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71EB5161C3AEA00C87277 /* openBISTests.m */; }; + 36F71EE4161C453D00C87277 /* CISDOBAsyncCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ECC161C453D00C87277 /* CISDOBAsyncCall.m */; }; + 36F71EE5161C453D00C87277 /* CISDOBConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ECE161C453D00C87277 /* CISDOBConnection.m */; }; + 36F71EE6161C453D00C87277 /* CISDOBIpadEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED0161C453D00C87277 /* CISDOBIpadEntity.m */; }; + 36F71EE7161C453D00C87277 /* CISDOBIpadService.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED2161C453D00C87277 /* CISDOBIpadService.m */; }; + 36F71EE8161C453D00C87277 /* CISDOBJsonRpcCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED4161C453D00C87277 /* CISDOBJsonRpcCall.m */; }; + 36F71EE9161C453D00C87277 /* persistent-data-model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED6161C453D00C87277 /* persistent-data-model.xcdatamodeld */; }; + 36F71EEA161C453D00C87277 /* readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 36F71ED8161C453D00C87277 /* readme.md */; }; + 36F71F16161C4AA000C87277 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F71E7E161C3AE900C87277 /* CoreData.framework */; }; + 36F71F17161C4AA000C87277 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F71E7A161C3AE900C87277 /* Foundation.framework */; }; + 36F71F1A161C4AA000C87277 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71F19161C4AA000C87277 /* main.m */; }; + 36F71F21161C4AA000C87277 /* openBISData.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 36F71F20161C4AA000C87277 /* openBISData.1 */; }; + 36F71F26161C4AE900C87277 /* readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 36F71F25161C4AE900C87277 /* readme.md */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,6 +52,19 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 36F71F12161C4AA000C87277 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + 36F71F21161C4AA000C87277 /* openBISData.1 in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 36F71E74161C3AE900C87277 /* openBIS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = openBIS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 36F71E78161C3AE900C87277 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -68,6 +93,24 @@ 36F71EB2161C3AEA00C87277 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 36F71EB4161C3AEA00C87277 /* openBISTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = openBISTests.h; sourceTree = "<group>"; }; 36F71EB5161C3AEA00C87277 /* openBISTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = openBISTests.m; sourceTree = "<group>"; }; + 36F71ECB161C453D00C87277 /* CISDOBAsyncCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBAsyncCall.h; sourceTree = "<group>"; }; + 36F71ECC161C453D00C87277 /* CISDOBAsyncCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBAsyncCall.m; sourceTree = "<group>"; }; + 36F71ECD161C453D00C87277 /* CISDOBConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBConnection.h; sourceTree = "<group>"; }; + 36F71ECE161C453D00C87277 /* CISDOBConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBConnection.m; sourceTree = "<group>"; }; + 36F71ECF161C453D00C87277 /* CISDOBIpadEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBIpadEntity.h; sourceTree = "<group>"; }; + 36F71ED0161C453D00C87277 /* CISDOBIpadEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBIpadEntity.m; sourceTree = "<group>"; }; + 36F71ED1161C453D00C87277 /* CISDOBIpadService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBIpadService.h; sourceTree = "<group>"; }; + 36F71ED2161C453D00C87277 /* CISDOBIpadService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBIpadService.m; sourceTree = "<group>"; }; + 36F71ED3161C453D00C87277 /* CISDOBJsonRpcCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBJsonRpcCall.h; sourceTree = "<group>"; }; + 36F71ED4161C453D00C87277 /* CISDOBJsonRpcCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBJsonRpcCall.m; sourceTree = "<group>"; }; + 36F71ED5161C453D00C87277 /* CISDOBShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBShared.h; sourceTree = "<group>"; }; + 36F71ED7161C453D00C87277 /* persistent-data-model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "persistent-data-model.xcdatamodel"; sourceTree = "<group>"; }; + 36F71ED8161C453D00C87277 /* readme.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = readme.md; sourceTree = "<group>"; }; + 36F71F14161C4AA000C87277 /* openBISData */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = openBISData; sourceTree = BUILT_PRODUCTS_DIR; }; + 36F71F19161C4AA000C87277 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; + 36F71F1C161C4AA000C87277 /* openBISData-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "openBISData-Prefix.pch"; sourceTree = "<group>"; }; + 36F71F20161C4AA000C87277 /* openBISData.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = openBISData.1; sourceTree = "<group>"; }; + 36F71F25161C4AE900C87277 /* readme.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = readme.md; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -93,14 +136,25 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 36F71F11161C4AA000C87277 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 36F71F16161C4AA000C87277 /* CoreData.framework in Frameworks */, + 36F71F17161C4AA000C87277 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 36F71E69161C3AE900C87277 = { isa = PBXGroup; children = ( + 36F71EC9161C453D00C87277 /* BisKit */, 36F71E80161C3AE900C87277 /* openBIS */, 36F71EAE161C3AEA00C87277 /* openBISTests */, + 36F71EFA161C492600C87277 /* Research */, 36F71E77161C3AE900C87277 /* Frameworks */, 36F71E75161C3AE900C87277 /* Products */, ); @@ -111,6 +165,7 @@ children = ( 36F71E74161C3AE900C87277 /* openBIS.app */, 36F71EA6161C3AEA00C87277 /* openBISTests.octest */, + 36F71F14161C4AA000C87277 /* openBISData */, ); name = Products; sourceTree = "<group>"; @@ -177,6 +232,62 @@ name = "Supporting Files"; sourceTree = "<group>"; }; + 36F71EC9161C453D00C87277 /* BisKit */ = { + isa = PBXGroup; + children = ( + 36F71ED8161C453D00C87277 /* readme.md */, + 36F71ECA161C453D00C87277 /* Classes */, + ); + name = BisKit; + path = ../BisKit; + sourceTree = "<group>"; + }; + 36F71ECA161C453D00C87277 /* Classes */ = { + isa = PBXGroup; + children = ( + 36F71ECB161C453D00C87277 /* CISDOBAsyncCall.h */, + 36F71ECC161C453D00C87277 /* CISDOBAsyncCall.m */, + 36F71ECD161C453D00C87277 /* CISDOBConnection.h */, + 36F71ECE161C453D00C87277 /* CISDOBConnection.m */, + 36F71ECF161C453D00C87277 /* CISDOBIpadEntity.h */, + 36F71ED0161C453D00C87277 /* CISDOBIpadEntity.m */, + 36F71ED1161C453D00C87277 /* CISDOBIpadService.h */, + 36F71ED2161C453D00C87277 /* CISDOBIpadService.m */, + 36F71ED3161C453D00C87277 /* CISDOBJsonRpcCall.h */, + 36F71ED4161C453D00C87277 /* CISDOBJsonRpcCall.m */, + 36F71ED5161C453D00C87277 /* CISDOBShared.h */, + 36F71ED6161C453D00C87277 /* persistent-data-model.xcdatamodeld */, + ); + path = Classes; + sourceTree = "<group>"; + }; + 36F71EFA161C492600C87277 /* Research */ = { + isa = PBXGroup; + children = ( + 36F71F25161C4AE900C87277 /* readme.md */, + 36F71F18161C4AA000C87277 /* openBISData */, + ); + path = Research; + sourceTree = "<group>"; + }; + 36F71F18161C4AA000C87277 /* openBISData */ = { + isa = PBXGroup; + children = ( + 36F71F19161C4AA000C87277 /* main.m */, + 36F71F20161C4AA000C87277 /* openBISData.1 */, + 36F71F1B161C4AA000C87277 /* Supporting Files */, + ); + path = openBISData; + sourceTree = "<group>"; + }; + 36F71F1B161C4AA000C87277 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 36F71F1C161C4AA000C87277 /* openBISData-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -216,6 +327,23 @@ productReference = 36F71EA6161C3AEA00C87277 /* openBISTests.octest */; productType = "com.apple.product-type.bundle"; }; + 36F71F13161C4AA000C87277 /* openBISData */ = { + isa = PBXNativeTarget; + buildConfigurationList = 36F71F22161C4AA000C87277 /* Build configuration list for PBXNativeTarget "openBISData" */; + buildPhases = ( + 36F71F10161C4AA000C87277 /* Sources */, + 36F71F11161C4AA000C87277 /* Frameworks */, + 36F71F12161C4AA000C87277 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = openBISData; + productName = openBISData; + productReference = 36F71F14161C4AA000C87277 /* openBISData */; + productType = "com.apple.product-type.tool"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -240,6 +368,7 @@ targets = ( 36F71E73161C3AE900C87277 /* openBIS */, 36F71EA5161C3AEA00C87277 /* openBISTests */, + 36F71F13161C4AA000C87277 /* openBISData */, ); }; /* End PBXProject section */ @@ -255,6 +384,8 @@ 36F71E91161C3AE900C87277 /* Default-568h@2x.png in Resources */, 36F71E94161C3AE900C87277 /* MainStoryboard_iPhone.storyboard in Resources */, 36F71E97161C3AE900C87277 /* MainStoryboard_iPad.storyboard in Resources */, + 36F71EEA161C453D00C87277 /* readme.md in Resources */, + 36F71F26161C4AE900C87277 /* readme.md in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -294,6 +425,12 @@ 36F71E9A161C3AE900C87277 /* openBIS.xcdatamodeld in Sources */, 36F71E9D161C3AE900C87277 /* CISDOBMasterViewController.m in Sources */, 36F71EA0161C3AE900C87277 /* CISDOBDetailViewController.m in Sources */, + 36F71EE4161C453D00C87277 /* CISDOBAsyncCall.m in Sources */, + 36F71EE5161C453D00C87277 /* CISDOBConnection.m in Sources */, + 36F71EE6161C453D00C87277 /* CISDOBIpadEntity.m in Sources */, + 36F71EE7161C453D00C87277 /* CISDOBIpadService.m in Sources */, + 36F71EE8161C453D00C87277 /* CISDOBJsonRpcCall.m in Sources */, + 36F71EE9161C453D00C87277 /* persistent-data-model.xcdatamodeld in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -305,6 +442,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 36F71F10161C4AA000C87277 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 36F71F1A161C4AA000C87277 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -373,7 +518,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -394,7 +539,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -458,6 +603,36 @@ }; name = Release; }; + 36F71F23161C4AA000C87277 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "Research/openBISData/openBISData-Prefix.pch"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + MACOSX_DEPLOYMENT_TARGET = 10.7; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Debug; + }; + 36F71F24161C4AA000C87277 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "Research/openBISData/openBISData-Prefix.pch"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -477,6 +652,7 @@ 36F71EBB161C3AEA00C87277 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 36F71EBC161C3AEA00C87277 /* Build configuration list for PBXNativeTarget "openBISTests" */ = { isa = XCConfigurationList; @@ -485,6 +661,15 @@ 36F71EBE161C3AEA00C87277 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 36F71F22161C4AA000C87277 /* Build configuration list for PBXNativeTarget "openBISData" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 36F71F23161C4AA000C87277 /* Debug */, + 36F71F24161C4AA000C87277 /* Release */, + ); + defaultConfigurationIsVisible = 0; }; /* End XCConfigurationList section */ @@ -499,6 +684,16 @@ sourceTree = "<group>"; versionGroupType = wrapper.xcdatamodel; }; + 36F71ED6161C453D00C87277 /* persistent-data-model.xcdatamodeld */ = { + isa = XCVersionGroup; + children = ( + 36F71ED7161C453D00C87277 /* persistent-data-model.xcdatamodel */, + ); + currentVersion = 36F71ED7161C453D00C87277 /* persistent-data-model.xcdatamodel */; + path = "persistent-data-model.xcdatamodeld"; + sourceTree = "<group>"; + versionGroupType = wrapper.xcdatamodel; + }; /* End XCVersionGroup section */ }; rootObject = 36F71E6B161C3AE900C87277 /* Project object */; diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index 2b89f2cf9da18d7105433d7bc10dae8ad6a17332..3cc7faf7ea9e740ef2325994ab950c8f3df4a8b6 100644 Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/openBISdata.xcscheme b/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/openBISdata.xcscheme new file mode 100644 index 0000000000000000000000000000000000000000..8144a0ede48e44462b3eed85864064149e562549 --- /dev/null +++ b/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/openBISdata.xcscheme @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0450" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "36F71F13161C4AA000C87277" + BuildableName = "openBISData" + BlueprintName = "openBISData" + ReferencedContainer = "container:openBIS.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "36F71F13161C4AA000C87277" + BuildableName = "openBISData" + BlueprintName = "openBISData" + ReferencedContainer = "container:openBIS.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </TestAction> + <LaunchAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + buildConfiguration = "Debug" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "36F71F13161C4AA000C87277" + BuildableName = "openBISData" + BlueprintName = "openBISData" + ReferencedContainer = "container:openBIS.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + buildConfiguration = "Release" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "36F71F13161C4AA000C87277" + BuildableName = "openBISData" + BlueprintName = "openBISData" + ReferencedContainer = "container:openBIS.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/xcschememanagement.plist b/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/xcschememanagement.plist index 6604657e939340f030096f0ba03a8ba0ee2448bd..90104422ab2e92559ae79e59d95fdabc61eb2d64 100644 --- a/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ <key>orderHint</key> <integer>0</integer> </dict> + <key>openBISdata.xcscheme</key> + <dict> + <key>orderHint</key> + <integer>1</integer> + </dict> </dict> <key>SuppressBuildableAutocreation</key> <dict> @@ -22,6 +27,16 @@ <key>primary</key> <true/> </dict> + <key>36F71EFE161C498300C87277</key> + <dict> + <key>primary</key> + <true/> + </dict> + <key>36F71F13161C4AA000C87277</key> + <dict> + <key>primary</key> + <true/> + </dict> </dict> </dict> </plist> diff --git a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard index 82bac34ee5848898389821f1b4115d0d35340bcc..ce784a2d9c266772a347f68f211ba9672355eeed 100644 --- a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard +++ b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2524" systemVersion="12A217" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="5"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2840" systemVersion="11G56" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="5"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1863"/> + <deployment version="1296" identifier="iOS"/> + <development version="4500" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1926"/> </dependencies> <scenes> <!--Navigation Controller--> @@ -19,7 +21,7 @@ </objects> <point key="canvasLocation" x="448" y="-630"/> </scene> - <!--class Prefix:identifier Detail View Controller - Detail--> + <!--Detail View Controller - Detail--> <scene sceneID="16"> <objects> <viewController storyboardIdentifier="" title="Detail" id="4" customClass="CISDOBDetailViewController" sceneMemberID="viewController"> @@ -27,19 +29,15 @@ <rect key="frame" x="0.0" y="64" width="703" height="704"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <label translatesAutoresizingMaskIntoConstraints="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" lineBreakMode="tailTruncation" autoshrinkMode="none" minimumFontSize="10" text="Detail view content goes here" textAlignment="center" id="27"> + <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Detail view content goes here" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="27"> + <rect key="frame" x="20" y="343" width="663" height="18"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <fontDescription key="fontDescription" type="system" size="system"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <nil key="highlightedColor"/> </label> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - <constraints> - <constraint firstAttribute="trailing" secondItem="27" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="CON-Cb-dBe"/> - <constraint firstItem="27" firstAttribute="leading" secondItem="26" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="LAk-gc-aCl"/> - <constraint firstItem="27" firstAttribute="centerY" secondItem="26" secondAttribute="centerY" type="default" id="fbb-bQ-YI1"/> - </constraints> <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/> </view> <toolbarItems/> @@ -68,7 +66,7 @@ </objects> <point key="canvasLocation" x="-687" y="-630"/> </scene> - <!--class Prefix:identifier Master View Controller - Master--> + <!--Master View Controller - Master--> <scene sceneID="24"> <objects> <tableViewController storyboardIdentifier="" title="Master" clearsSelectionOnViewWillAppear="NO" id="19" customClass="CISDOBMasterViewController" sceneMemberID="viewController"> @@ -85,12 +83,12 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" lineBreakMode="tailTruncation" autoshrinkMode="none" baselineAdjustment="alignBaselines" text="Title" adjustsFontSizeToFit="NO" id="tIi-5l-S0i"> + <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tIi-5l-S0i"> <rect key="frame" x="10" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> - <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -126,6 +124,17 @@ <point key="canvasLocation" x="-366" y="248"/> </scene> </scenes> + <classes> + <class className="CISDOBDetailViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBDetailViewController.h"/> + <relationships> + <relationship kind="outlet" name="detailDescriptionLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="CISDOBMasterViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBMasterViewController.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPhone.storyboard b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPhone.storyboard index d0410c529a1c313b0d8307f9dafd320896de1ff9..63e67c26357c4ca1916d8419cc8d62cfbb0cb22c 100644 --- a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPhone.storyboard +++ b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPhone.storyboard @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2524" systemVersion="12A217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="3"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2840" systemVersion="11G56" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="3"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1863"/> + <deployment version="1296" identifier="iOS"/> + <development version="4500" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1926"/> </dependencies> <scenes> <!--Navigation Controller--> @@ -19,12 +21,12 @@ </objects> <point key="canvasLocation" x="-1" y="64"/> </scene> - <!--class Prefix:identifier Master View Controller - Master--> + <!--Master View Controller - Master--> <scene sceneID="18"> <objects> <tableViewController storyboardIdentifier="" title="Master" id="12" customClass="CISDOBMasterViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="13"> - <rect key="frame" x="0.0" y="64" width="320" height="416"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> @@ -35,12 +37,12 @@ <rect key="frame" x="0.0" y="0.0" width="300" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" lineBreakMode="tailTruncation" autoshrinkMode="none" baselineAdjustment="alignBaselines" text="Title" adjustsFontSizeToFit="NO" id="phq-AM-6qj"> + <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="phq-AM-6qj"> <rect key="frame" x="10" y="0.0" width="280" height="43"/> <autoresizingMask key="autoresizingMask"/> - <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -63,27 +65,23 @@ </objects> <point key="canvasLocation" x="459" y="64"/> </scene> - <!--class Prefix:identifier Detail View Controller - Detail--> + <!--Detail View Controller - Detail--> <scene sceneID="24"> <objects> <viewController storyboardIdentifier="" title="Detail" id="21" customClass="CISDOBDetailViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="22"> - <rect key="frame" x="0.0" y="64" width="320" height="416"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <label translatesAutoresizingMaskIntoConstraints="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" lineBreakMode="tailTruncation" autoshrinkMode="none" minimumFontSize="10" text="Detail view content goes here" textAlignment="center" id="27"> + <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Detail view content goes here" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="27"> + <rect key="frame" x="20" y="243" width="280" height="18"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <fontDescription key="fontDescription" type="system" size="system"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <nil key="highlightedColor"/> </label> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - <constraints> - <constraint firstItem="27" firstAttribute="centerY" secondItem="22" secondAttribute="centerY" type="default" id="7cE-gL-0wv"/> - <constraint firstItem="27" firstAttribute="leading" secondItem="22" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="R0m-z7-TWk"/> - <constraint firstAttribute="trailing" secondItem="27" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="pRe-qY-58T"/> - </constraints> </view> <navigationItem key="navigationItem" title="Detail" id="26"/> <connections> @@ -95,6 +93,17 @@ <point key="canvasLocation" x="902" y="64"/> </scene> </scenes> + <classes> + <class className="CISDOBDetailViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBDetailViewController.h"/> + <relationships> + <relationship kind="outlet" name="detailDescriptionLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="CISDOBMasterViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBMasterViewController.h"/> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/>