Changeset 253

Timestamp:

09/29/11 15:38:41 (8 months ago)

Author:

alex

Message:

updated scripts, fixed personal folder on windows, which points to documents on NOT to home as I thought, added fix for subversion 1.7

Location:

trunk/lingosource

Files:

• castlib1/bbedit_Utilities.ls (modified) (5 diffs)
• castlib1/subversion_version_field.txt (modified) (1 diff)
• castlib1/svn_Utilities.ls (modified) (1 diff)
• castlib2/PseudoXMLPS.ls (modified) (1 diff)
• castlib2/aleXtrasMovieScript.ls (modified) (3 diffs)
• castlib2/commonMovieScript.ls (modified) (13 diffs)
• castlib2/scriptTextParser.ls (modified) (5 diffs)

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -1026 +1026 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetUserHomeFolderPath me
+  isMac = (the platform contains "mac")
+  if isMac then
+    CurrentOSXUserName = mGetCurrentOSXUserName(me)
+    return "/Users/" & CurrentOSXUserName
+  end if
+  
+  homedir = baSysFolder("personal")
+  old = the itemdelimiter
+  the itemdelimiter = "\"
+  delete the last item of homedir
+  delete the last item of homedir
+  the itemdelimiter = old
+  return homedir
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 -- get the absolute pathname of alex linked library script from members comment
 -- memref is required => member reference
@@ -1053 +1071 @@
     
     if comm starts "~" then -- OSX current user directory
-      if isMac then
-        put "/Users/"&CurrentOSXUserName into char 1 of comm
-      else
-        offs = offset("/", comm)
-        repeat while offs > 0
-          put "\" into char offs of comm
-          offs = offset("/", comm)
-        end repeat
-        put baSysFolder("personal") into char 1 to 2 of comm
-        aPath = comm
-      end if
+      
+      put mGetUserHomeFolderPath(me) into char 1 of comm
+      aPath = comm
+      --      if isMac then
+      --        put "/Users/"&CurrentOSXUserName into char 1 of comm
+      --      else
+      --        offs = offset("/", comm)
+      --        repeat while offs > 0
+      --          put "\" into char offs of comm
+      --          offs = offset("/", comm)
+      --        end repeat
+      --        put baSysFolder("personal") into char 1 to 2 of comm
+      --        aPath = comm
+      --      end if
     end if
     
@@ -1083 +1104 @@
         
         if comm starts "/Users/alex/" then
-          put baSysFolder("personal") into char 1 to 12 of comm
+          put mGetUserHomeFolderPath(me) & "\" into char 1 to 12 of comm
         end if
         aPath = comm
@@ -1092 +1113 @@
     else if comm starts "@" then -- relative path with @
       
-      if delim <> ":" then
-        offs = offset(":", comm)
+      if delim <> "" then
+        offs = offset("", comm)
         repeat while offs > 0
           put delim into char offs of comm
-          offs = offset(":", comm)
+          offs = offset("", comm)
         end repeat
       end if
@@ -1135 +1156 @@
   the itemdelimiter = olddelim
   
+  put "Path from member comments is" && aPath
+  
   return aPath
   
 end
-
-
-
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r251
+r255

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -3450 +3450 @@
   if length(workingFolder) < 1 then return ""
   
+  if checkIfPathIsSVNWorkingCopy(me, workingFolder) <> 1 then
+    alert workingFolder && "does not appear to be a svn working copy."
+    workingCopies.deleteprop(movieIdentifier)
+    return ""
+  end if
+  
+  workingCopies.setaprop(movieIdentifier, workingFolder)
+  
+  if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
+  
+  return workingFolder
+  
+end
+
+-- starting with version 1.7 now subversion keeps its metadata in only the root of a working copy
+-- instead like how it was before in every folder, like it has been in git from the beginning
+-- good move! But we now must check all the path upwoards to find the .svn folder in order to check
+-- whether we have a working directory
+
+on checkIfPathIsSVNWorkingCopy me, aPath
+    if length(aPath) < 1 then return 0
+  
   delim = the last char of the applicationpath
-  if the last char of workingFolder <> delim then put delim after workingFolder
-  
-  if baFolderExists(workingFolder & ".svn") <> 1 then
-    
-    alert workingFolder && "does not appear to be a svn working copy."
-    
-    workingCopies.deleteprop(movieIdentifier)
-    
-    return ""
-  end if
-  
-  workingCopies.setaprop(movieIdentifier, workingFolder)
-  
-  if savePrefs = 1 then setPref("svn_workingCopies_paths.txt", string(workingCopies))
-  
-  return workingFolder
-  
+  if the last char of aPath <> delim then put delim after aPath
+  
+  if baFolderExists(aPath & ".svn") <> 1 then
+    olddelim = the itemdelimiter
+    the itemdelimiter = delim
+    delete the last item of aPath
+    delete the last item of aPath
+    the itemdelimiter = olddelim
+    return checkIfPathIsSVNWorkingCopy(me, aPath)
+  end if
+  
+  return 1
 end
-

trunk/lingosource/castlib2/PseudoXMLPS.ls

@@ -886 +886 @@
 on mEscapeSpecialChars me, str
   
-  val = mReplaceAllGT(me, val, "&", "&")
-  val = mReplaceAllGT(me, string(str), "<", "&lt;")
+  val = mReplaceAllGT(me, string(str), "&", "&amp;")
+  val = mReplaceAllGT(me, val, "<", "&lt;")
   val = mReplaceAllGT(me, val, ">", "&gt;")
   val = mReplaceAllGT(me, val, "'", "&apos;")

trunk/lingosource/castlib2/aleXtrasMovieScript.ls

@@ -115 +115 @@
       put "Script" && QUOTE & str_scrName & QUOTE && "is missing! This may cause unwanted behavior"
     end if
-    inst = []
-  end if
+      inst = []
+    end if
   if ilk(inst) = #instance then
     if inst.handler(#new) = 1 then inst.new()
@@ -237 +237 @@
   end repeat
   includes.deleteOne(#commonMovieScript)
-  globs[#gParentScriptInstances] = includes
+    globs[#gParentScriptInstances] = includes
   
   exit
@@ -284 +284 @@
   if not(objectP(incl)) then
     put "No scriptinstances stored"
-    exit
+  exit
   end if
   
   anz = count(incl)
   repeat with n = 1 to anz
-    put RETURN & "scr = mGetXScript(#"&incl.getPropAt(n)&")" & RETURN
+    put RETURN & "scr = xscr().mGetInstance(" & QUOTE & incl.getPropAt(n) & QUOTE & ")" & RETURN
   end repeat
   put RETURN & "put scr.handlers()" & RETURN

trunk/lingosource/castlib2/commonMovieScript.ls

@@ -416 +416 @@
 end
 
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mIsAtLeastVersionOf me, proplist_or_number_productVersionInfo
+  -----------------------------------
+  --         CREATED: 08.02.2011
+  --         ACTION: Check whether player version number and productbuildversion
+  --                 meet at least a certain value
+  --         INPUT: <proplist_or_number_productVersionInfo> ; proplist or number ; if number: =>
+  --                                                             at least version xy
+  --                             if proplist then at least version productVersionInfo[#versionNumber] => #number
+  --                                  AND (if defined) productVersionInfo[#buildnumber] => number
+  --         RETURNS: boolean (integer) => true if current version is at least the specified version or higher
+  -----------------------------------
+  
+  if ilk(proplist_or_number_productVersionInfo) = #proplist then
+    versionNumber = proplist_or_number_productVersionInfo[#versionNumber]
+    buildnumber = proplist_or_number_productVersionInfo[#buildnumber]
+  else
+    versionNumber = proplist_or_number_productVersionInfo
+    buildnumber = 0
+  end if
+  
+  if ilk(versionNumber, #number) <> 1 then versionNumber = 0 -- in dubio pro reo
+  if ilk(buildnumber, #number) <> 1 then buildnumber = 0 -- in dubio pro reo
+  
+  currVersion = mGetVersionNumber(me)
+  
+  if currVersion > versionNumber then return true
+  if currVersion < versionNumber then return false
+  
+  env = mGetEnvironment(me)
+  currentBuildNumber = integer(env[#productBuildVersion])
+  if buildnumber > currentBuildNumber then return false
+  return true
+end
+
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
@@ -680 +717 @@
       retval = sendSprite(spr, hnd, callbackObject, p1, p2, p3)
   end case
+  
+  -- due to a stupid bug in 11.5.9.629 we can get <NULL> as a result of call() and on windows/shockwave it compares to 1 as true
+  -- voidP(<NULL>) = false, but ilk(<NULL>) = #void therefore we force void here
+  -- unfortunately there is another bug in director, which will throw a script error, if we use ilk() on deeted 3-D models
+  -- therefore we have to check voidP() BEFORE ilk()! oh well...
+  if voidP(retval) then retval = void
+  if ilk(retval) = #void then retval = void
   
   return retval
@@ -1654 +1698 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mCheckForValidImage me, image_img
+  -----------------------------------
+  -- CREATED: 21.04.2010
+  -- ACTION: Check whether the parameter is a valid image object.
+  --         Unfortunately there are sometimes cases where we end up with an
+  --         image object, which errors out on each IL operation
+  --         It is image:0 its ilk() is #image, but you can't even refer to its width
+  --         without running into script errors. Therefore we need a lame string comparison
+  --         as this image object has none of an image objects properties and methods :-(
+  --         LAME!! Because string comaparison is a lame and slow hack. So don't use this handler "for fun"
+  -- INPUT: <image_img> ; any
+  -- RETURNS: boolean ; true if the parameter is an image with a with or height > 0
+  -- EXAMPLE: put xscr().mCheckForValidImage(image(1,1,1))
+  --          -- 1
+  -----------------------------------
+  
+  if ilk(image_img) <> #image then return 0
+  if string(image_img) = "<image:0>" then return 0
+  if image_img.width * image_img.height < 1 then return 0
+  return 1
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 on ____MATH_UTILITIES
 end
@@ -1684 +1752 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+on mIsPowerOfTwo me, integer_num
+  return (bitand(integer_num, integer_num - 1) = 0)
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
 on mGetNextPowerOfTwo me, breite
   powerList = mGetPowerOf2List(me)
@@ -1744 +1818 @@
   the itemdelimiter = olddelim
   
-  
-  len = length(dateiname)
-  ext = ""
-  until = max(1, len-8) -- let's pretend, that a file extension is not langer than 8 chars
-  
-  repeat with n = len down to until
-    this = dateiname.char[n]
-    put this before ext
-    delete char n of dateiname
-    if this = "." then exit repeat
-  end repeat
-  
-  if char 1 of ext <> "." then -- no extension
-    put ext after dateiname
-    ext = ""
-  end if
-  
-  return [#basedir:fname, #basename:dateiname, #extension:ext]
-  
+  ext = mSplitFromEnd(me, dateiname, ".")
+  
+  return [#basedir:fname, #basename:ext[#basename], #extension:ext[#extension]]
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSplitFromEnd me, string_source, char_delim
+  -----------------------------------
+  -- CREATED: 23.03.2010
+  -- ACTION: Get the file extension
+  --         (or use any other SINGLE char to get the remaining bits of a string AFTER that char)
+  -- INPUT: <string_source> ; string ; the input string
+  --        <char_delim> ; string ; one char to be used as the itemdelimiter => optional, default = "."
+  -- RETURNS: property list with [#basename:"", #extension:""]
+  -- EXAMPLE: put xscr().mSplitFromEnd("com.adobe.director.plist", ".")
+  --          -- [#basename:"com.adobe.director", #extension:"plist"]
+  -----------------------------------
+  
+  char_delim = string(char_delim)
+  if length(char_delim) > 0 then
+    char_delim = char 1 of char_delim
+  else
+    char_delim = "." -- defaults to . => find file extension
+  end if
+  
+  if offset(char_delim, string_source) < 1 then
+    return [#basename:string_source, #extension:""]
+  end if
+  
+  olddelim = the itemdelimiter
+  the itemdelimiter = char_delim
+  ext = the last item of string_source
+  delete the last item of string_source
+  the itemdelimiter = olddelim
+  return [#basename:string_source, #extension:ext]
 end
 
@@ -1769 +1861 @@
 on mConvertAbsolutePathToRelative me, aPath, newDelim, anAbsoluteBasedir
   
+  
+  
   anAbsoluteBasedir = string(anAbsoluteBasedir)
+  if length(anAbsoluteBasedir) < 1 then
+    
+    if not(the runmode contains "auth") then
+      externalPathHackList = mGetPlayBackModeValue(me, #externalPathHackList)
+      if listP(externalPathHackList) then
+        
+        delim = the last char of the moviepath
+        if length(delim) < 1 then
+          if (the runmode contains "plug") then
+            delim = "/"
+          else
+            delim = the last char of the applicationpath
+          end if
+        end if
+        
+        repeat with thisHack in externalPathHackList
+          if ilk(thisHack) = #proplist then
+            ident = thisHack[#identifier]
+            
+            if delim <> "/" then
+              offs = offset("/", ident)
+              repeat while offs > 0
+                put delim into char offs of ident
+                offs = offset("/", ident)
+              end repeat
+            end if
+            
+            if offset(ident, aPath) > 0 then
+              if aPath starts thisHack[#basePath] & ident then
+                anAbsoluteBasedir = thisHack[#basePath]
+                exit repeat
+              end if
+            end if
+          end if
+        end repeat
+      end if
+    end if
+    
   if length(anAbsoluteBasedir) < 1 then anAbsoluteBasedir = the moviepath
-  if length(anAbsoluteBasedir) < 1 then return ""
+    
+  end if
+  
+  if length(anAbsoluteBasedir) < 1 then return aPath
   
   delim = the last char of the moviepath
@@ -1782 +1917 @@
   if offs <> 1 then
     put "Script:commonMovieScript; Handler:mConvertAbsolutePathToRelative; The path:" &&QUOTE& aPath &QUOTE&& "is not inside the current path specified" &&QUOTE& anAbsoluteBasedir &QUOTE
-    return ""
+    return aPath
   end if
   delete char 1 to length(anAbsoluteBasedir) of aPath
@@ -1800 +1935 @@
 -- convert a relative path to an absolute path: (Sorry, the name of this handler couldn't be more stupid ;-)
 on mGetRelativePath me, aPath, mp -- mp optional: default = the moviepath
+  
+  if aPath contains "maxState" then
+    nothing
+  end if
+  
+  if not(the runmode contains "auth") then
+    externalPathHackList = mGetPlayBackModeValue(me, #externalPathHackList)
+    if listP(externalPathHackList) then
+      repeat with thisHack in externalPathHackList
+        if ilk(thisHack) = #proplist then
+          if aPath starts thisHack[#identifier] then
+            mp = thisHack[#basePath]
+            --            alert "changed basepath to:" && mp
+            regexp = thisHack[#regexp]
+            if ilk(regexp) = #proplist then
+              searchString = string(regexp[#searchString])
+              if length(searchString) > 0 then
+                replacementString = string(regexp[#replacementString])
+                aPath = jReplaceAll(aPath, searchString, replacementString, "ig", 1)
+              end if
+            end if
+            exit repeat
+          end if
+        end if
+      end repeat
+    end if
+  end if
   
   mp = string(mp)
@@ -2054 +2216 @@
     splitPath = mSplitPath(me, fullPath)
     dd = 0
-    dup = splitPath.getaprop(#basedir) & splitPath.getaprop(#basename) & backUpSuffix & splitPath.getaprop(#extension) & "_" & dd
+    dup = splitPath.getaprop(#basedir) & splitPath.getaprop(#basename) & backUpSuffix & "." & splitPath.getaprop(#extension) & "_" & dd
     repeat while mCheckFileExists(me, dup) = 1
       dd = dd + 1
-      dup = splitPath.getaprop(#basedir) & splitPath.getaprop(#basename) & backUpSuffix & splitPath.getaprop(#extension) & "_" & dd
+      dup = splitPath.getaprop(#basedir) & splitPath.getaprop(#basename) & backUpSuffix & "." & splitPath.getaprop(#extension) & "_" & dd
     end repeat
     
@@ -2145 +2307 @@
 on mUrlEncode me, srcText
   
-  srcText = urlencode(srcText)
+  srcText = urlencode(string(srcText))
   
   offs = offset("+", srcText)
@@ -2262 +2424 @@
   if integerP(integer(str.char[1])) then put "n__" before str
   
+  if length(str) < 1 then str = "xxx_" & the milliseconds
+  
   return str
 end
@@ -2298 +2462 @@
 on mHTMLize me, str
   if offset("<html", str) < 1 then
-    if offset("<title>", str) < 1 then put "<title>untitled</title>" before str
+    titlePos = offset("</title>", str)
+    if titlePos < 1 then
+      theTitle = "<title>untitled</title>"
+      put theTitle before str
+      firstchar = length(theTitle)
+    else
+      firstchar = titlePos + 7
+    end if
     if offset("<body", str) < 1 then
-      put "<body>" before str
+      put "<body>" after char firstchar of str
       put "</body>" after str
     end if
@@ -2539 +2710 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+on mGetDateTimeString me, date_Date
+  
+  if ilk(date_Date) <> #date then theDate = the systemdate
+  else theDate = date_Date
+  
+  theYear = theDate.year
+  
+  theDay = theDate.day
+  if theDay < 10 then theDay = "0" & theDay
+  
+  theMonth = theDate.month
+  if theMonth < 10 then theMonth = "0" & theMonth
+  
+  theTime = mGetTimeStringFromSeconds(me, theDate.seconds)
+  
+  return theYear & "-" & theMonth & "-" & theDay & "T" & theTime
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetTimeStringFromSeconds me, integer_SecondsSinceMidnight
+  
+  if ilk(integer_SecondsSinceMidnight) <> #integer then secs = (the systemdate).seconds
+  else secs = integer_SecondsSinceMidnight
+  
+  hours = secs / 3600
+  if hours < 10 then hours = "0" & hours
+  secs = secs mod 3600
+  mins = secs / 60
+  if mins < 10 then mins = "0" & mins
+  secs = secs mod 60
+  if secs < 10 then secs = "0" & secs
+  
+  return hours & ":" & mins & ":" & secs
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
 on interface me
   str = "Common Movie Script  by alex da franca c2003 -- alex@farbflash.de -- all rigths reserved"

trunk/lingosource/castlib2/scriptTextParser.ls

@@ -7 +7 @@
 --
 -- DESCRIPTION:
--- -
+--              This script parses the scripttext of scriptmembers in order to provide information about
+--              handlers, their parameters etc.
+--              Obviously this is not of much use, if the movie is protected and thus the scripttext
+--              is not available. Nonetheless even without scripttext, there are some infos about scripts
+--              which will be provided as a property list with infos or directly as string, which can be "put"
+--              into the message window
 --
 -- REQUIRES:
@@ -13 +18 @@
 --
 -- USAGE:
--- -
+--              This script is used by script "Script_Root_Object" in order to provide some authoring helper handlers
+--              for scripts
 --
 -- EXAMPLE:
@@ -21 +27 @@
 
 on handlerList me, script_or_instance_or_member_object, string_keyword, string_prefix, boolean_withLingoDoc, boolean_onlyLingoDoc
+  -----------------------------------
+  -- CREATED: 02.03.2010
+  -- ACTION: Description
+  -- INPUT: <script_or_instance_or_member_object> ; script member
+  --        <string_keyword> ; filter, only handlers, which contain/start with/end with this
+  --                           keyword will be listed
+  --        <string_prefix> ; prefix for the output string of each handler, so that the whole
+  --                          line can be used directly for copy+paste
+  --        <boolean_withLingoDoc> ; output also the "lingodoc" for each handler
+  --                                 "lingodoc" is the comment DIRECTLY after each handler definition
+  --                                 until the first NON-comment line
+  --        <boolean_onlyLingoDoc> ; only list handlers, which have "lingodoc" (=> public handlers)
+  -- RETURNS: string
+  -- EXAMPLE: put xscr(#scriptTextParser).handlerList(me, "dler", "xscr(#scriptTextParser)")
+  -- -- output lists only handlers which contain the string "dler"
+  -- xscr(#scriptTextParser).handlerList(script_or_instance_or_member_object, string_keyword, string_prefix, boolean_withLingoDoc, boolean_onlyLingoDoc)
+  -- xscr(#scriptTextParser).mGetHandlerInfoList(member_memref, string_keyword)
+  -- xscr(#scriptTextParser).parseHandlerList(list_handlerlist, list_itemList, proplist_memberInfo, string_keyword)
+  -----------------------------------
   
   infoList = mGetInfoListForItem(me, script_or_instance_or_member_object, string_keyword)
@@ -47 +72 @@
 
 on mGetInfoListForItem me, script_or_instance_or_member_object, string_keyword
+  -----------------------------------
+  -- CREATED: 02.03.2010
+  -- ACTION: Description
+  -- INPUT: <script_or_instance_or_member_object>
+  --        <string_keyword>
+  -- RETURNS: -
+  -- EXAMPLE: -
+  -----------------------------------
+  
   memberName = ""
   
@@ -86 +120 @@
 
 on mGetHandlerInfoList me, member_memref, string_keyword
+  -----------------------------------
+  -- CREATED: 02.03.2010
+  -- ACTION: Description
+  -- INPUT: <member_memref>
+  --        <string_keyword>
+  -- RETURNS: -
+  -- EXAMPLE: -
+  -----------------------------------
   
   theItems = []