Context Navigation

← Previous Change
Next Change →

Changeset 103 for branches/omero

Timestamp:

06/09/05 18:43:07 (4 years ago)

Author:

jmoore

Message:

Lookin' good. All tests pass, though there's one
transient bug (see OmeroThumbnailsExplodes?....java)
Hoping it'll pop back up.

Location:

branches/omero/components

Files:

: 1 added
: 1 removed
: 14 modified
: 2 moved

client/project.xml (modified) (1 diff)
common/src/org/openmicroscopy/omero/tests/OMEData.java (modified) (3 diffs)
server/.classpath (modified) (1 diff)
server/.project (modified) (1 diff)
server/src/log4j.properties (modified) (1 diff)
server/src/org/openmicroscopy/omero/logic/HierarchyBrowsingImpl.java (modified) (1 diff)
server/src/spring.properties (deleted)
server/test/org/openmicroscopy/omero/server/itests/OmeroServiceTest.java (modified) (3 diffs)
server/test/org/openmicroscopy/omero/server/itests/OmeroThumbnailsBugTest.java (added)
shoola-adapter/.classpath (modified) (1 diff)
shoola-adapter/project.xml (modified) (1 diff)
shoola-adapter/src/org/openmicroscopy/omero/shoolaadapter/AdapterUtils.java (modified) (7 diffs)
shoola-adapter/src/org/openmicroscopy/omero/shoolaadapter/HierarchyBrowsingAdapter.java (modified) (10 diffs)
test/.classpath (modified) (1 diff)
test/.project (modified) (1 diff)
test/project.xml (modified) (2 diffs)
test/src/org/openmicroscopy/omero/test/OmeroGrinderTest.java (moved) (moved from branches/omero/components/client/test/org/openmicroscopy/omero/client/itests/OmeroGrinderTest.java) (2 diffs)
test/src/org/openmicroscopy/shoola/env/data/t/ShoolaGrinderTest.java (moved) (moved from branches/omero/components/test/src/org/openmicroscopy/shoola/env/data/t/GrinderTest.java) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/omero/components/client/project.xml

r100	r103
57	57	</includes>
58	58	</unitTest>
	59	<resources>
	60	<resource>
	61	<directory>src</directory>
	62	<includes>
	63	<include>*/.xml</include>
	64	<include>*/.properties</include>
	65	</includes>
	66	</resource>
	67	<resource>
	68	<directory>test</directory>
	69	<includes>
	70	<include>*/.xml</include>
	71	<include>*/.properties</include>
	72	</includes>
	73	</resource>
	74	</resources>
	75
59	76	</build>
60	77	</project>

branches/omero/components/common/src/org/openmicroscopy/omero/tests/OMEData.java

r100	r103
15	15	import javax.sql.DataSource;
16	16
	17	import org.apache.commons.lang.builder.ToStringBuilder;
17	18	import org.springframework.jdbc.core.JdbcTemplate;
18	19
…	…
33	34	}
34	35
35
36	36	final static String emptyColl = "collections may not be empty";
37
38	37	long seed = (new Random()).nextLong();
39
40	38	Random rnd = new Random(seed);
41	39
42	40	// Test data : calculated before to not change times.
43	41	public Set allUsers;
44
45	42	public Set allImgs;
46
47	43	public Set allDss;
48
49	44	public Set allPrjs;
50
51	45	public Set allCgs;
52
53	46	public Set allCs;
54
55	47	public int userId;
56
57	48	public int prjId;
58
59	49	public int dsId;
60
61	50	public int cgId;
62
63	51	public int cId;
64
65	52	public Set imgsPDI;
66
67	53	public Set imgsCGCI;
68
69	54	public Set imgsAnn1;
70
71	55	public Set imgsAnn2;
72
73	56	public Set dsAnn1;
74
75	57	public Set dsAnn2;
76	58
…	…
147	129	return (new Double(value)).intValue();
148	130	}
149
	131
	132	public String toString(){
	133	return new ToStringBuilder(this).
	134	append("seed",seed ).
	135	append("userId",userId).
	136	append("prjId",prjId).
	137	append("dsId",dsId).
	138	append("cgId",cgId).
	139	append("cId",cId).
	140	append("imgsPDI",imgsPDI).
	141	append("imgsCGCI",imgsCGCI).
	142	append("imgsAnn1",imgsAnn1).
	143	append("imgsAnn2",imgsAnn2).
	144	append("dsAnn1",dsAnn1).
	145	append("dsAnn2",dsAnn2).
	146	toString();
	147	}
150	148	}

branches/omero/components/server/.classpath

r102	r103
1	1	<?xml version="1.0" encoding="UTF-8"?>
	2
2	3	<classpath>
3		<classpathentry excluding=".svn" kind="src" path="src"/>
4		<classpathentry excluding=".svn" kind="src" path="web"/>
5		<classpathentry excluding=".svn" kind="src" path="test"/>
6		<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
7		<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
8		<classpathentry sourcepath="OMERO_HOME/components/jars/common/src" kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar"/>
9		<classpathentry kind="var" path="MAVEN_REPO/opensymphony/jars/oscache-2.0.1.jar"/>
10		<classpathentry kind="var" path="MAVEN_REPO/postgresql/jars/postgresql-7.4.1-jdbc3.jar"/>
11		<classpathentry kind="var" path="MAVEN_REPO/mysql/jars/mysql-connector-java-3.0.8-stable-bin.jar"/>
12		<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"/>
13		<classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"/>
14		<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
15		<classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/>
16		<classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/>
17		<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
18		<classpathentry sourcepath="HOME/lib/spring-framework-1.2.1/src" kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar"/>
19		<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2.1.jar"/>
20		<classpathentry kind="var" path="MAVEN_REPO/acegisecurity/jars/acegi-security-0.8.2.jar"/>
21		<classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/>
22		<classpathentry sourcepath="HOME/lib/hibernate-3.0.5/src" kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-3.0.5.jar"/>
23		<classpathentry kind="var" path="MAVEN_REPO/omero/jars/jta-hibernate.jar"/>
24		<classpathentry kind="var" path="MAVEN_REPO/omero/jars/asm-hibernate.jar"/>
25		<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
26		<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
27		<classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-2.1.jar"/>
28		<classpathentry kind="var" path="MAVEN_REPO/antlr/jars/antlr-2.7.5H3.jar"/>
29		<classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar"/>
30		<classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar"/>
31		<classpathentry kind="var" path="MAVEN_REPO/dbunit/jars/dbunit-2.1.jar"/>
32		<classpathentry kind="var" path="MAVEN_REPO/groovy/jars/groovy-all-1.0-beta-10.jar"/>
33		<classpathentry kind="output" path="target/eclipse"/>
	4	<classpathentry excluding="" kind="src" path="src">
	5	</classpathentry>
	6	<classpathentry kind="src" path="web">
	7	</classpathentry>
	8	<classpathentry kind="src" path="test">
	9	</classpathentry>
	10	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar">
	11	</classpathentry>
	12	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
	13	</classpathentry>
	14	<classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar">
	15	</classpathentry>
	16	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar">
	17	</classpathentry>
	18	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2.1.jar">
	19	</classpathentry>
	20	<classpathentry kind="var" path="MAVEN_REPO/acegisecurity/jars/acegi-security-0.8.2.jar">
	21	</classpathentry>
	22	<classpathentry kind="var" path="MAVEN_REPO/hessian/jars/hessian-2.1.12.jar">
	23	</classpathentry>
	24	<classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-3.0.5.jar">
	25	</classpathentry>
	26	<classpathentry kind="var" path="MAVEN_REPO/omero/jars/jta-hibernate.jar">
	27	</classpathentry>
	28	<classpathentry kind="var" path="MAVEN_REPO/omero/jars/asm-hibernate.jar">
	29	</classpathentry>
	30	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
	31	</classpathentry>
	32	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
	33	</classpathentry>
	34	<classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-2.1.jar">
	35	</classpathentry>
	36	<classpathentry kind="var" path="MAVEN_REPO/antlr/jars/antlr-2.7.5H3.jar">
	37	</classpathentry>
	38	<classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar">
	39	</classpathentry>
	40	<classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar">
	41	</classpathentry>
	42	<classpathentry kind="var" path="MAVEN_REPO/opensymphony/jars/oscache-2.0.1.jar">
	43	</classpathentry>
	44	<classpathentry kind="var" path="MAVEN_REPO/mysql/jars/mysql-connector-java-3.0.8-stable-bin.jar">
	45	</classpathentry>
	46	<classpathentry kind="var" path="MAVEN_REPO/postgresql/jars/postgresql-7.4.1-jdbc3.jar">
	47	</classpathentry>
	48	<classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.2.jar">
	49	</classpathentry>
	50	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar">
	51	</classpathentry>
	52	<classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar">
	53	</classpathentry>
	54	<classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar">
	55	</classpathentry>
	56	<classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar">
	57	</classpathentry>
	58	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar">
	59	</classpathentry>
	60	<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar">
	61	</classpathentry>
	62	<classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar">
	63	</classpathentry>
	64	<classpathentry kind="var" path="MAVEN_REPO/dbunit/jars/dbunit-2.1.jar">
	65	</classpathentry>
	66	<classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar">
	67	</classpathentry>
	68	<classpathentry kind="var" path="MAVEN_REPO/groovy/jars/groovy-all-1.0-beta-10.jar">
	69	</classpathentry>
	70	<classpathentry kind="output" path="target/classes">
	71	</classpathentry>
34	72	</classpath>

branches/omero/components/server/.project

r96	r103
1	1	<?xml version="1.0" encoding="UTF-8"?>
	2
2	3	<projectDescription>
3		<name>omero-server</name>
4		<comment>Server code</comment>
5		<projects>
6		</projects>
7		<buildSpec>
8		<buildCommand>
9		<name>org.eclipse.jdt.core.javabuilder</name>
10		<arguments>
11		</arguments>
12		</buildCommand>
13		<buildCommand>
14		<name>org.springframework.ide.eclipse.core.springbuilder</name>
15		<arguments>
16		</arguments>
17		</buildCommand>
18		<buildCommand>
19		<name>org.codehaus.groovy.eclipse.groovyBuilder</name>
20		<arguments>
21		</arguments>
22		</buildCommand>
23		</buildSpec>
24		<natures>
25		<nature>org.springframework.ide.eclipse.core.springnature</nature>
26		<nature>org.eclipse.jdt.core.javanature</nature>
27		<nature>org.codehaus.groovy.eclipse.groovyNature</nature>
28		</natures>
	4	<name>omero-server</name>
	5	<comment>Server code</comment>
	6	<projects>
	7	</projects>
	8	<buildSpec>
	9	<buildCommand>
	10	<name>org.eclipse.jdt.core.javabuilder</name>
	11	<arguments>
	12	</arguments>
	13	</buildCommand>
	14	</buildSpec>
	15	<natures>
	16	<nature>org.eclipse.jdt.core.javanature</nature>
	17	</natures>
29	18	</projectDescription>

branches/omero/components/server/src/log4j.properties

r98	r103
8	8	#log4j.logger.org.springframework=warn
9	9
	10	log4j.category.org.openmicroscopy=debug
10	11
	12

branches/omero/components/server/src/org/openmicroscopy/omero/logic/HierarchyBrowsingImpl.java

r102	r103
194	194	if (null == imagesAll \|\| imagesAll.size() == 0) {
195	195	return new HashSet();
196		}
	196	}//TODO log if this is empty. (input/output) update jdbc tests.
197	197
198	198	// LOGIC

branches/omero/components/server/test/org/openmicroscopy/omero/server/itests/OmeroServiceTest.java

r102	r103
4	4	package org.openmicroscopy.omero.server.itests;
5	5
	6	import org.apache.commons.logging.Log;
	7	import org.apache.commons.logging.LogFactory;
	8
6	9	import org.openmicroscopy.omero.tests.AbstractOmeroHierarchyBrowserIntegrationTest;
7	10	import org.openmicroscopy.omero.tests.OMEData;
8	11	import org.openmicroscopy.omero.tests.OMEPerformanceData;
	12	import org.openmicroscopy.omero.util.Utils;
9	13
10	14	/**
…	…
15	19	AbstractOmeroHierarchyBrowserIntegrationTest {
16	20
	21	private static Log log = LogFactory.getLog(OmeroServiceTest.class);
	22
17	23	/**
18	24	* @see org.springframework.test.AbstractDependencyInjectionSpringContextTests#getConfigLocations()
…	…
34	40	super("OmeroGrinderTest with Data",data);
35	41	}
36
	42
	43	public void testHessian(){
	44	log.info(getData());
	45	Utils.structureSize(this.testFindCGCIHierarchies());
	46	Utils.structureSize(this.testFindDatasetAnnotationsSet());
	47	Utils.structureSize(this.testFindDatasetAnnotationsSetForExperimenter());
	48	Utils.structureSize(this.testFindImageAnnotationsSet());
	49	Utils.structureSize(this.testFindImageAnnotationsSetForExperimenter());
	50	Utils.structureSize(this.testFindPDIHierarchies());
	51	Utils.structureSize(this.testLoadCGCIHierarchyCategory());
	52	Utils.structureSize(this.testLoadCGCIHierarchyCategoryGroup());
	53	Utils.structureSize(this.testLoadPDIHierarchyDataset());
	54	Utils.structureSize(this.testLoadPDIHierarchyProject());
	55	}
37	56	}

branches/omero/components/shoola-adapter/.classpath

r100	r103
1	1	<?xml version="1.0" encoding="UTF-8"?>
	2
2	3	<classpath>
3		<classpathentry kind="src" path="src"/>
4		<classpathentry output="target/test-classes" kind="src" path="test"/>
5		<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
6		<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7		<classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar"/>
8		<classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-client-1.0.jar"/>
9		<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar"/>
10		<classpathentry sourcepath="HOME/code/Shoola/SRC" kind="var" path="MAVEN_REPO/omero/jars/shoola-2.4.0.jar"/>
11		<classpathentry kind="output" path="target/classes"/>
	4	<classpathentry excluding="" kind="src" path="src">
	5	</classpathentry>
	6	<classpathentry output="target/test-classes" kind="src" path="test">
	7	</classpathentry>
	8	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar">
	9	</classpathentry>
	10	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
	11	</classpathentry>
	12	<classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar">
	13	</classpathentry>
	14	<classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-client-1.0.jar">
	15	</classpathentry>
	16	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar">
	17	</classpathentry>
	18	<classpathentry kind="var" path="MAVEN_REPO/omero/jars/shoola-2.4.0.jar">
	19	</classpathentry>
	20	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar">
	21	</classpathentry>
	22	<classpathentry kind="output" path="target/classes">
	23	</classpathentry>
12	24	</classpath>

branches/omero/components/shoola-adapter/project.xml

r100	r103
30	30	<version>2.4.0</version>
31	31	</dependency>
	32	<dependency>
	33	<groupId>commons-logging</groupId>
	34	<artifactId>commons-logging</artifactId>
	35	<version>1.0.4</version>
	36	</dependency>
	37	<dependency>
	38	<groupId>commons-lang</groupId>
	39	<artifactId>commons-lang</artifactId>
	40	<version>2.0</version>
	41	</dependency>
	42
32	43	</dependencies>
33	44

branches/omero/components/shoola-adapter/src/org/openmicroscopy/omero/shoolaadapter/AdapterUtils.java

r95	r103
26	26	import org.openmicroscopy.omero.model.Project;
27	27
	28	import org.apache.commons.logging.Log;
	29	import org.apache.commons.logging.LogFactory;
28	30	import org.openmicroscopy.shoola.env.data.model.AnnotationData;
29	31	import org.openmicroscopy.shoola.env.data.model.CategoryData;
30	32	import org.openmicroscopy.shoola.env.data.model.CategoryGroupData;
	33	import org.openmicroscopy.shoola.env.data.model.DataObject;
31	34	import org.openmicroscopy.shoola.env.data.model.DatasetData;
32	35	import org.openmicroscopy.shoola.env.data.model.UserDetails;
…	…
41	44	public class AdapterUtils {
42	45
	46	private static Log log = LogFactory.getLog(AdapterUtils.class);
	47
	48	static public DataObject adaptLoadedPDIHierarchy(Class rootNodeType, Object result) {
	49	if (rootNodeType.equals(Project.class)){
	50	return AdapterUtils.go((Project) result);
	51	} else if (rootNodeType.equals(Dataset.class)){
	52	return AdapterUtils.go((Dataset) result);
	53	} else {
	54	throw new IllegalArgumentException("Method only takes Project and Dataset as argument.");
	55	}
	56	}
	57
	58	static public DataObject adaptLoadedCGCIHierarchy(Class rootNodeType, Object result) {
	59	if (rootNodeType.equals(CategoryGroup.class)){
	60	return AdapterUtils.go((CategoryGroup) result);
	61	} else if (rootNodeType.equals(Category.class)){
	62	return AdapterUtils.go((Category) result);
	63	} else {
	64	throw new IllegalArgumentException("Method only takes CategoryGroup and Category as argument.");
	65	}
	66	}
	67
	68	static public Set adaptFoundPDIHierarchies(Set result) {
	69	Set dataObjects = new HashSet();
	70	for (Iterator i = result.iterator(); i.hasNext();) {
	71	Object obj = i.next();
	72	if (obj instanceof Project) {
	73	Project prj = (Project) obj;
	74	dataObjects.add(AdapterUtils.go(prj));
	75	} else if (obj instanceof Dataset) {
	76	Dataset ds = (Dataset) obj;
	77	dataObjects.add(AdapterUtils.go(ds));
	78	} else if (obj instanceof Image) {
	79	Image img = (Image) obj;
	80	dataObjects.add(AdapterUtils.go(img));
	81	} else {
	82	throw new RuntimeException("Method returned unexpected value type:" + obj.getClass() );
	83	}
	84	}
	85	return dataObjects;
	86	}
	87
	88	static public Set adaptFoundCGCIHierarchies(Set result) {
	89	Set dataObjects = new HashSet();
	90	for (Iterator i = result.iterator(); i.hasNext();) {
	91	Object obj = i.next();
	92	if (obj instanceof CategoryGroup) {
	93	CategoryGroup cg = (CategoryGroup) obj;
	94	dataObjects.add(AdapterUtils.go(cg));
	95	} else if (obj instanceof Category) {
	96	Category ca = (Category) obj;
	97	dataObjects.add(AdapterUtils.go(ca));
	98	} else if (obj instanceof Image) {
	99	Image img = (Image) obj;
	100	dataObjects.add(AdapterUtils.go(img));
	101	} else {
	102	throw new RuntimeException("Method returned unexpected value type:" + obj.getClass() );
	103	}
	104	}
	105	return dataObjects;
	106	}
	107
	108	static public Map adaptFoundImageAnnotations(Map result) {
	109	Map dataObjects = new HashMap();
	110	for (Iterator i = result.keySet().iterator(); i.hasNext();) {
	111	Object key = i.next();
	112	Set value = (Set) result.get(key);
	113	dataObjects.put(key,new HashSet());
	114	for (Iterator j = value.iterator(); j.hasNext();) {
	115	ImageAnnotation ann = (ImageAnnotation) j.next();
	116	((Set) dataObjects.get(key)).add(AdapterUtils.go(ann));
	117	}
	118	}
	119	return dataObjects;
	120	}
	121
	122	static public Map adaptFoundDatasetAnnotations(Map result) {
	123	Map dataObjects = new HashMap();
	124	for (Iterator i = result.keySet().iterator(); i.hasNext();) {
	125	Object key = i.next();
	126	Set value = (Set) result.get(key);
	127	dataObjects.put(key,new HashSet());
	128	for (Iterator j = value.iterator(); j.hasNext();) {
	129	DatasetAnnotation ann = (DatasetAnnotation) j.next();
	130	((Set) dataObjects.get(key)).add(AdapterUtils.go(ann));
	131	}
	132	}
	133	return dataObjects;
	134	}
	135
43	136	static public ProjectData go(Project p) {
44	137	return go(p, newCache());
…	…
54	147	to(cache, p, pd);
55	148
56		pd.setID(p.getProjectId().intValue());
	149	if (null == p.getProjectId()) {
	150	log.debug("Id for "+p+" is null.");
	151	} else {
	152	pd.setID(p.getProjectId().intValue());
	153	}
57	154	pd.setName(p.getName());
58	155	pd.setDescription(p.getDescription());
59		pd.setOwnerFirstName(p.getExperimenter().getFirstname());
60		//TODO
61
62		Set set = new HashSet();
63		for (Iterator i = p.getDatasets().iterator(); i.hasNext();) {
64		Dataset d = (Dataset) i.next();
65		set.add(go(d,cache));
66		}
67		pd.setDatasets(new ArrayList(set));
	156	if (null==p.getExperimenter()){
	157	log.debug("Experimenter for "+p+" is null.");
	158	} else {
	159	pd.setOwnerFirstName(p.getExperimenter().getFirstname());
	160	}
	161	//TODO
	162
	163	if (null==p.getDatasets()){
	164	log.debug("Datasets for "+p+" is null.");
	165	} else {
	166	Set set = new HashSet();
	167	for (Iterator i = p.getDatasets().iterator(); i.hasNext();) {
	168	Dataset d = (Dataset) i.next();
	169	set.add(go(d,cache));
	170	}
	171	pd.setDatasets(new ArrayList(set));
	172	}
68	173
69	174	return pd;
…	…
83	188	to(cache, d, dd);
84	189
85		dd.setID(d.getDatasetId().intValue());
	190	if (null==d.getDatasetId()){
	191	log.debug("Id for "+d+" is null.");
	192	} else {
	193	dd.setID(d.getDatasetId().intValue());
	194	}
	195
86	196	dd.setName(d.getName());
87	197	dd.setDescription(d.getDescription());
88		dd.setOwnerFirstName(d.getExperimenter().getFirstname());
89		//TODO
90
91		Set set = new HashSet();
92		for (Iterator i = d.getImages().iterator(); i.hasNext();) {
93		Image img = (Image) i.next();
94		set.add(go(img,cache));
95		}
96
97		dd.setImages(new ArrayList(set));
	198	if (null==d.getExperimenter()){
	199	log.debug("Experimenter for "+d+" is null.");
	200	} else {
	201	dd.setOwnerFirstName(d.getExperimenter().getFirstname());
	202	}
	203	//TODO
	204
	205	if (null==d.getImages()){
	206	log.debug("Images for "+d+" is null.");
	207	} else {
	208	Set set = new HashSet();
	209	for (Iterator i = d.getImages().iterator(); i.hasNext();) {
	210	Image img = (Image) i.next();
	211	set.add(go(img,cache));
	212	}
	213
	214	dd.setImages(new ArrayList(set));
	215	}
98	216	return dd;
	217
99	218	}
100	219
…	…
155	274	to(cache, img, id);
156	275
157		id.setID(img.getImageId().intValue());
	276	if (null==img.getImageId()){
	277	log.debug("Id for "+img+" is null.");
	278	} else {
	279	id.setID(img.getImageId().intValue());
	280	}
158	281	id.setName(img.getName());
159	282	id.setDescription(img.getDescription());
160	283	id.setInserted(convertDate(img.getInserted()));
161	284	id.setCreated(convertDate(img.getCreated()));
162		id.setOwnerID(img.getExperimenter().getAttributeId().intValue());
163		//TODO
164
165		Set set = new HashSet();
166		for (Iterator i = img.getImagePixels().iterator(); i.hasNext();) {
167		ImagePixel p = (ImagePixel) i.next();
168		set.add(go(p,cache));
169		}
170		id.setPixels(new ArrayList(set));
	285
	286