mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged DEV\EXTENSIONS to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4868 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4869 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4904 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4938 . Module management support Modularization of Records Management git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -42,6 +42,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.Path;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.util.ISO8601DateFormat;
|
||||
import org.alfresco.util.VersionNumber;
|
||||
|
||||
/**
|
||||
* Support for generic conversion between types.
|
||||
@@ -278,6 +279,14 @@ public class DefaultTypeConverter
|
||||
}
|
||||
});
|
||||
|
||||
INSTANCE.addConverter(String.class, VersionNumber.class, new TypeConverter.Converter<String, VersionNumber>()
|
||||
{
|
||||
public VersionNumber convert(String source)
|
||||
{
|
||||
return new VersionNumber(source);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
//
|
||||
// From Locale
|
||||
@@ -296,7 +305,20 @@ public class DefaultTypeConverter
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
//
|
||||
// From VersionNumber
|
||||
//
|
||||
|
||||
INSTANCE.addConverter(VersionNumber.class, String.class, new TypeConverter.Converter<VersionNumber, String>()
|
||||
{
|
||||
public String convert(VersionNumber source)
|
||||
{
|
||||
return source.toString();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
//
|
||||
// From MLText
|
||||
//
|
||||
|
@@ -28,6 +28,7 @@ import junit.framework.TestCase;
|
||||
|
||||
import org.alfresco.service.cmr.repository.MLText;
|
||||
import org.alfresco.util.ISO8601DateFormat;
|
||||
import org.alfresco.util.VersionNumber;
|
||||
|
||||
public class DefaultTypeConverterTest extends TestCase
|
||||
{
|
||||
@@ -98,6 +99,8 @@ public class DefaultTypeConverterTest extends TestCase
|
||||
assertEquals("woof", DefaultTypeConverter.INSTANCE.convert(String.class, mlText));
|
||||
// Locale
|
||||
assertEquals("fr_FR_", DefaultTypeConverter.INSTANCE.convert(String.class, Locale.FRANCE));
|
||||
// VersionNumber
|
||||
assertEquals("1.2.3", DefaultTypeConverter.INSTANCE.convert(String.class, new VersionNumber("1.2.3")));
|
||||
}
|
||||
|
||||
public void testFromString()
|
||||
@@ -131,6 +134,8 @@ public class DefaultTypeConverterTest extends TestCase
|
||||
|
||||
assertEquals(Locale.FRANCE, DefaultTypeConverter.INSTANCE.convert(Locale.class, "fr_FR"));
|
||||
assertEquals(Locale.FRANCE, DefaultTypeConverter.INSTANCE.convert(Locale.class, "fr_FR_"));
|
||||
|
||||
assertEquals(new VersionNumber("1.2.3"), DefaultTypeConverter.INSTANCE.convert(VersionNumber.class, "1.2.3"));
|
||||
}
|
||||
|
||||
public void testPrimativeAccessors()
|
||||
|
Reference in New Issue
Block a user