Skip to content

Commit

Permalink
updated license info
Browse files Browse the repository at this point in the history
  • Loading branch information
JesterXL committed Aug 8, 2015
1 parent bad05ac commit ead1ddf
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 70 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.textile
@@ -1,5 +1,12 @@
h2. Robotlegs Framework Changelog:

h4. v0.5

August 8th, 2015

- upgraded all examples to Graphics 2.0
- converted all classes to be more congurent with Lua 5.2 classes that don't use _G.

h3. v0.4

May 4th, 2013
Expand Down
23 changes: 17 additions & 6 deletions LICENSE
@@ -1,10 +1,21 @@
Open Source Initiative OSI - The MIT License (MIT):Licensing

The MIT License (MIT)
Copyright (c) 2011 the original author or authors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Copyright (c) 2015 Jesse Warden

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
7 changes: 0 additions & 7 deletions examples/basic/org/robotlegs/Command.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Command = {}

function Command:new()
Expand Down
7 changes: 0 additions & 7 deletions examples/basic/org/robotlegs/Context.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Context = {}

function Context:new()
Expand Down
7 changes: 0 additions & 7 deletions examples/basic/org/robotlegs/Mediator.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Mediator = {}

function Mediator:new()
Expand Down
7 changes: 0 additions & 7 deletions examples/cafe-townsend/code/robotlegs/Command.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Command = {}

function Command:new()
Expand Down
7 changes: 0 additions & 7 deletions examples/cafe-townsend/code/robotlegs/Context.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Context = {}

function Context:new()
Expand Down
7 changes: 0 additions & 7 deletions examples/cafe-townsend/code/robotlegs/Mediator.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Mediator = {}

function Mediator:new()
Expand Down
7 changes: 0 additions & 7 deletions src/org/robotlegs/Command.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Command = {}

function Command:new()
Expand Down
9 changes: 1 addition & 8 deletions src/org/robotlegs/Context.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Context = {}

function Context:new()
Expand Down Expand Up @@ -83,7 +76,7 @@ function Context:new()
--print("Context::createMediator, viewInstance: ", viewInstance)
assert(viewInstance.classType, "viewInstance does not have a classType parameter.")
local className = assert(self:getClassName(viewInstance.classType), "Failed to get class name")
assert(_G[className], "Cannot find viewInstance class")
-- assert(_G[className], "Cannot find viewInstance class")
assert(self:hasCreatedMediator(viewInstance) == false, "viewInstance already has an instantiated Mediator.")
local mediatorClassName = self.mediators[viewInstance.classType]
assert(mediatorClassName, "There is no Mediator class registered for this View class.")
Expand Down
7 changes: 0 additions & 7 deletions src/org/robotlegs/Mediator.lua
@@ -1,10 +1,3 @@
--[[
Copyright (c) 2011 the original author or authors
Permission is hereby granted to use, modify, and distribute this file
in accordance with the terms of the license agreement accompanying it.
--]]
local Mediator = {}

function Mediator:new()
Expand Down

0 comments on commit ead1ddf

Please sign in to comment.