From b164e37982e08adaf54f063104b5c93959ac083a Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 12 Jan 2011 10:01:00 +0000
Subject: [PATCH] minor: translators cleanup (got rid of stale code)
SVN: 19383
---
.../translator/EntityPropertyTranslator.java | 40 -------------------
.../translator/ExperimentTranslator.java | 4 +-
.../shared/translator/MaterialTranslator.java | 24 -----------
.../translator/VocabularyTermTranslator.java | 18 ---------
4 files changed, 2 insertions(+), 84 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
index 0fa393a8920..03b717c1e6c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
@@ -63,30 +63,6 @@ public final class EntityPropertyTranslator
return result;
}
- public static IEntityProperty translateWithoutEscaping(EntityPropertyPE propertyPE,
- Map<PropertyTypePE, PropertyType> cacheOrNull)
- {
- final DataTypeCode typeCode = PropertyTranslatorUtils.getDataTypeCode(propertyPE);
- final IEntityProperty result = PropertyTranslatorUtils.createEntityProperty(typeCode);
- result.setPropertyType(PropertyTypeTranslator.translate(propertyPE
- .getEntityTypePropertyType().getPropertyType(), cacheOrNull));
- result.setOrdinal(propertyPE.getEntityTypePropertyType().getOrdinal());
- switch (typeCode)
- {
- case CONTROLLEDVOCABULARY:
- result.setVocabularyTerm(VocabularyTermTranslator
- .translateWithoutEscaping(propertyPE.getVocabularyTerm()));
- break;
- case MATERIAL:
- result.setMaterial(MaterialTranslator.translateWithoutEscaping(
- propertyPE.getMaterialValue(), false));
- break;
- default:
- result.setValue(propertyPE.tryGetUntypedValue());
- }
- return result;
- }
-
public final static List<IEntityProperty> translate(final Set<? extends EntityPropertyPE> list,
Map<PropertyTypePE, PropertyType> cacheOrNull)
{
@@ -102,22 +78,6 @@ public final class EntityPropertyTranslator
return result;
}
- public final static List<IEntityProperty> translateWithoutEscaping(
- final Set<? extends EntityPropertyPE> list,
- Map<PropertyTypePE, PropertyType> cacheOrNull)
- {
- if (list == null)
- {
- return null;
- }
- final List<IEntityProperty> result = new ArrayList<IEntityProperty>();
- for (final EntityPropertyPE property : list)
- {
- result.add(translateWithoutEscaping(property, cacheOrNull));
- }
- return result;
- }
-
public final static IEntityProperty[] translate(final EntityPropertyPE[] list,
Map<PropertyTypePE, PropertyType> cacheOrNull)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
index da9cd75818c..8992f58c95b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
@@ -54,8 +54,8 @@ public final class ExperimentTranslator
{
if (experiment.isPropertiesInitialized())
{
- result.setProperties(EntityPropertyTranslator.translateWithoutEscaping(
- experiment.getProperties(), new HashMap<PropertyTypePE, PropertyType>()));
+ result.setProperties(EntityPropertyTranslator.translate(experiment.getProperties(),
+ new HashMap<PropertyTypePE, PropertyType>()));
} else
{
result.setProperties(new ArrayList<IEntityProperty>());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
index 7f2c9ee661f..e875ba96b63 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
@@ -79,30 +79,6 @@ public final class MaterialTranslator
return result;
}
- public final static Material translateWithoutEscaping(final MaterialPE materialPE,
- final boolean withProperties)
- {
- if (materialPE == null)
- {
- return null;
- }
- final Material result = new Material();
- result.setCode(materialPE.getCode());
- result.setId(HibernateUtils.getId(materialPE));
- result.setModificationDate(materialPE.getModificationDate());
- result.setMaterialType(MaterialTypeTranslator.translate(materialPE.getMaterialType(),
- new HashMap<PropertyTypePE, PropertyType>()));
- result.setDatabaseInstance(DatabaseInstanceTranslator.translate(materialPE
- .getDatabaseInstance()));
- result.setRegistrator(PersonTranslator.translate(materialPE.getRegistrator()));
- result.setRegistrationDate(materialPE.getRegistrationDate());
- if (withProperties)
- {
- setProperties(materialPE, result);
- }
- return result;
- }
-
private static void setProperties(final MaterialPE materialPE, final Material result)
{
if (materialPE.isPropertiesInitialized())
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
index b8528f8f6e5..967a00365bf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
@@ -53,24 +53,6 @@ public class VocabularyTermTranslator
return result;
}
- public static VocabularyTerm translateWithoutEscaping(VocabularyTermPE vt)
- {
- if (vt == null)
- {
- return null;
- }
- VocabularyTerm result = new VocabularyTerm();
- result.setId(HibernateUtils.getId(vt));
- result.setCode(vt.getCode());
- result.setLabel(vt.getLabel());
- result.setDescription(vt.getDescription());
- result.setOrdinal(vt.getOrdinal());
- result.setUrl(vt.getUrl());
- result.setRegistrationDate(vt.getRegistrationDate());
- result.setRegistrator(PersonTranslator.translate(vt.getRegistrator()));
- return result;
- }
-
public static List<VocabularyTerm> translateTerms(List<VocabularyTermPE> terms)
{
final List<VocabularyTerm> result = new ArrayList<VocabularyTerm>();
--
GitLab