Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / assets / javascripts / manifest_base / type_name_args.coffee

diff --git a/app/assets/javascripts/manifest_base/type_name_args.coffee b/app/assets/javascripts/manifest_base/type_name_args.coffee
index 4f6d951..0456b8f 100644 (file)
--- a/app/assets/javascripts/manifest_base/type_name_args.coffee
+++ b/app/assets/javascripts/manifest_base/type_name_args.coffee
@@ -1,49 +1,19 @@
 class ManifestBase.TypeNameArgs\r
-  _parent = null\r
-  _name = null\r
-  _json = null\r
-  _module_name = null\r
-  _type = null\r
-  \r
-  parent: () ->\r
-    _parent\r
-  \r
-  name: () ->\r
-    _name\r
-  \r
-  json: () ->\r
-    _json\r
-  \r
-  module_name: () ->\r
-    _module_name\r
-  \r
-  type: () ->\r
-    _type\r
   \r
   set_default: () ->\r
-    _json['args'] ||= {}\r
-    _type = _json['type']\r
-    @args = _json['args']\r
+    @json['args'] ||= {}\r
+    @type = @json.type\r
+    @args = @json.args\r
   \r
   init: () ->\r
   \r
   module_names: () ->\r
-    _parent.module_names + [_module_name, _name]\r
+    @parent.module_names().concat([@module_name, @name])\r
   \r
   module_message: () ->\r
     ManifestBase.module_message(@module_names)\r
   \r
-  parent_name: () ->\r
-    _parent.name\r
-  \r
-  parent_json: () ->\r
-    _parent.json\r
-  \r
-  constructor: (parent, name, json, module_name) ->\r
-    _parent = parent\r
-    _name = name\r
-    _json = json\r
-    _module_name = module_name\r
+  constructor: (@parent, @name, @json, module_name) ->\r
     @set_default()\r
     @init()\r
   \r