Merged BRANCHES\DEV\MODEL_SPLIT to HEAD

Split the data dictionary out from the repository.
    There is a new DataModel project to add into eclipse
    Still to move a few context dependent tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2010-06-30 14:17:18 +00:00
parent 3238ca154a
commit 1e19360747
172 changed files with 170 additions and 30303 deletions

View File

@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.domain.qname;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
/**
@@ -28,7 +29,6 @@ import org.alfresco.util.EqualsHelper;
*/
public class NamespaceEntity
{
public static final String EMPTY_URI_SUBSTITUTE = ".empty";
public static final Long CONST_LONG_ZERO = new Long(0L);
private Long id;
@@ -94,7 +94,7 @@ public class NamespaceEntity
*/
public String getUriSafe()
{
if (EqualsHelper.nullSafeEquals(uri, NamespaceEntity.EMPTY_URI_SUBSTITUTE))
if (EqualsHelper.nullSafeEquals(uri, QName.EMPTY_URI_SUBSTITUTE))
{
return "";
}
@@ -108,6 +108,6 @@ public class NamespaceEntity
*/
public void setUriSafe(String uri)
{
this.uri = (uri.length() == 0) ? NamespaceEntity.EMPTY_URI_SUBSTITUTE : uri;
this.uri = (uri.length() == 0) ? QName.EMPTY_URI_SUBSTITUTE : uri;
}
}