Fixed value of Vectors when hidding the classpath, and more secure returned value on other types.

Neverbirth · Neverbirth · commit 293d5023cf31 · 2015-04-22T04:00:54.000+02:00
diff --git a/External/Plugins/FlashDebugger/Controls/DataTree/ValueNode.cs b/External/Plugins/FlashDebugger/Controls/DataTree/ValueNode.cs
@@ -37,12 +37,16 @@ public override string Value
                     if (HideFullClasspath)
                     {
                         // return class type without classpath
-                        typeStr = m_Value.getTypeName().ToString().AfterLast("::", true);
+                        string typeName = m_Value.getTypeName().ToString();
+                        if (typeName.StartsWith("__AS3__.vec::Vector.<") || typeName.StartsWith("Vector.<"))
+                            typeStr = "Vector.<" + typeName.AfterLast("::", true);
+                        else
+                            typeStr = typeName.After("::", 0, true).Replace("::", ".");
                     }
                     else
                     {
                         // return class type with classpath
-                        typeStr = m_Value.getTypeName().replaceAll("::", ".").ToString();
+                        typeStr = m_Value.getTypeName().ToString().Replace("::", ".");
                     }
                     
                     // show / hide IDs

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,16 @@ public override string Value`
`37`	`37`	`if (HideFullClasspath)`
`38`	`38`	`{`
`39`	`39`	`// return class type without classpath`
`40`		`- typeStr = m_Value.getTypeName().ToString().AfterLast("::", true);`
	`40`	`+ string typeName = m_Value.getTypeName().ToString();`
	`41`	`+ if (typeName.StartsWith("__AS3__.vec::Vector.<") \|\| typeName.StartsWith("Vector.<"))`
	`42`	`+ typeStr = "Vector.<" + typeName.AfterLast("::", true);`
	`43`	`+ else`
	`44`	`+ typeStr = typeName.After("::", 0, true).Replace("::", ".");`
`41`	`45`	`}`
`42`	`46`	`else`
`43`	`47`	`{`
`44`	`48`	`// return class type with classpath`
`45`		`- typeStr = m_Value.getTypeName().replaceAll("::", ".").ToString();`
	`49`	`+ typeStr = m_Value.getTypeName().ToString().Replace("::", ".");`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`// show / hide IDs`