From 2e32b57675fb9ec391d8e99c74cf10d308ee658d Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 1 Nov 2012 12:17:30 +0000
Subject: [PATCH] Renamed imageUrl to imageUrlString.
SVN: 27451
---
openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h | 4 +---
openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m | 6 ++----
.../persistent-data-model.xcdatamodel/contents | 4 ++--
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h
index 5a93a3d26d5..ce1436917ec 100644
--- a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h
+++ b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h
@@ -49,7 +49,7 @@
@property (nonatomic, retain) NSString * summary;
@property (nonatomic, retain) NSString * identifier;
@property (nonatomic, retain) NSString * category;
-@property (nonatomic, retain) NSString * imageUrl;
+@property (nonatomic, retain) NSString * imageUrlString;
@property (nonatomic, retain) NSString * childrenPermIdsJson;
@property (readonly) NSArray * childrenPermIds;
@@ -59,8 +59,6 @@
@property (nonatomic, retain) NSNumber * rootLevel;
-///! The image contained at the imageUrl or nil if there is no image. Could be a UIImage or CIImage depending on the platform.
-@property (nonatomic, strong) id image;
// Actions
//! Take the values from the raw entity.
diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m
index 0a4c2d1a85c..5d811d23bcf 100644
--- a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m
+++ b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m
@@ -41,15 +41,13 @@ id ObjectFromJsonData(NSString *jsonData, NSError **error)
@dynamic permId;
@dynamic refconJson;
@dynamic category;
-@dynamic imageUrl;
+@dynamic imageUrlString;
@dynamic childrenPermIdsJson;
@dynamic propertiesJson;
@dynamic rootLevel;
@dynamic serverUrlString;
@dynamic lastUpdateDate;
-@synthesize image;
-
- (void)setRefconJson:(NSString *)refconJson
{
// Update the object value as well.
@@ -141,7 +139,7 @@ id ObjectFromJsonData(NSString *jsonData, NSError **error)
if (rawEntity.summary) self.summary = rawEntity.summary;
if (rawEntity.children) self.childrenPermIdsJson = rawEntity.children;
if (rawEntity.identifier) self.identifier = rawEntity.identifier;
- if (rawEntity.imageUrl) self.imageUrl = rawEntity.imageUrl;
+ if (rawEntity.imageUrl) self.imageUrlString = rawEntity.imageUrl;
if (rawEntity.properties) self.propertiesJson = rawEntity.properties;
if (rawEntity.rootLevel) {
BOOL rootLevel = [rawEntity.rootLevel length] > 0;
diff --git a/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents b/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents
index 156f3a1b456..4d2005a5341 100644
--- a/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents
+++ b/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents
@@ -5,7 +5,7 @@
<attribute name="childrenPermIds" optional="YES" transient="YES" syncable="YES"/>
<attribute name="childrenPermIdsJson" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
<attribute name="identifier" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
- <attribute name="imageUrl" optional="YES" attributeType="String" syncable="YES"/>
+ <attribute name="imageUrlString" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="lastUpdateDate" optional="YES" attributeType="Date" indexed="YES" syncable="YES"/>
<attribute name="permId" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
<attribute name="properties" optional="YES" transient="YES" syncable="YES"/>
@@ -22,6 +22,6 @@
<fetchRequest name="EntityAndChildren" entity="CISDOBIpadEntity" predicateString="SELF == $ENTITY OR permId IN $CHILDREN" fetchBatchSize="20"/>
<fetchRequest name="RootEntities" entity="CISDOBIpadEntity" predicateString="rootLevel == 0" fetchBatchSize="20"/>
<elements>
- <element name="CISDOBIpadEntity" positionX="0" positionY="0" width="128" height="270"/>
+ <element name="CISDOBIpadEntity" positionX="0" positionY="0" width="0" height="0"/>
</elements>
</model>
\ No newline at end of file
--
GitLab