チェンジセット 222

コミット日時:

2008/04/14 21:31:15 (14 年前)

コミッタ:

shinomiya

ログメッセージ:

• ImJson#toJSONString?(value, true)のJavaのクラス名表示形式を変更。
  
  
• newInstanceFilledProperty()で生成されるサンプルデータを設定可能に変更。
  
  
• テストケース作成完了
  

ファイル:

• trunk/im-jssp-extention/.classpath (更新) (1 diff)
• trunk/im-jssp-extention/.settings/org.eclipse.core.resources.prefs (更新) (1 diff)
• trunk/im-jssp-extention/src/main/js/jssp/script/api/im_json.js (更新) (10 diffs)

trunk/im-jssp-extention/.classpath

@@ -2 +2 @@
-<classpath>
-        <classpathentry kind="src" path="src/main/java"/>
+        <classpathentry kind="src" path="src/main/js"/>
-        <classpathentry kind="src" path="src/main/resources"/>
-        <classpathentry kind="src" path="src/main/js"/>
-        <classpathentry kind="src" path="src/test/java"/>
+        <classpathentry kind="src" path="src/test/js"/>
-        <classpathentry kind="src" path="src/test/resources"/>
-        <classpathentry kind="src" path="src/test/js"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

trunk/im-jssp-extention/.settings/org.eclipse.core.resources.prefs

@@ -1 @@
-Thu Apr 03 18:59
+Mon Apr 14 21:05
-eclipse.preferences.version=1
+encoding//src/main/js/jssp/script/api/im_json.js=UTF-8
-encoding//src/test/js/sample/web_service/invoke_sample.js=UTF-8
-encoding/<project>=UTF-8

trunk/im-jssp-extention/src/main/js/jssp/script/api/im_json.js

@@ -251 +251 @@
-                                        case ImJson.TYPE_NULL :
-                                        case ImJson.TYPE_UNDEFINED :
+                                                typeName += getJavaClassName(objectData, prop); // Javaクラス名があれば追記
-                                                tempStr += new String(objectData[prop]);
-                                                break;
@@ -265 +266 @@
-
-                                        case ImJson.TYPE_ARRAY :
-= appendJavaClassName(objectData, typeName
++= getJavaClassName(objectData, prop
-                                                tempStr += toJSONString4Array(objectData[prop], indentDepth + 1);
-                                                break;
-
-                                        case ImJson.TYPE_OBJECT :
-= appendJavaClassName(objectData, typeName
++= getJavaClassName(objectData, prop
-                                                tempStr += toJSONString4Object(objectData[prop], indentDepth + 1);
-                                                break;
@@ -288 +289 @@
-
-                                        case ImJson.TYPE_JAVA :
-= appendJavaClassName(objectData, typeName
++= getJavaClassName(objectData, prop
-                                                tempStr += '"' + ImJson.escapeData( new String(objectData[prop]) ) + '"';
-                                                break;
@@ -340 +341 @@
-                                case ImJson.TYPE_NULL :
-                                case ImJson.TYPE_UNDEFINED :
+                                        typeName += getJavaClassName(arrayData, ""); // Javaクラス名があれば追記
-                                        array[insertIdx] = new String(arrayData[idx]);
-                                        break;
@@ -349 +351 @@
-
-                                case ImJson.TYPE_DATE :
-idx
+prop
-                                        array[insertIdx] = ImJson.dateToSrcString(arrayData[idx]);
-                                        break;
-
-                                case ImJson.TYPE_ARRAY :
-= appendJavaClassName(arrayData, typeName
++= getJavaClassName(arrayData, ""
-                                        array[insertIdx] = toJSONString4Array(arrayData[idx], indentDepth + 1);
-                                        break;
-
-                                case ImJson.TYPE_OBJECT :
-= appendJavaClassName(arrayData, typeName
++= getJavaClassName(arrayData, ""
-                                        array[insertIdx] = toJSONString4Object(arrayData[idx], indentDepth + 1);
-                                        break;
@@ -376 +378 @@
-
-                                case ImJson.TYPE_JAVA :
-= appendJavaClassName(arrayData, typeName
++= getJavaClassName(arrayData, ""
-                                        array[insertIdx] = '"' + ImJson.escapeData( new String(arrayData[idx]) ) + '"';
-                                        break;
@@ -479 +481 @@
-         * @type String
-         */
-appendJavaClassName(obj, type
-
+getJavaClassName(obj, prop
+" + propName + "_
-                
-                if(javaClassName == undefined){
-typeName
+""
-                }
-                else{
-typeName + 
+
-                }
-        }
@@ -503 +505 @@
-                        case ImJson.TYPE_NULL :
-                        case ImJson.TYPE_UNDEFINED :
+                                typeName += getJavaClassName(value, ""); // Javaクラス名があれば追記
-                                jsonString = new String(value);
-                                break;
@@ -517 +520 @@
-
-                        case ImJson.TYPE_ARRAY :
-= appendJavaClassName(value, typeName
++= getJavaClassName(value, ""
-                                jsonString = toJSONString4Array(value, 1);
-                                break;
-
-                        case ImJson.TYPE_OBJECT :
-= appendJavaClassName(value, typeName
++= getJavaClassName(value, ""
-                                jsonString = toJSONString4Object(value, 1);
-                                break;
@@ -538 +541 @@
-
-                        case ImJson.TYPE_JAVA :
-= appendJavaClassName(value, typeName
++= getJavaClassName(value, ""
-                                jsonString = '"' + ImJson.escapeData(new String(value) ) + '"';
-                                break;