Author: bklaas
Date: Wed Jan 28 13:49:52 2009
New Revision: 3975
URL: http://svn.slimdevices.com?rev=3975&root=Jive&view=rev
Log:
Bug: n/a
Description: move strings.lua to string.lua
change all references to strings to string throughout squeezeplay Lua code
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/string.lua
- copied unchanged from r3974,
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/strings.lua
Removed:
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/utils/strings.lua
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketUdp.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua?rev=3975&root=Jive&r1=3974&r2=3975&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
Wed Jan 28 13:49:52 2009
@@ -20,7 +20,7 @@
local tostring, tonumber, pairs, ipairs, table = tostring, tonumber, pairs,
ipairs, table
local oo = require("loop.simple")
local string = require("string")
-local strings = require("jive.utils.strings")
+local string = require("jive.utils.string")
local table = require("jive.utils.table")
local Applet = require("jive.Applet")
@@ -92,7 +92,7 @@
local complexWeight = jiveMain:getComplexWeight(id, item)
local weights = {}
- item.weights = strings:split('%.', complexWeight, weights)
+ item.weights = string.split('%.', complexWeight, weights)
-- if this is a home item and setting = 'hidden', then unselect
if self.currentSettings[id] and self.currentSettings[id] ==
'hidden' and item.node == 'home' then
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua?rev=3975&root=Jive&r1=3974&r2=3975&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua Wed Jan
28 13:49:52 2009
@@ -22,8 +22,7 @@
local setfenv, getfenv, require, pcall, unpack = setfenv, getfenv, require,
pcall, unpack
local tostring, tonumber, collectgarbage = tostring, tonumber, collectgarbage
-local string = require("string")
-local strings = require("jive.utils.strings")
+local string = require("jive.utils.string")
local oo = require("loop.simple")
local io = require("io")
@@ -100,7 +99,7 @@
local dir = dir:gsub("\\", "/")
local newPath = ""
- for i, element in pairs(strings:split('/', dir)) do
+ for i, element in pairs(string.split('/', dir)) do
newPath = newPath .. element
if i ~= 1 then --first element is (for full path): blank for unix ,
"<drive-letter>:" for windows
if lfs.attributes(newPath, "mode") == nil then
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketUdp.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketUdp.lua?rev=3975&root=Jive&r1=3974&r2=3975&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketUdp.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketUdp.lua Wed Jan
28 13:49:52 2009
@@ -53,7 +53,7 @@
local oo = require("loop.simple")
local coroutine = require("coroutine")
-local strings = require("jive.utils.strings")
+local string = require("jive.utils.string")
local Socket = require("jive.net.Socket")
local log = require("jive.utils.log").logger("net.socket")
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3975&root=Jive&r1=3974&r2=3975&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Jan 28
13:49:52 2009
@@ -35,7 +35,6 @@
local os = require("os")
local math = require("math")
-local string = require("string")
local table = require("table")
local oo = require("loop.base")
@@ -54,7 +53,7 @@
local Udap = require("jive.net.Udap")
local debug = require("jive.utils.debug")
-local strings = require("jive.utils.strings")
+local string = require("jive.utils.string")
local log = require("jive.utils.log").logger("player")
local EVENT_KEY_ALL = jive.ui.EVENT_KEY_ALL
@@ -199,7 +198,7 @@
-- first compress the table elements into a single string with newlines
local text = table.concat(msg, "\n")
-- then split the new string on \n instructions within the concatenated
string, and into a table
- local split = strings:split('\\n', text)
+ local split = string.split('\\n', text)
-- then compress the new table into a string with all newlines as needed
local text2 = table.concat(split, "\n")
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua?rev=3975&root=Jive&r1=3974&r2=3975&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua Wed Jan 28
13:49:52 2009
@@ -3,7 +3,7 @@
local oo = require("loop.base")
local table = require("jive.utils.table")
-local strings = require("jive.utils.strings")
+local string = require("jive.utils.string")
local Framework = require("jive.ui.Framework")
local SimpleMenu = require("jive.ui.SimpleMenu")
@@ -232,7 +232,7 @@
self.customNodes[item.id] = node
if item.node ~= 'home' and node == 'home' then
local complexWeight = self:getComplexWeight(item.id,
item)
- item.weights = strings:split('%.', complexWeight)
+ item.weights = string.split('%.', complexWeight)
end
else
node = item.node
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
