1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/os/textandloc/textrendering/texthandling/sfields/FLDSTRM.CPP Fri Jun 15 03:10:57 2012 +0200
1.3 @@ -0,0 +1,481 @@
1.4 +/*
1.5 +* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
1.6 +* All rights reserved.
1.7 +* This component and the accompanying materials are made available
1.8 +* under the terms of "Eclipse Public License v1.0"
1.9 +* which accompanies this distribution, and is available
1.10 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.11 +*
1.12 +* Initial Contributors:
1.13 +* Nokia Corporation - initial contribution.
1.14 +*
1.15 +* Contributors:
1.16 +*
1.17 +* Description:
1.18 +*
1.19 +*/
1.20 +
1.21 +
1.22 +#include <e32std.h>
1.23 +#include <e32base.h>
1.24 +
1.25 +#include <s32strm.h>
1.26 +#include <s32stor.h>
1.27 +
1.28 +#include "FLDDEF.H"
1.29 +#include "FLDSET.H"
1.30 +#include "FLDARRAY.H"
1.31 +
1.32 +#include "FLDSTD.H"
1.33 +
1.34 +
1.35 +
1.36 +EXPORT_C TFieldMapExternalizer::TFieldMapExternalizer(const CStoreMap& aMap)
1.37 + : iMap(&aMap)
1.38 + {}
1.39 +
1.40 +EXPORT_C void TFieldMapExternalizer::ExternalizeL(const TStreamRef& aRef,RWriteStream& aStream) const
1.41 +// Write the stream id bound to aRef to aStream. If not bound, write KNullStreamId
1.42 +//
1.43 + {
1.44 + TSwizzleC<TAny> swizzle=aRef;
1.45 + aStream<<iMap->At(swizzle);
1.46 + }
1.47 +
1.48 +
1.49 +EXPORT_C TStreamId CTextFieldSet::StoreL(CStreamStore& aStore)const
1.50 +// Save the fields and the fieldSet in their own streams
1.51 +// Encapsulates the storing of its components.
1.52 +//
1.53 + {
1.54 + CStoreMap* map=CStoreMap::NewLC(aStore);
1.55 + StoreFieldsL(aStore,*map); // binds id's to swizzles
1.56 +//
1.57 + // create custom externalizer over the map
1.58 + TFieldMapExternalizer fMap(*map);
1.59 + RStoreWriteStream stream(fMap);
1.60 + TStreamId id=stream.CreateLC(aStore);
1.61 + stream<< *this;
1.62 + stream.CommitL();
1.63 + CleanupStack::PopAndDestroy(); // stream
1.64 +//
1.65 + map->Reset();
1.66 + CleanupStack::PopAndDestroy(); // map
1.67 + return id;
1.68 + }
1.69 +
1.70 +
1.71 +EXPORT_C void CTextFieldSet::StoreFieldsL(CStreamStore& aStore,CStoreMap& aMap)const
1.72 +// Stores all fields in the set
1.73 +//
1.74 + {StoreFieldsL(aStore,aMap,iFieldArray);}
1.75 +
1.76 +
1.77 +void CTextFieldSet::StoreFieldsL(CStreamStore& aStore,CStoreMap& aMap,CArrayFixSeg<TTextFieldEntry>* aArray)const
1.78 +// Stores all fields contained in the set provided
1.79 +//
1.80 + {
1.81 + __TEST_INVARIANT;
1.82 +
1.83 + for (TInt i=0 ; i<(aArray->Count()-1) ; i++)
1.84 + {
1.85 + TStreamId id=(*aArray)[i].iFieldHeader.iField->StoreL(aStore);
1.86 + if (id!=KNullStreamId)
1.87 + aMap.BindL((*aArray)[i].iFieldHeader.iField,id);
1.88 + }
1.89 + }
1.90 +
1.91 +
1.92 +EXPORT_C void CTextFieldSet::ExternalizeL(RWriteStream& aStream)const
1.93 + {
1.94 + __TEST_INVARIANT;
1.95 +
1.96 + ExternalizeL(aStream,iFieldArray);
1.97 + }
1.98 +
1.99 +
1.100 +void CTextFieldSet::ExternalizeL(RWriteStream& aStream,CArrayFixSeg<TTextFieldEntry>* aArray)const
1.101 + {
1.102 + TInt numFieldEntries = aArray->Count();
1.103 + aStream.WriteInt32L(numFieldEntries);
1.104 + // write out fields
1.105 + for (TInt i=0 ; i<numFieldEntries-1 ; i++)
1.106 + aStream<< (*aArray)[i];
1.107 + // write out last entry in array: the bit after the last field
1.108 + aStream.WriteInt32L((*aArray)[numFieldEntries-1].iPreFieldLen);
1.109 + }
1.110 +
1.111 +
1.112 +EXPORT_C void CTextFieldSet::RestoreL(const CStreamStore& aFieldStore,TStreamId aStreamId)
1.113 + {
1.114 + // reset the array and stream into it
1.115 + Reset();
1.116 + DoRestoreL(aFieldStore,aStreamId);
1.117 + }
1.118 +
1.119 +
1.120 +EXPORT_C void CTextFieldSet::RestoreFieldsL(const CStreamStore& aFieldStore)
1.121 + {
1.122 + DoRestoreFieldsL(iFieldArray,aFieldStore); // restore the fields individually from their own streams
1.123 + }
1.124 +
1.125 +
1.126 +void CTextFieldSet::DoRestoreL(const CStreamStore& aFieldStore,TStreamId aStreamId)
1.127 +// Restores a field set and its associated fields from the store provded.
1.128 +//
1.129 + {
1.130 + __ASSERT_ALWAYS(iFieldArray->Count()==1,Panic(EArrayNotEmptyOnRestore)); // array must be empty
1.131 + __ASSERT_ALWAYS((*iFieldArray)[0].iPreFieldLen==0,Panic(EArrayNotEmptyOnRestore));
1.132 +
1.133 + // retrieve the headstream from the store
1.134 + RStoreReadStream stream;
1.135 + stream.OpenLC(aFieldStore,aStreamId);
1.136 + // restore the set, then the individual fields
1.137 + stream>> *this; // internalize the field set (the headers)
1.138 + CleanupStack::PopAndDestroy(); // stream
1.139 + DoRestoreFieldsL(iFieldArray,aFieldStore); // restore the fields individually from their own streams
1.140 + }
1.141 +
1.142 +
1.143 +EXPORT_C void CTextFieldSet::InternalizeL(RReadStream& aStream)
1.144 + {
1.145 + InternalizeL(iFieldArray,aStream);
1.146 +
1.147 + __TEST_INVARIANT;
1.148 + }
1.149 +
1.150 +
1.151 +void CTextFieldSet::InternalizeL(CArrayFixSeg<TTextFieldEntry>* aArray,RReadStream& aStream)
1.152 + {// assume the array is empty
1.153 + TInt numFieldEntries = aStream.ReadInt32L();
1.154 + // read in the fields
1.155 + TTextFieldEntry entry;
1.156 + for (TInt i=0 ; i<numFieldEntries-1 ; i++)
1.157 + {
1.158 + aStream>> entry;
1.159 + InsertEntryL(i,entry,aArray); // insert new entry
1.160 + }
1.161 + // read in the last entry: the bit after the last field. This will not contain a field
1.162 + (*aArray)[numFieldEntries-1].iPreFieldLen = aStream.ReadInt32L();
1.163 + }
1.164 +
1.165 +
1.166 +void CTextFieldSet::DoRestoreFieldsL(CArrayFixSeg<TTextFieldEntry>* aArray,const CStreamStore& aFieldStore,TInt aStartIndex)
1.167 +// This fn is called after all FieldHeaders have been internalized - the Swizzles hold the stream id's.
1.168 +// One by one the fields are created (with the factory) and then have their settings streamed in from the store.
1.169 +// If no factory exists all fields are converted to text.
1.170 +//
1.171 + {
1.172 + TInt ii=aArray->Count()-2; // -2 because we skip the last (empty) entry
1.173 + while (ii>=aStartIndex)
1.174 + {
1.175 + if ((*aArray)[ii].iFieldHeader.iField.IsId())
1.176 + {// restore the field only if it isn't the very last (dummy) entry
1.177 + if (iFieldFactory==NULL)
1.178 + // no factory - convert the field to text
1.179 + DeleteFieldEntry(aArray,ii);
1.180 + else
1.181 + {
1.182 + TStreamId id = (*aArray)[ii].iFieldHeader.iField.AsId();
1.183 + (*aArray)[ii].iFieldHeader.iField = iFieldFactory->NewFieldL((*aArray)[ii].iFieldHeader.iFieldType);
1.184 + if ((*aArray)[ii].iFieldHeader.iField!=NULL)
1.185 + (*aArray)[ii].iFieldHeader.iField->RestoreL(aFieldStore,id);
1.186 + else
1.187 + DeleteFieldEntry(aArray,ii); // handle "field type not recognised" by converting field to text
1.188 + }
1.189 + }
1.190 + ii--;
1.191 + }
1.192 + }
1.193 +
1.194 +
1.195 +/***************************************** cut & paste *******************************************/
1.196 +
1.197 +
1.198 +EXPORT_C TStreamId CTextFieldSet::CopyToStoreL(CStreamStore& aStore,TInt aPos,TInt aLength)const
1.199 +// Copy any fields in the selected region to the specified store, returning the id of the head-stream.
1.200 +//
1.201 + {
1.202 + __TEST_INVARIANT;
1.203 + __ASSERT_ALWAYS(aPos>=0,Panic(EPosOutOfRange));
1.204 + __ASSERT_ALWAYS(aLength>=0,Panic(ENegativeRange));
1.205 + __ASSERT_DEBUG((aPos+aLength)<=CharCount(),Panic(EPosOutOfRange));
1.206 +
1.207 + // Create a store map and store the fields themselves
1.208 + CStoreMap* map=CStoreMap::NewLC(aStore);
1.209 + CopyComponentsL(aStore,*map,aPos,aLength);
1.210 +
1.211 + // Create a head-stream in which to store the field entries and do so
1.212 + RStoreWriteStream stream(*map);
1.213 + TStreamId id=stream.CreateLC(aStore);
1.214 + CopyToStreamL(stream,aPos,aLength);
1.215 +
1.216 + // tidy up
1.217 + stream.CommitL();
1.218 + map->Reset();
1.219 + CleanupStack::PopAndDestroy(2); // map, stream
1.220 + return id;
1.221 + }
1.222 +
1.223 +
1.224 +EXPORT_C void CTextFieldSet::CopyComponentsL(CStreamStore& aStore,CStoreMap& aMap,TInt aPos,TInt aLength)const
1.225 +// Stores all fields in the set
1.226 +//
1.227 + {
1.228 + __TEST_INVARIANT;
1.229 + __ASSERT_ALWAYS(aPos>=0,Panic(EPosOutOfRange));
1.230 + __ASSERT_ALWAYS(aLength>=0,Panic(ENegativeRange));
1.231 + __ASSERT_DEBUG((aPos+aLength)<=CharCount(),Panic(EPosOutOfRange));
1.232 +
1.233 + // Create an array of the fields to be cut/copied
1.234 + CArrayFixSeg<TTextFieldEntry>* tempArray = new(ELeave) CArrayFixSeg<TTextFieldEntry>(KFieldArrayGranularity);
1.235 + CleanupStack::PushL(tempArray);
1.236 + CopyToArrayL(tempArray,aPos,aLength);
1.237 +
1.238 + // stream the required fields in their own streams
1.239 + StoreFieldsL(aStore,aMap,tempArray);
1.240 + CleanupStack::PopAndDestroy(); // tempArray
1.241 + }
1.242 +
1.243 +
1.244 +EXPORT_C void CTextFieldSet::CopyToStreamL(RWriteStream& aStream,TInt aPos,TInt aLength)const
1.245 +// Stores all fields in the set
1.246 +//
1.247 + {
1.248 + __TEST_INVARIANT;
1.249 + __ASSERT_ALWAYS(aPos>=0,Panic(EPosOutOfRange));
1.250 + __ASSERT_ALWAYS(aLength>=0,Panic(ENegativeRange));
1.251 + __ASSERT_DEBUG((aPos+aLength)<=CharCount(),Panic(EPosOutOfRange));
1.252 +
1.253 + // Create an array of the fields to be cut/copied
1.254 + CArrayFixSeg<TTextFieldEntry>* tempArray = new(ELeave) CArrayFixSeg<TTextFieldEntry>(KFieldArrayGranularity);
1.255 + CleanupStack::PushL(tempArray);
1.256 + CopyToArrayL(tempArray,aPos,aLength);
1.257 +
1.258 + // stream the field entries in the temp array
1.259 + ExternalizeL(aStream,tempArray);
1.260 + CleanupStack::PopAndDestroy(); // tempArray
1.261 + }
1.262 +
1.263 +
1.264 +void CTextFieldSet::CopyToArrayL(CArrayFixSeg<TTextFieldEntry>* aArray,TInt aPos,TInt aLength)const
1.265 + {
1.266 + TInt index; TInt offset;
1.267 + if (InField(aPos,index,offset))
1.268 + offset += (*iFieldArray)[index].iPreFieldLen; // make offset relative to start of entry
1.269 + // split first entry in range
1.270 + TTextFieldEntry entry = SplitEntry(index,offset,aLength);
1.271 + index++;
1.272 + TInt charsCopied=EntryLen(entry);
1.273 + // split second if neccessary
1.274 + if ((!entry.iFieldHeader.iField)&&(charsCopied<aLength))
1.275 + {
1.276 + TInt preFieldLen = entry.iPreFieldLen;
1.277 + entry = SplitEntry(index,0,aLength-preFieldLen);
1.278 + entry.iPreFieldLen += preFieldLen;
1.279 + charsCopied = EntryLen(entry);
1.280 + index++;
1.281 + }
1.282 + ((CTextFieldSet*)this)->AppendEntryL(entry,aArray); // append the first entry to the storage array
1.283 + // write out all whole entries
1.284 + while (charsCopied<aLength)
1.285 + {
1.286 + if ((charsCopied+EntryLen(index))<=aLength)
1.287 + ((CTextFieldSet*)this)->AppendEntryL((*iFieldArray)[index],aArray);
1.288 + charsCopied += EntryLen(index);
1.289 + index++;
1.290 + }
1.291 + // split last entry if neccessary
1.292 + if (charsCopied>aLength)
1.293 + {// The last entry needs to be split
1.294 + // first get back to the beginning of the entry
1.295 + index--;
1.296 + charsCopied -= EntryLen(index);
1.297 + entry = SplitEntry(index,0,aLength-charsCopied); // split up the last entry as required
1.298 + ((CTextFieldSet*)this)->AppendEntryL(entry,aArray); // append the last entry to the storage array
1.299 + }
1.300 + // add an empty last entry if neccessary
1.301 + TInt numFieldEntries = aArray->Count();
1.302 + if (((*aArray)[numFieldEntries-1].iFieldHeader.iField) || ((*aArray)[numFieldEntries-1].iFieldValueLen!=0))
1.303 + {
1.304 + entry.iPreFieldLen = 0;
1.305 + entry.iFieldValueLen = 0;
1.306 + entry.iFieldHeader.iFieldType = KNullUid;
1.307 + entry.iFieldHeader.iField = NULL;
1.308 + ((CTextFieldSet*)this)->AppendEntryL(entry,aArray);
1.309 + numFieldEntries++;
1.310 + }
1.311 + }
1.312 +
1.313 +
1.314 +EXPORT_C void CTextFieldSet::PasteFromStoreL(const CStreamStore& aFieldStore,TStreamId aStreamId,TInt aPos,TInt aMaxLen)
1.315 +// Paste from aStore into the document at insert position aPos.
1.316 +// Optionally the pasted text can be clipped to a maximum length aMaxLen.
1.317 +//
1.318 + {
1.319 + __ASSERT_ALWAYS(aPos>=0,Panic(EPosOutOfRange));
1.320 + __ASSERT_DEBUG(aPos<=CharCount(),Panic(EPosOutOfRange));
1.321 +
1.322 + // retrieve the headstream from the store
1.323 + RStoreReadStream stream;
1.324 + stream.OpenLC(aFieldStore,aStreamId);
1.325 +
1.326 + // restore the set...
1.327 + PasteFromStreamL(stream,aPos,aMaxLen); // internalize the field set (the headers)
1.328 + CleanupStack::PopAndDestroy(); // stream
1.329 +
1.330 + // ...then the individual fields
1.331 + PasteComponentsL(aFieldStore,aPos); // restore the fields individually from their own streams
1.332 + }
1.333 +
1.334 +
1.335 +EXPORT_C void CTextFieldSet::PasteFromStreamL(RReadStream& aStream,TInt aPos,TInt aMaxLen)
1.336 +// streams the field entries into a temporary array, which is returned.
1.337 +// PasteComponents() must be called after this to actually carry out the paste...
1.338 + {
1.339 + // create a temporary array to stream in to, inserting the first entry
1.340 + CArrayFixSeg<TTextFieldEntry>* tempFieldArray = new(ELeave) CArrayFixSeg<TTextFieldEntry>(KFieldArrayGranularity);
1.341 + CleanupStack::PushL(tempFieldArray);
1.342 + AddInitialFieldEntryL(tempFieldArray,0);
1.343 +
1.344 + // internalize the field entries
1.345 + InternalizeL(tempFieldArray,aStream);
1.346 +
1.347 + // trim off any entries that lie beyond aMaxLength
1.348 + if (aMaxLen!=ENoPasteLimit)
1.349 + {// if aMaxLen is not ENoPasteLimit discard the excess fields
1.350 + __ASSERT_ALWAYS(aMaxLen>=0,Panic(ELengthOutOfRange));
1.351 + //
1.352 + TInt length=0;
1.353 + TInt i=0;
1.354 + for (i=0 ; (length<aMaxLen)&&(i<tempFieldArray->Count()) ; i++)
1.355 + length += EntryLen((*tempFieldArray)[i]);
1.356 + if (aMaxLen==0)
1.357 + {// make first entry zero len, delete all others
1.358 + i++;
1.359 + (*tempFieldArray)[i-1].iPreFieldLen = 0;
1.360 + }
1.361 + else if (length>aMaxLen)
1.362 + // truncate the last field in range
1.363 + (*tempFieldArray)[i-1].iPreFieldLen += (*tempFieldArray)[i-1].iFieldValueLen-(length-aMaxLen);
1.364 + else if ((length==aMaxLen) && ((*tempFieldArray)[i-1].iFieldHeader.iField!=NULL))
1.365 + {// if the terminating entry has a field add a zero length entry, the mandatory last entry
1.366 + i++;
1.367 + (*tempFieldArray)[i-1].iPreFieldLen = 0;
1.368 + }
1.369 + // ensure the last entry is of the correct format
1.370 + (*tempFieldArray)[i-1].iFieldValueLen = 0;
1.371 + (*tempFieldArray)[i-1].iFieldHeader.iFieldType = KNullUid;
1.372 + (*tempFieldArray)[i-1].iFieldHeader.iField = NULL;
1.373 + // delete all the fields wholely out of range
1.374 + for (TInt index=i ; index<tempFieldArray->Count() ; index++)
1.375 + (*tempFieldArray)[index].iFieldHeader.iField = NULL;
1.376 + tempFieldArray->Delete(i,tempFieldArray->Count()-i); // pos,count
1.377 + }
1.378 +
1.379 + DoPasteL(tempFieldArray,aPos);
1.380 + CleanupStack::PopAndDestroy(); // tempFieldArray
1.381 + }
1.382 +
1.383 +
1.384 +EXPORT_C void CTextFieldSet::PasteComponentsL(const CStreamStore& aFieldStore,TInt aPos)
1.385 + {
1.386 + // Restore the fields individually from their own streams
1.387 + TInt index; TInt offset;
1.388 + // We don't need to make any difference between in and not in field situation here
1.389 + // all we need is the index
1.390 + TBool isInField = InField(aPos,index,offset);
1.391 + DoRestoreFieldsL(iFieldArray,aFieldStore,index);
1.392 + }
1.393 +
1.394 +
1.395 +void CTextFieldSet::DoPasteL(CArrayFixSeg<TTextFieldEntry>* aSourceArray,TInt aPos)
1.396 +// Insert into this instance, at character position aPos, the entire (field entry) contents of the field array aSourceArray.
1.397 +// All iField objects in aSourceArray are ID's at this time.
1.398 +//
1.399 + {
1.400 + // are we inserting into a field?
1.401 + TInt numFieldEntries = aSourceArray->Count();
1.402 + TInt index; TInt offset;
1.403 +
1.404 + TBool inField = InField(aPos,index,offset);
1.405 + // record the rollback info
1.406 + RecordRollbackInfoL(index);
1.407 + if ((inField)&&(offset!=0))
1.408 + {// everything we insert will become text - no chance of leaving
1.409 + // insert all but last entry
1.410 + TInt i=0;
1.411 + for (; i<numFieldEntries-1 ; i++)
1.412 + {// copy text (no need to delete field)
1.413 + (*iFieldArray)[index].iFieldValueLen += EntryLen((*aSourceArray)[i]);
1.414 + }
1.415 + // read in the last entry (has no field attached)
1.416 + (*iFieldArray)[index].iFieldValueLen += (*aSourceArray)[i].iPreFieldLen;
1.417 + }
1.418 + else
1.419 + {// else split the entry we are going to bisect - this may leave
1.420 + if (inField)
1.421 + offset = (*iFieldArray)[index].iPreFieldLen; // must be at start of field
1.422 + if (numFieldEntries>1)
1.423 + {// read 1st field & carry out split.
1.424 + InsertEntryL(index,(*aSourceArray)[0]); // if this leaves the model will be intact
1.425 + (*iFieldArray)[index].iPreFieldLen += offset;
1.426 + (*iFieldArray)[index+1].iPreFieldLen -= offset;
1.427 + index++;
1.428 + }
1.429 + // insert all other fields except last.
1.430 + for (TInt i=1 ; i<numFieldEntries-1 ; i++)
1.431 + {
1.432 + TRAPD(ret,\
1.433 + InsertEntryL(index,(*aSourceArray)[i]));
1.434 + if (ret!=KErrNone)
1.435 + {// do rollback, then propagate leave
1.436 + RollbackPaste();
1.437 + User::Leave(ret);
1.438 + }
1.439 + index++;
1.440 + }
1.441 + // join last field up to successor
1.442 + (*iFieldArray)[index].iPreFieldLen += (*aSourceArray)[numFieldEntries-1].iPreFieldLen;
1.443 + }
1.444 +
1.445 + __TEST_INVARIANT;
1.446 + }
1.447 +
1.448 +
1.449 +void CTextFieldSet::RecordRollbackInfoL(TInt aIndex)
1.450 + {
1.451 + delete iRollbackInfo;
1.452 + iRollbackInfo = new(ELeave) TRollbackInfo();
1.453 + iRollbackInfo->iEntryNum = aIndex;
1.454 + iRollbackInfo->iPreFieldLen = (*iFieldArray)[aIndex].iPreFieldLen;
1.455 + iRollbackInfo->iFieldValueLen = (*iFieldArray)[aIndex].iFieldValueLen;
1.456 + iRollbackInfo->iTotalEntries = iFieldArray->Count();
1.457 + }
1.458 +
1.459 +
1.460 +EXPORT_C void CTextFieldSet::RollbackPaste()
1.461 +// Carries out rollback from a paste function
1.462 +// This will only have an effect after a PasteFromStream() has been called
1.463 +// nb it would be distasterous if this were called at random some time after a paste!
1.464 +//
1.465 + {
1.466 + if (!iRollbackInfo)
1.467 + return; // nothing to do
1.468 + // remove added entries from array
1.469 + TInt entriesToRemove=iFieldArray->Count()-iRollbackInfo->iTotalEntries;
1.470 + TInt i=0;
1.471 + for (i=iRollbackInfo->iEntryNum ; i<iRollbackInfo->iEntryNum+entriesToRemove ; i++)
1.472 + {
1.473 + if ((*iFieldArray)[i].iFieldHeader.iField.IsPtr())
1.474 + delete (*iFieldArray)[i].iFieldHeader.iField.AsPtr(); // Delete the textField object
1.475 + iFieldArray->Delete(i);
1.476 + }
1.477 + // now right num entries, but wrong length - use backup info to correct length
1.478 + (*iFieldArray)[i].iPreFieldLen = iRollbackInfo->iPreFieldLen;
1.479 + (*iFieldArray)[i].iFieldValueLen = iRollbackInfo->iFieldValueLen;
1.480 +
1.481 + __ASSERT_DEBUG(iFieldArray->Count()==iRollbackInfo->iTotalEntries,Panic(EDebug));
1.482 + delete iRollbackInfo;
1.483 + }
1.484 +