unageanu-jiji 0.1.0 → 1.0.0

data/html/js/agent-editor-page.js

@@ -28,8 +28,16 @@ fx.ui.pages.AgentEditorPage = function() {
   }, fx.template.Templates.common.button.del);
   this.removeButton.setEnable( true );
 
+  this.saveButton = new util.Button("agent-edit_save", "save", function() {
+    if ( !self.editingFile ) { return; }
+    var newData = agent_editor.getCode();
+    newData = newData.strip();
+    self.save(true,self.editingFile, self.target, newData);
+  }, fx.template.Templates.common.button.save);
+  this.saveButton.setEnable( false );
+  
   // 自動保存するためのタイマー
-  this.autoSave = new util.Timer( 1000*10, function(){ self.save(); }, false );
+//  this.autoSave = new util.Timer( 1000*10, function(){ self.save(); }, false );
 }
 fx.ui.pages.AgentEditorPage.prototype = {
 
@@ -38,11 +46,15 @@ fx.ui.pages.AgentEditorPage.prototype = {
    * 戻り値としてfalseを返すと遷移をキャンセルする。
    */
   from : function(toId) {
-    // 変更を強制的に反映するため、一旦保存
-    this.save();
     // 自動更新タイマーを停止
-    this.autoSave.stop();
-
+//    this.autoSave.stop();
+  
+    // 変更を強制的に反映するため、一旦保存
+    var self = this;
+    this.saveIfNotSaved(function(){
+      self.clearEdit();
+    });
+    
     // ページを非表示
     document.getElementById(this.elementId).style.display = "none";
     this.topicPath.set("");
@@ -66,25 +78,34 @@ fx.ui.pages.AgentEditorPage.prototype = {
         ? fx.template.Templates.agentEditor.topicPath.agent
         : fx.template.Templates.agentEditor.topicPath.sharedLib );
 
+    document.getElementById("agent_edit_desc").innerHTML =  
+      this.target == "agent" ?  fx.template.Templates.agentEditor.desc.agent : fx.template.Templates.agentEditor.desc.sharedLib;
+    
+    this.clearEdit();
+    
     // ファイル一覧を更新
     this.initialize();
-    // 自動更新タイマーを開始
-    this.autoSave.start();
   },
 
   initialize: function( ) {
     var self = this;
+    self.editingFile = null;
+    agent_editor.setCode("\n");
     this.agentFileListTable.initialize();
     this.agentFileListTable.table.subscribe("rowSelectEvent", function(ev){
-    	self.selectionChanged();
+      self.selectionChanged();
     });
     this.agentFileListTable.table.subscribe("rowUnselectEvent", function(ev){
-    	self.selectionChanged();
+      self.selectionChanged();
     });
+    this.agentFileListTable.loading(true);
     this.listAgentFiles( true, function( data ) {
       self.agentFiles = data;
       self.agentFileListTable.setData(data);
+      self.agentFileListTable.loading(false);
       self.selectionChanged();
+      // 自動更新タイマーを開始
+//      self.autoSave.start();
     }, null ); // TODO
   },
 
@@ -96,23 +117,24 @@ fx.ui.pages.AgentEditorPage.prototype = {
     this.dialog.show( "input", {
       message : fx.template.Templates.agentEditor.add.body.evaluate({ "text" : "" }),
       init: function() {
-    		document.file_name_input_form.file_name_input.focus();
+        document.file_name_input_form.file_name_input.focus();
         if ( !agent_editor.textarea.readOnly ) {
-        	agent_editor.toggleReadOnly();
+          agent_editor.toggleReadOnly();
         }
-    	},
+      },
       buttons : [
         { type:"ok",
-        	alt: "ok",
-        	key: "Enter",
-        	action: function(dialog){
+          alt: fx.template.Templates.common.button.ok,
+          key: "Enter",
+          action: function(dialog){
             var text = document.getElementById("file_name_input").value;
-              // 文字列をチェック
+            
+            // 文字列をチェック
             var error = null;
             if ( !text ) {
                 error = fx.template.Templates.agentEditor.add.errormsgs.no;
             }
-            if ( !error && !text.match( /^[A-Za-z0-9_\*\+\-\#\"\'\!\~\(\)\[\]\?\.]+$/ ) ) {
+           if ( !error && !text.match( /^[A-Za-z0-9_\*\+\-\#\"\'\!\~\(\)\[\]\?\.]+$/ ) ) {
                 error = fx.template.Templates.agentEditor.add.errormsgs.illegalChar;
             }
                // 重複チェック
@@ -130,31 +152,31 @@ fx.ui.pages.AgentEditorPage.prototype = {
             }
             if (error) {
                 dialog.content.innerHTML =
-                  fx.template.Templates.agentEditor.add.error.evaluate({ "error" : error })
-                  + fx.template.Templates.agentEditor.add.body.evaluate({ "text" : text })
+                  fx.template.Templates.agentEditor.add.error.evaluate({ "error" : error.escapeHTML() })
+                  + fx.template.Templates.agentEditor.add.body.evaluate({ "text" : text.escapeHTML() })
                 return false;
             } else {
-                self.saveFile( text, "", function(){
+                self.saveFile( text, self.target, "", function(){
                     self.listAgentFiles( true, function( data ) {
                           self.agentFiles = data;
                           self.agentFileListTable.setData(data);
                           self.selectionChanged();
                         }, null ); // TODO
                 }, null ); // TODO
-    	          if ( old != agent_editor.textarea.readOnly ) {
-    	          	agent_editor.toggleReadOnly();
-    	          }
+                if ( old != agent_editor.textarea.readOnly ) {
+                  agent_editor.toggleReadOnly();
+                }
                 return true;
             }
         } },
         { type:"cancel",
-        	alt: fx.template.Templates.common.button.cancel,
-        	key: "Esc",
-        	action: function(dialog){
-	          if ( old != agent_editor.textarea.readOnly ) {
-	          	agent_editor.toggleReadOnly();
-	          }
-	          return true;
+          alt: fx.template.Templates.common.button.cancel,
+          key: "Esc",
+          action: function(dialog){
+            if ( old != agent_editor.textarea.readOnly ) {
+              agent_editor.toggleReadOnly();
+            }
+            return true;
         }}
       ]
     } );
@@ -168,7 +190,7 @@ fx.ui.pages.AgentEditorPage.prototype = {
     }
     var names = [];
     for( var i=0,s=selectedRowIds.length;i<s;i++ ) {
-    	names.push( this.agentFileListTable.table.getRecord( selectedRowIds[i] ).getData().name);
+      names.push( this.agentFileListTable.table.getRecord( selectedRowIds[i] ).getData().name);
     }
     // 確認
     var self = this;
@@ -177,14 +199,17 @@ fx.ui.pages.AgentEditorPage.prototype = {
       message : fx.template.Templates.agentEditor.remove.body,
       init: function() {
         if ( !agent_editor.textarea.readOnly ) {
-        	agent_editor.toggleReadOnly();
+          agent_editor.toggleReadOnly();
         }
-    	},
+      },
       buttons : [
-        { type:"ok", action: function(dialog){
-	          if ( old != agent_editor.textarea.readOnly ) {
-	          	agent_editor.toggleReadOnly();
-	          }
+        { type:"ok", 
+          alt: fx.template.Templates.common.button.ok,
+          key: "Enter", 
+          action: function(dialog){
+            if ( old != agent_editor.textarea.readOnly ) {
+              agent_editor.toggleReadOnly();
+            }
             // 行のデータを削除
             self.deleteFile( names, function(){
                 self.listAgentFiles( true, function( data ) {
@@ -193,79 +218,142 @@ fx.ui.pages.AgentEditorPage.prototype = {
                   self.selectionChanged();
                 }, null ); // TODO
             }, null ); // TODO
+            return true;
         }},
         { type:"cancel",
-        	alt: fx.template.Templates.common.button.cancel,
-        	key: "Esc",
-        	action: function(dialog){
-	          if ( old != agent_editor.textarea.readOnly ) {
-	          	agent_editor.toggleReadOnly();
-	          }
-	          return true;
+          alt: fx.template.Templates.common.button.cancel,
+          key: "Esc",
+          action: function(dialog){
+            if ( old != agent_editor.textarea.readOnly ) {
+              agent_editor.toggleReadOnly();
+            }
+            return true;
         }}
       ]
     });
   },
-  save: function(){
-    if ( !this.editingFile ) { return; }
-    var newData = agent_editor.getCode();
+  save: function( showResult, editingFile, mode, newData ){
     var self = this;
-    if ( self.prevCode == newData )  { return; }
-    this.saveFile( this.editingFile, newData, function(){
+    this.saveFile( editingFile, mode,  newData, function(result){
+      // 結果を表示しない == 別画面に移動する場合は、前のコードは不要なので変更しない。
+       if (!showResult) { return; }
        self.prevCode = newData;
+       if ( result == "success" ) {
+         document.getElementById("agent_edit_msg").innerHTML = 
+           fx.template.Templates.agentEditor.saved.success.evaluate({ "now" : util.formatDate( new Date() ) });
+       } else {
+         document.getElementById("agent_edit_msg").innerHTML = 
+           fx.template.Templates.agentEditor.saved.error.evaluate({ "now" : util.formatDate( new Date() ), "result":result.escapeHTML()} );
+       }
     }, null ); // TODO
   },
-
+  /**
+   * 未保存かどうかチェックして、未保存でかつtrueであれば保存を実行する。
+   */
+  saveIfNotSaved: function( callback ){
+    // 編集中でない
+    if ( !this.editingFile ) {
+      if (callback) { callback(); }
+      return true; 
+    }
+    var editingFile = this.editingFile;
+    var target = this.target;
+    
+    // コードが変更されていない
+    var newData = agent_editor.getCode();
+    newData = newData.strip();
+    var self = this;
+    if ( self.prevCode == newData )  { 
+      if (callback) { callback(); }
+      return true; 
+    }
+    
+    // 確認ダイアログを表示
+    this.dialog.show( "input", {
+      message : fx.template.Templates.agentEditor.dosave,
+      buttons : [
+        { type:"yes", 
+          alt: fx.template.Templates.common.button.yes,
+          key: "Enter", 
+          action: function(dialog){
+            self.save(false, editingFile, target, newData);
+            if (callback) { callback(); }
+            return true;
+        }},
+        { type:"no",
+          alt: fx.template.Templates.common.button.no,
+          key: "Esc", 
+          action: function(dialog){
+            if (callback) { callback(); }
+            return true;
+          }
+        }
+      ]
+    });
+  },
+  /**
+   * 編集なし状態にします。
+   */
+  clearEdit : function(){
+    this.editingFile = null;
+    agent_editor.setCode("\n");
+    this.saveButton.setEnable( false );
+    document.getElementById("agent_edit_msg").innerHTML = "";
+  },
   selectionChanged: function() {
 
     // 選択されている行を取得
-  	var self = this;
+    var self = this;
     var selectedRowIds = this.agentFileListTable.table.getSelectedTrEls();
     var data = null;
     var removeEnable = false;
     if ( selectedRowIds.length <= 0 ) {
-    	// 選択なし
-    	removeEnable = false;
-    	document.getElementById("agent-editor-file-name").innerHTML=
-    	 fx.template.Templates.agentEditor.defaultFileName;
+      // 選択なし
+      removeEnable = false;
+      document.getElementById("agent-editor-file-name").innerHTML=
+       fx.template.Templates.agentEditor.defaultFileName;
     } else if ( selectedRowIds.length == 1 ) {
-    	removeEnable = true;
-    	// エディタも更新する。
-    	data = this.agentFileListTable.table.getRecord( selectedRowIds[0] ).getData();
+      removeEnable = true;
+      // エディタも更新する。
+      data = this.agentFileListTable.table.getRecord( selectedRowIds[0] ).getData();
     } else {
-    	removeEnable = true;
-    	// エディタは初期化
-    	document.getElementById("agent-editor-file-name").innerHTML= "---";
+      removeEnable = true;
+      // エディタは初期化
+      document.getElementById("agent-editor-file-name").innerHTML= "---";
     }
     //  削除の状態更新
     this.removeButton.setEnable(removeEnable);
+    this.saveButton.setEnable(false);
 
     // エディタのデータを更新
-    self.save();
-    if ( data ) {
-	    // 変更を強制的に反映するため、一旦保存
-	    self.editingFile = null;
-	    document.getElementById("agent-editor-file-name").innerHTML=
-	      fx.template.Templates.common.loading;
-	    self.getFile( data.name, function( body) {
-	      self.editingFile = data.name;
-	      self.prevCode = body;
-	      if ( agent_editor.textarea.readOnly ) {
-	      	agent_editor.toggleReadOnly();
-	      }
-	      agent_editor.setCode(body);
-	      agent_editor.editor.syntaxHighlight('init');
-	      document.getElementById("agent-editor-file-name").innerHTML= data.name;
-	    }, null ); // TODO
-    } else {
-	    self.save();
-	    self.editingFile = null;
-      agent_editor.setCode("");
-      agent_editor.editor.syntaxHighlight('init');
-      if ( !agent_editor.textarea.readOnly ) {
-      	agent_editor.toggleReadOnly();
+    // 保存確認
+    self.saveIfNotSaved( function(){ 
+      if ( data ) {
+        self.editingFile = null;
+        document.getElementById("agent-editor-file-name").innerHTML=
+          fx.template.Templates.common.loading;
+        self.getFile( data.name, function( body ) {
+          body = body.strip();
+          self.editingFile = data.name;
+          self.prevCode = body;
+          if ( agent_editor.textarea.readOnly ) {
+            agent_editor.toggleReadOnly();
+          }
+          if( body == "" ) body = "\n" // 空文字をcodePressに設定するとバグるので対策。
+          agent_editor.setCode(body);
+          agent_editor.editor.syntaxHighlight('init');
+          document.getElementById("agent-editor-file-name").innerHTML= data.name;
+          document.getElementById("agent_edit_msg").innerHTML = "";
+          self.saveButton.setEnable( true );
+        }, null ); // TODO
+      } else {
+        self.clearEdit();
+        agent_editor.editor.syntaxHighlight('init');
+        if ( !agent_editor.textarea.readOnly ) {
+          agent_editor.toggleReadOnly();
+        }
       }
-    }
+    });
   },
 
   /**
@@ -301,8 +389,8 @@ fx.ui.pages.AgentEditorPage.prototype = {
    * @param {Function} success 成功時のコールバック
    * @param {Function} fail 失敗時のコールバック
    */
-  saveFile : function( file, content, success, fail ) {
-     this.agentServiceStub.put_file( file, content, this.target, success, fail );
+  saveFile : function( file, target, content, success, fail ) {
+     this.agentServiceStub.put_file( file, content, target, success, fail );
   },
   /**
    * エージェントファイルを削除する。
@@ -327,7 +415,9 @@ fx.ui.AgentFileListTable.prototype = util.merge( util.BasicTable, {
     var self = this;
     var columnDefs = [
       {key:"name", label:fx.template.Templates.agentEditor.fileList.column.name,
-        sortable:true, resizeable:true, width:122},
+        sortable:true, resizeable:true, formatter: function( cell, record, column, data){
+          cell.innerHTML =  String(data).escapeHTML();
+      }, width:122},
       {key:"update", label:fx.template.Templates.agentEditor.fileList.column.update,
         sortable:true, resizeable:true, formatter: function( cell, record, column, data){
           var d = new Date(data*1000);

data/html/js/agent-selector.js

@@ -44,12 +44,12 @@ fx.agent.ui.AgentSelector.prototype = {
     if ( !this.readOnly ) {
       this.addButton = new util.Button(this.id + "__add", "add", function() {
         self.add();
-      }, "追加");
+      }, fx.template.Templates.common.button.add);
       this.addButton.setEnable( true );
 
       this.removeButton = new util.Button(this.id + "__remove", "remove", function() {
         self.remove();
-      }, "削除");
+      }, fx.template.Templates.common.button.del);
       this.removeButton.setEnable( false );
     }
   },
@@ -57,6 +57,7 @@ fx.agent.ui.AgentSelector.prototype = {
    * エージェントを設定する
    */
   setAgents : function(data) {
+    this.agentListTable.loading(false);
     if ( data ) {
       this.agentListTable.setData(data);
       if ( !this.readOnly ) {
@@ -73,6 +74,7 @@ fx.agent.ui.AgentSelector.prototype = {
     // 編集中なら、編集を確定
     if ( this.isEditing() ) {
       this.edit();
+      this.agentListTable.table.unselectAllRows();
     }
     var agents = [];
     var rs = this.agentListTable.table.getRecordSet().getRecords( 0, this.agentListTable.length() );
@@ -112,13 +114,16 @@ fx.agent.ui.AgentSelector.prototype = {
         self.listAgentClass( false, function( data ) {
           self.agentClasses = data;
           self.agentClassListTable.setData(data);
+          self.agentClassListTable.loading(false);
           if ( data.length > 0 ) {
             self.agentClassListTable.table.selectRow(0);
           }
         }, null ); // TODO
       },
       buttons : [
-        { type:"ok", action: function(dialog){
+        { type:"ok", 
+          alt: fx.template.Templates.common.button.ok,
+          key: "Enter", action: function(dialog){
 
             var selectedRowIds = self.agentClassListTable.table.getSelectedRows();
             var error = null;
@@ -134,17 +139,19 @@ fx.agent.ui.AgentSelector.prototype = {
             }
 
             if (error) {
-              dialog.content.innerHTML = '<div class="warn_msg">※'
-                   + error + '</div>' + msg;
+              dialog.content.innerHTML = fx.template.Templates.agentSelector.error.evaluate({
+                error: error.escapeHTML(),
+                msg: msg.escapeHTML()
+              });
               self.agentClassListTable.elementId = "agent_class_list";
-               self.agentClassListTable.initialize();
-               self.agentClassListTable.setData(self.agentClasses);
+              self.agentClassListTable.initialize();
+              self.agentClassListTable.setData(self.agentClasses);
               return false;
             } else {
               self._add( agents );
             }
         } },
-        { type:"cancel" }
+        { type:"cancel", alt: fx.template.Templates.common.button.cancel, key: "Esc" }
       ]
     } );
 
@@ -170,11 +177,14 @@ fx.agent.ui.AgentSelector.prototype = {
       var defs = newAgents[i].properties;
       var prop = {};
       var def  = {};
+      var error =  null;
       for ( var j=0, s=defs.length;j<s;j++  ) {
         def[defs[j]["id"]] = defs[j];
         prop[defs[j]["id"]] = defs[j]["default"] || "";
+        error = error || this.agentPropertyEditor.validate[defs[j].type].call( 
+            this.agentPropertyEditor, prop[defs[j]["id"]], defs[j].restrict );
       }
-
+      
       var a = {
         "id": UUID.generate(),
         "name": "名称未設定エージェント"+k,
@@ -183,7 +193,8 @@ fx.agent.ui.AgentSelector.prototype = {
         "file_name":newAgents[i].file_name,
         "description":newAgents[i].description,
         "property_def":def,
-        "properties":prop
+        "properties":prop,
+        "state": error ? "error" : ""
       };
       this.agentListTable.add( a ); // テーブルを更新
     }
@@ -192,10 +203,10 @@ fx.agent.ui.AgentSelector.prototype = {
   // 削除
   remove: function(){
 
-    // 編集中なら、編集を確定
-    if ( this.isEditing() ) {
-      this.edit();
-    }
+//    // 編集中なら、編集を確定
+//    if ( this.isEditing() ) {
+//      this.edit();
+//    }
 
     // 選択されている行を取得
     var selectedRowIds = this.agentListTable.table.getSelectedTrEls();
@@ -208,7 +219,7 @@ fx.agent.ui.AgentSelector.prototype = {
     this.dialog.show( "input", {
       message : msg,
       buttons : [
-        { type:"ok", action: function(dialog){
+        { type:"ok",alt: fx.template.Templates.common.button.ok, key: "Enter", action: function(dialog){
             // 行のデータを削除
            for( var j=0,s=selectedRowIds.length;j<s;j++ ) {
              self.agentListTable.remove( selectedRowIds[j] );
@@ -217,7 +228,7 @@ fx.agent.ui.AgentSelector.prototype = {
            self.selectionChanged();
         }},
         { type:"cancel",
-          alt: "キャンセル",
+          alt: fx.template.Templates.common.button.cancel,
           key: "Esc"
         }
       ]
@@ -246,9 +257,15 @@ fx.agent.ui.AgentSelector.prototype = {
       removeEnable = true;
       // エディタも更新する。
       var selectedEl = this.agentListTable.table.getSelectedTrEls()[0];
-      this.agentPropertyEditor.target =  this.agentListTable.table.getRecord  (selectedRowIds[0]);
-      var data = this.agentListTable.table.getRecord( selectedRowIds[0] ).getData();
-      self.agentPropertyEditor.set( data );
+      var target =  this.agentListTable.table.getRecord(selectedRowIds[0]);
+      if ( target ) {
+        this.agentPropertyEditor.target = target;
+        var data = target.getData();
+        self.agentPropertyEditor.set( data );
+      } else {
+        removeEnable = false;
+        self.agentPropertyEditor.clear( "エージェントを選択してください。" );
+      }
     } else {
       removeEnable = true;
       // エディタは初期化
@@ -263,14 +280,14 @@ fx.agent.ui.AgentSelector.prototype = {
   /**
    * プロパティを保存
    */
-  edit: function(){
+  edit: function( ){
     if ( this.readOnly ) return;
     var newData = this.agentPropertyEditor.get();
     if ( newData ) {
       this.agentListTable.update( this.agentPropertyEditor.target, newData );
       this.agentPropertyEditor.target = null;
       this.agentPropertyEditor.end();
-
+      
       this.checkDuplicateName();
     }
   },
@@ -338,10 +355,14 @@ fx.agent.ui.AgentClassListTable.prototype = util.merge( util.BasicTable, {
   initialize: function() {
     var self = this;
     var columnDefs = [
-      {key:"class_name", label:"クラス", sortable:true, resizeable:true, width:80 },
-      {key:"file_name", label:"ファイル", sortable:true, resizeable:true, width:80 },
+      {key:"class_name", label:"クラス", sortable:true, resizeable:true, formatter: function( cell, record, column, data){
+        cell.innerHTML = String(data).escapeHTML();
+      }, width:80 },
+      {key:"file_name", label:"ファイル", sortable:true, resizeable:true, formatter: function( cell, record, column, data){
+        cell.innerHTML = String(data).escapeHTML();
+      }, width:80 },
       {key:"description", label:"説明", sortable:true, resizeable:true, formatter: function( cell, record, column, data){
-        cell.innerHTML =  "<pre>" +  data + "</pre>";
+        cell.innerHTML =  "<pre>" +  String(data).escapeHTML() + "</pre>";
       }}
     ];
     self.ds = new YAHOO.util.DataSource([]);
@@ -374,16 +395,20 @@ fx.agent.ui.AgentListTable.prototype = util.merge( util.BasicTable, {
       {key:"name", label:"名前", sortable:true, resizeable:true, width:100, formatter: function( cell, record, column, data){
         var str = data.escapeHTML();
         if ( record.getData().state === "error" || record.getData().duplicate_name_error ) {
-          str = '<div class="problem"><span style="padding-right:3px;padding-top:2px;"><img src="./img/problem.gif" alt="問題" /></span>' + str + '</div>';
+          str = '<div class="problem"><span style="padding-right:3px;padding-top:2px;"><!--img src="./img/problem.gif" alt="問題" / --></span>' + String(str).escapeHTML() + '</div>';
         }
         cell.innerHTML =  str;
       }},
-      {key:"class_name", label:"クラス", sortable:true, resizeable:true, width:80 },
-      {key:"file_name", label:"ファイル", sortable:true, resizeable:true,width:80 },
+      {key:"class_name", label:"クラス", sortable:true, resizeable:true, formatter: function( cell, record, column, data){
+        cell.innerHTML = String(data).escapeHTML();
+      }, width:80 },
+      {key:"file_name", label:"ファイル", sortable:true, resizeable:true, formatter: function( cell, record, column, data){
+        cell.innerHTML = String(data).escapeHTML();
+      }, width:80 },
       {key:"properties", label:"プロパティ", sortable:true, resizeable:true, width:250, formatter: function( cell, record, column, data){
         var str = "";
         for( var k in data ) {
-          str += String(record.getData().property_def[k].name) + "=" + String(data[k]) + ", ";
+          str += String(record.getData().property_def[k].name).escapeHTML() + "=" + String(data[k]).escapeHTML() + ", ";
           if ( str.length > 500 ) {  break; }
         }
         cell.innerHTML =  str;
@@ -433,16 +458,17 @@ fx.agent.ui.AgentPropertyEditor.prototype = {
     var props = "";
     for ( var i in agent.property_def ) {
       props += fx.template.Templates.agentPropertyEditor.property.evaluate({
-        "name": agent.property_def[i].name,
+        "name": agent.property_def[i].name.escapeHTML(),
         "id": agent.property_def[i].id,
-        "default": agent.properties[agent.property_def[i].id] || agent.property_def[i]["default"]
+        "default": agent.properties[agent.property_def[i].id] != null 
+            ? agent.properties[agent.property_def[i].id] : agent.property_def[i]["default"]
       });
     }
     var info = {
       "id": this.elementId,
-      "class_name":agent.class_name,
-      "name": agent.name,
-      "desc": agent.description,
+      "class_name":agent.class_name.escapeHTML(),
+      "name": agent.name.escapeHTML(),
+      "desc": agent.description.escapeHTML(),
       "properties":props
     };
     document.getElementById( this.elementId ).innerHTML =
@@ -496,7 +522,7 @@ fx.agent.ui.AgentPropertyEditor.prototype = {
       } else if ( input["name"].match(/^property\_(.+)$/)  ) {
         var id = RegExp.$1;
         var def = this.validators["property_" + id];
-        error = error || this.validate[def.type].call( this, this.editing["properties"][id], def );
+        error = error || this.validate[def.type].call( this, value, def );
         this.editing["properties"][id] =  !error ? this.convert[def.type].call( this, value ) : value ;
       }
     }
@@ -505,6 +531,7 @@ fx.agent.ui.AgentPropertyEditor.prototype = {
   },
   end : function() {
     this.editing = null;
+    this.clear( "エージェントを選択してください。" );
   },
   /**
    * 何も編集していない状態にする。
@@ -607,17 +634,19 @@ fx.agent.ui.AgentPropertyEditorReadOnly.prototype = {
    this.editing = util.merge({}, agent);
    var props = "";
    for ( var i in agent.property_def ) {
+     var value = agent.properties[agent.property_def[i].id] || agent.property_def[i]["default"];
+     if (value && Object.isFunction(value.escapeHTML )) { value = value.escapeHTML(); }
      props += fx.template.Templates.agentPropertyEditor.propertyReadOnly.evaluate({
-       "name": agent.property_def[i].name,
+       "name": agent.property_def[i].name.escapeHTML(),
        "id": agent.property_def[i].id,
-       "default": agent.properties[agent.property_def[i].id] || agent.property_def[i]["default"]
+       "default": value
      });
    }
    var info = {
      "id": this.elementId,
-     "class_name":agent.class_name,
-     "name": agent.name,
-     "desc": agent.description,
+     "class_name":agent.class_name.escapeHTML(),
+     "name": agent.name.escapeHTML(),
+     "desc": agent.description.escapeHTML(),
      "properties":props
    };
    document.getElementById( this.elementId ).innerHTML =