Refactored common functionality in superclass

This commit is contained in:
Michael Becker 2016-06-07 01:09:10 -04:00
parent 0bd2162924
commit 12821abe9d
4 changed files with 18 additions and 5 deletions

View File

@ -82,10 +82,18 @@ namespace UniversalEditor.DataFormats.SourceCode
return sb.ToString();
}
protected virtual string MakeFriendlyDataType(string DataType)
public string MakeFriendlyDataType(string DataType)
{
if (String.IsNullOrEmpty (DataType))
DataType = "System.Void";
return MakeFriendlyDataTypeInternal (DataType);
}
protected virtual string MakeFriendlyDataTypeInternal(string DataType)
{
return DataType;
}
protected virtual string MakeKnownDataType(string DataType)
{
return DataType;

View File

@ -26,7 +26,7 @@ namespace UniversalEditor.DataFormats.SourceCode
return _dfr;
}
protected override string MakeFriendlyDataType(string DataType)
protected override string MakeFriendlyDataTypeInternal(string DataType)
{
switch (DataType)
{
@ -86,6 +86,10 @@ namespace UniversalEditor.DataFormats.SourceCode
{
return "ulong";
}
case "System.Void":
{
return "void";
}
}
return base.MakeFriendlyDataType(DataType);
}

View File

@ -364,7 +364,7 @@ namespace UniversalEditor.DataFormats.SourceCode.Java
{
base.ProcessToken(token, tr);
}
protected override string MakeFriendlyDataType(string DataType)
protected override string MakeFriendlyDataTypeInternal(string DataType)
{
switch (DataType)
{
@ -376,7 +376,8 @@ namespace UniversalEditor.DataFormats.SourceCode.Java
case "System.Int32": return "int";
case "System.Int64": return "long";
case "System.Single": return "float";
case "System.String": return "string";
case "System.String": return "string";
case "System.Void": return "void";
}
return base.MakeFriendlyDataType(DataType);
}

View File

@ -699,7 +699,7 @@ namespace UniversalEditor.DataFormats.SourceCode
}
}
protected override string MakeFriendlyDataType(string DataType)
protected override string MakeFriendlyDataTypeInternal(string DataType)
{
switch (DataType)
{