Skip to content
This repository was archived by the owner on Jun 7, 2024. It is now read-only.

Commit dad65ee

Browse files
mlistmlist
committed
Fixed bug in toString method of CellLineData that occured when no vector construct was used
1 parent 277202e commit dad65ee

File tree

13 files changed

+153
-235
lines changed

13 files changed

+153
-235
lines changed

‎.idea/modules.xml‎

100755100644
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GeneTracker/GeneTracker.iml‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,40 +49,14 @@
4949
<orderEntry type="module" module-name="OpenLabFrontend-grailsPlugins" />
5050
<orderEntry type="library" scope="PROVIDED" name="grails-2.1.1" level="application" />
5151
<orderEntry type="library" scope="PROVIDED" name="grails-2.2.0" level="application" />
52+
<orderEntry type="module" module-name="OpenLabTaqMan-grailsPlugins" />
5253
<orderEntry type="library" scope="PROVIDED" name="grails-2.2.2" level="application" />
5354
<orderEntry type="module-library" exported="">
5455
<library name="Grails User Library (GeneTracker)">
5556
<CLASSES>
5657
<root url="file://$MODULE_DIR$/lib" />
5758
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.security/spring-security-web/jars/spring-security-web-3.0.7.RELEASE.jar!/" />
5859
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.security/spring-security-core/jars/spring-security-core-3.0.7.RELEASE.jar!/" />
59-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.webflow/spring-js/jars/spring-js-2.0.8.RELEASE.jar!/" />
60-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.webflow/spring-binding/jars/spring-binding-2.0.8.RELEASE.jar!/" />
61-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.webflow/spring-webflow/jars/spring-webflow-2.0.8.RELEASE.jar!/" />
62-
<root url="jar://$USER_HOME$/.grails/ivy-cache/jboss/javassist/jars/javassist-3.7.ga.jar!/" />
63-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.jasig.cas.client/cas-client-core/jars/cas-client-core-3.1.12.jar!/" />
64-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.security/spring-security-cas-client/jars/spring-security-cas-client-3.0.7.RELEASE.jar!/" />
65-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.geronimo.specs/geronimo-stax-api_1.0_spec/jars/geronimo-stax-api_1.0_spec-1.0.jar!/" />
66-
<root url="jar://$USER_HOME$/.grails/ivy-cache/stax/stax-api/jars/stax-api-1.0.1.jar!/" />
67-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.xmlbeans/xmlbeans/jars/xmlbeans-2.3.0.jar!/" />
68-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.poi/poi-ooxml-schemas/jars/poi-ooxml-schemas-3.7.jar!/" />
69-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.poi/poi-ooxml/jars/poi-ooxml-3.7.jar!/" />
70-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.poi/poi/jars/poi-3.7.jar!/" />
71-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.antlr/stringtemplate/jars/stringtemplate-3.2.jar!/" />
72-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.antlr/antlr-runtime/jars/antlr-runtime-3.1.3.jar!/" />
73-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.tmatesoft.sqljet/sqljet/jars/sqljet-1.0.4.jar!/" />
74-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.tmatesoft.svnkit/trilead-ssh2/jars/trilead-ssh2-build213-svnkit-1.3-patch.jar!/" />
75-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.codehaus.jackson/jackson-core-asl/jars/jackson-core-asl-1.6.2.jar!/" />
76-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.codehaus.jackson/jackson-mapper-asl/jars/jackson-mapper-asl-1.6.2.jar!/" />
77-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-client-lib/jars/cloudfoundry-client-lib-0.7.5.jar!/" />
78-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-caldecott-lib/jars/cloudfoundry-caldecott-lib-0.1.1.jar!/" />
79-
<root url="jar://$USER_HOME$/.grails/ivy-cache/mysql/mysql-connector-java/jars/mysql-connector-java-5.1.16.jar!/" />
80-
<root url="jar://$USER_HOME$/.grails/ivy-cache/backport-util-concurrent/backport-util-concurrent/jars/backport-util-concurrent-3.0.jar!/" />
81-
<root url="jar://$USER_HOME$/.grails/ivy-cache/net.sourceforge.wurfl/wurfl/jars/wurfl-1.2.jar!/" />
82-
<root url="jar://$USER_HOME$/.grails/ivy-cache/commons-logging/commons-logging/jars/commons-logging-1.1.1.jar!/" />
83-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.mobile/spring-mobile-device/jars/spring-mobile-device-1.0.0.M3.jar!/" />
84-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.gmock/gmock/jars/gmock-0.8.2.jar!/" />
85-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.eclipse.jdt.core.compiler/ecj/jars/ecj-3.7.2.jar!/" />
8660
</CLASSES>
8761
<JAVADOC />
8862
<SOURCES />

‎GeneTracker/grails-app/domain/org/openlab/genetracker/CellLineData.groovy‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
/*
2-
* Copyright (C) 2013
3-
* Center for Excellence in Nanomedicine (NanoCAN)
4-
* Molecular Oncology
5-
* University of Southern Denmark
6-
* ###############################################
7-
* Written by: Markus List
8-
* Contact: mlist'at'health'.'sdu'.'dk
9-
* Web: http://www.nanocan.org
10-
* ###########################################################################
11-
*
12-
* This file is part of OpenLabFramework.
13-
*
14-
* OpenLabFramework is free software: you can redistribute it and/or modify
15-
* it under the terms of the GNU General Public License as published by
16-
* the Free Software Foundation, either version 3 of the License, or
17-
* (at your option) any later version.
18-
*
19-
* This program is distributed in the hope that it will be useful,
20-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
21-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22-
* GNU General Public License for more details.
23-
*
24-
* You should have received a copy of the GNU General Public License
25-
* along with this program. It can be found at the root of the project page.
26-
* If not, see <http://www.gnu.org/licenses/>.
27-
*
28-
* ############################################################################
29-
*/
1+
/*
2+
* Copyright (C) 2013
3+
* Center for Excellence in Nanomedicine (NanoCAN)
4+
* Molecular Oncology
5+
* University of Southern Denmark
6+
* ###############################################
7+
* Written by: Markus List
8+
* Contact: mlist'at'health'.'sdu'.'dk
9+
* Web: http://www.nanocan.org
10+
* ###########################################################################
11+
*
12+
* This file is part of OpenLabFramework.
13+
*
14+
* OpenLabFramework is free software: you can redistribute it and/or modify
15+
* it under the terms of the GNU General Public License as published by
16+
* the Free Software Foundation, either version 3 of the License, or
17+
* (at your option) any later version.
18+
*
19+
* This program is distributed in the hope that it will be useful,
20+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
* GNU General Public License for more details.
23+
*
24+
* You should have received a copy of the GNU General Public License
25+
* along with this program. It can be found at the root of the project page.
26+
* If not, see <http://www.gnu.org/licenses/>.
27+
*
28+
* ############################################################################
29+
*/
3030
package org.openlab.genetracker
3131

3232
import org.openlab.genetracker.vector.Acceptor
@@ -87,7 +87,7 @@ class CellLineData extends DataObject {
8787
result = "${cellLine} - ${acceptor} - ${firstRecombinant} - ${secondRecombinant}"
8888
else if (firstRecombinant != null)
8989
result = "${cellLine} - ${acceptor} - ${firstRecombinant}"
90-
else "${cellLine}"
90+
else result = "${cellLine}"
9191

9292
result += "${cultureMedia?' - '+cultureMedia:''}${colonyNumber?' - '+colonyNumber:''}"
9393
return result

‎GeneTracker/plugin.xml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,37 +76,38 @@ Brief description of the plugin.
7676
<dependency group='org.grails' name='grails-webflow' version='2.2.2' />
7777
</compile>
7878
<runtime>
79-
<dependency group='mysql' name='mysql-connector-java' version='5.1.16' />
8079
<dependency group='hsqldb' name='hsqldb' version='1.8.0.10' />
80+
<dependency group='mysql' name='mysql-connector-java' version='5.1.16' />
8181
</runtime>
8282
</dependencies>
8383
<plugins>
8484
<compile>
85-
<plugin group='org.grails.plugins' name='searchable' version='0.6.4' />
85+
<plugin group='org.grails.plugins' name='excel-import' version='1.0.0' />
86+
<plugin group='org.grails.plugins' name='webxml' version='1.4.1' />
87+
<plugin group='org.grails.plugins' name='standalone' version='1.2.1' />
8688
<plugin group='org.grails.plugins' name='jquery-mobile' version='1.1.0.5' />
8789
<plugin group='org.grails.plugins' name='spring-security-cas' version='1.0.5' />
88-
<plugin group='org.grails.plugins' name='webflow' version='2.0.0' />
8990
<plugin group='org.grails.plugins' name='spring-mobile' version='0.4' />
9091
<plugin group='org.grails.plugins' name='spring-security-core' version='1.2.7.3' />
91-
<plugin group='org.grails.plugins' name='webxml' version='1.4.1' />
92-
<plugin group='org.grails.plugins' name='excel-import' version='1.0.0' />
92+
<plugin group='org.grails.plugins' name='searchable' version='0.6.4' />
93+
<plugin group='org.grails.plugins' name='webflow' version='2.0.0' />
9394
</compile>
9495
<runtime>
95-
<plugin group='org.grails.plugins' name='hibernate' version='2.2.2' />
96-
<plugin group='org.grails.plugins' name='svn' version='1.0.0.M1' />
97-
<plugin group='org.grails.plugins' name='ajax-uploader' version='1.1' />
98-
<plugin group='org.grails.plugins' name='bubbling' version='2.1.4' />
99-
<plugin group='org.grails.plugins' name='richui' version='0.8' />
100-
<plugin group='org.grails.plugins' name='p6spy' version='0.4' />
101-
<plugin group='org.grails.plugins' name='yui' version='2.8.2.1' />
96+
<plugin group='org.grails.plugins' name='jquery' version='1.7.1' />
10297
<plugin group='org.grails.plugins' name='export' version='1.5' />
98+
<plugin group='org.grails.plugins' name='svn' version='1.0.0.M1' />
10399
<plugin group='org.grails.plugins' name='joda-time' version='1.4' />
104-
<plugin group='org.grails.plugins' name='jquery' version='1.7.1' />
105-
<plugin group='org.grails.plugins' name='grails-ui' version='1.2.3' />
100+
<plugin group='org.grails.plugins' name='yui' version='2.8.2.1' />
101+
<plugin group='org.grails.plugins' name='hibernate' version='2.2.2' />
106102
<plugin group='org.grails.plugins' name='quartz' version='0.4.2' />
107-
<plugin group='org.grails.plugins' name='prototype' version='1.0' />
108-
<plugin group='org.grails.plugins' name='cloud-foundry' version='1.2.3' />
103+
<plugin group='org.grails.plugins' name='grails-ui' version='1.2.3' />
104+
<plugin group='org.grails.plugins' name='p6spy' version='0.4' />
105+
<plugin group='org.grails.plugins' name='richui' version='0.8' />
106+
<plugin group='org.grails.plugins' name='bubbling' version='2.1.4' />
109107
<plugin group='org.grails.plugins' name='resources' version='1.1.6' />
108+
<plugin group='org.grails.plugins' name='cloud-foundry' version='1.2.3' />
109+
<plugin group='org.grails.plugins' name='ajax-uploader' version='1.1' />
110+
<plugin group='org.grails.plugins' name='prototype' version='1.0' />
110111
</runtime>
111112
<build>
112113
<plugin group='org.grails.plugins' name='tomcat' version='2.2.2' />

‎OpenLabAttachments/OpenLabAttachments.iml‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,40 +47,14 @@
4747
<orderEntry type="module" module-name="OpenLabFrontend-grailsPlugins" />
4848
<orderEntry type="library" scope="PROVIDED" name="grails-2.1.1" level="application" />
4949
<orderEntry type="library" scope="PROVIDED" name="grails-2.2.0" level="application" />
50+
<orderEntry type="module" module-name="OpenLabTaqMan-grailsPlugins" />
5051
<orderEntry type="library" scope="PROVIDED" name="grails-2.2.2" level="application" />
5152
<orderEntry type="module-library" exported="">
5253
<library name="Grails User Library (OpenLabAttachments)">
5354
<CLASSES>
5455
<root url="file://$MODULE_DIR$/lib" />
5556
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.security/spring-security-web/jars/spring-security-web-3.0.7.RELEASE.jar!/" />
5657
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.security/spring-security-core/jars/spring-security-core-3.0.7.RELEASE.jar!/" />
57-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.webflow/spring-js/jars/spring-js-2.0.8.RELEASE.jar!/" />
58-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.webflow/spring-binding/jars/spring-binding-2.0.8.RELEASE.jar!/" />
59-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.webflow/spring-webflow/jars/spring-webflow-2.0.8.RELEASE.jar!/" />
60-
<root url="jar://$USER_HOME$/.grails/ivy-cache/jboss/javassist/jars/javassist-3.7.ga.jar!/" />
61-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.jasig.cas.client/cas-client-core/jars/cas-client-core-3.1.12.jar!/" />
62-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.security/spring-security-cas-client/jars/spring-security-cas-client-3.0.7.RELEASE.jar!/" />
63-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.geronimo.specs/geronimo-stax-api_1.0_spec/jars/geronimo-stax-api_1.0_spec-1.0.jar!/" />
64-
<root url="jar://$USER_HOME$/.grails/ivy-cache/stax/stax-api/jars/stax-api-1.0.1.jar!/" />
65-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.xmlbeans/xmlbeans/jars/xmlbeans-2.3.0.jar!/" />
66-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.poi/poi-ooxml-schemas/jars/poi-ooxml-schemas-3.7.jar!/" />
67-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.poi/poi-ooxml/jars/poi-ooxml-3.7.jar!/" />
68-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.apache.poi/poi/jars/poi-3.7.jar!/" />
69-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.antlr/stringtemplate/jars/stringtemplate-3.2.jar!/" />
70-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.antlr/antlr-runtime/jars/antlr-runtime-3.1.3.jar!/" />
71-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.tmatesoft.sqljet/sqljet/jars/sqljet-1.0.4.jar!/" />
72-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.tmatesoft.svnkit/trilead-ssh2/jars/trilead-ssh2-build213-svnkit-1.3-patch.jar!/" />
73-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.codehaus.jackson/jackson-core-asl/jars/jackson-core-asl-1.6.2.jar!/" />
74-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.codehaus.jackson/jackson-mapper-asl/jars/jackson-mapper-asl-1.6.2.jar!/" />
75-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-client-lib/jars/cloudfoundry-client-lib-0.7.5.jar!/" />
76-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-caldecott-lib/jars/cloudfoundry-caldecott-lib-0.1.1.jar!/" />
77-
<root url="jar://$USER_HOME$/.grails/ivy-cache/mysql/mysql-connector-java/jars/mysql-connector-java-5.1.16.jar!/" />
78-
<root url="jar://$USER_HOME$/.grails/ivy-cache/backport-util-concurrent/backport-util-concurrent/jars/backport-util-concurrent-3.0.jar!/" />
79-
<root url="jar://$USER_HOME$/.grails/ivy-cache/net.sourceforge.wurfl/wurfl/jars/wurfl-1.2.jar!/" />
80-
<root url="jar://$USER_HOME$/.grails/ivy-cache/commons-logging/commons-logging/jars/commons-logging-1.1.1.jar!/" />
81-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.springframework.mobile/spring-mobile-device/jars/spring-mobile-device-1.0.0.M3.jar!/" />
82-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.gmock/gmock/jars/gmock-0.8.2.jar!/" />
83-
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.eclipse.jdt.core.compiler/ecj/jars/ecj-3.7.2.jar!/" />
8458
</CLASSES>
8559
<JAVADOC />
8660
<SOURCES />

‎OpenLabAttachments/plugin.xml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,38 @@ Brief description of the plugin.
3535
<dependency group='org.grails' name='grails-webflow' version='2.2.2' />
3636
</compile>
3737
<runtime>
38-
<dependency group='mysql' name='mysql-connector-java' version='5.1.16' />
3938
<dependency group='hsqldb' name='hsqldb' version='1.8.0.10' />
39+
<dependency group='mysql' name='mysql-connector-java' version='5.1.16' />
4040
</runtime>
4141
</dependencies>
4242
<plugins>
4343
<compile>
44-
<plugin group='org.grails.plugins' name='searchable' version='0.6.4' />
44+
<plugin group='org.grails.plugins' name='excel-import' version='1.0.0' />
45+
<plugin group='org.grails.plugins' name='webxml' version='1.4.1' />
46+
<plugin group='org.grails.plugins' name='standalone' version='1.2.1' />
4547
<plugin group='org.grails.plugins' name='jquery-mobile' version='1.1.0.5' />
4648
<plugin group='org.grails.plugins' name='spring-security-cas' version='1.0.5' />
47-
<plugin group='org.grails.plugins' name='webflow' version='2.0.0' />
4849
<plugin group='org.grails.plugins' name='spring-mobile' version='0.4' />
4950
<plugin group='org.grails.plugins' name='spring-security-core' version='1.2.7.3' />
50-
<plugin group='org.grails.plugins' name='webxml' version='1.4.1' />
51-
<plugin group='org.grails.plugins' name='excel-import' version='1.0.0' />
51+
<plugin group='org.grails.plugins' name='searchable' version='0.6.4' />
52+
<plugin group='org.grails.plugins' name='webflow' version='2.0.0' />
5253
</compile>
5354
<runtime>
54-
<plugin group='org.grails.plugins' name='hibernate' version='2.2.2' />
55-
<plugin group='org.grails.plugins' name='svn' version='1.0.0.M1' />
56-
<plugin group='org.grails.plugins' name='ajax-uploader' version='1.1' />
57-
<plugin group='org.grails.plugins' name='bubbling' version='2.1.4' />
58-
<plugin group='org.grails.plugins' name='richui' version='0.8' />
59-
<plugin group='org.grails.plugins' name='p6spy' version='0.4' />
60-
<plugin group='org.grails.plugins' name='yui' version='2.8.2.1' />
55+
<plugin group='org.grails.plugins' name='jquery' version='1.7.1' />
6156
<plugin group='org.grails.plugins' name='export' version='1.5' />
57+
<plugin group='org.grails.plugins' name='svn' version='1.0.0.M1' />
6258
<plugin group='org.grails.plugins' name='joda-time' version='1.4' />
63-
<plugin group='org.grails.plugins' name='jquery' version='1.7.1' />
64-
<plugin group='org.grails.plugins' name='grails-ui' version='1.2.3' />
59+
<plugin group='org.grails.plugins' name='yui' version='2.8.2.1' />
60+
<plugin group='org.grails.plugins' name='hibernate' version='2.2.2' />
6561
<plugin group='org.grails.plugins' name='quartz' version='0.4.2' />
66-
<plugin group='org.grails.plugins' name='prototype' version='1.0' />
67-
<plugin group='org.grails.plugins' name='cloud-foundry' version='1.2.3' />
62+
<plugin group='org.grails.plugins' name='grails-ui' version='1.2.3' />
63+
<plugin group='org.grails.plugins' name='p6spy' version='0.4' />
64+
<plugin group='org.grails.plugins' name='richui' version='0.8' />
65+
<plugin group='org.grails.plugins' name='bubbling' version='2.1.4' />
6866
<plugin group='org.grails.plugins' name='resources' version='1.1.6' />
67+
<plugin group='org.grails.plugins' name='cloud-foundry' version='1.2.3' />
68+
<plugin group='org.grails.plugins' name='ajax-uploader' version='1.1' />
69+
<plugin group='org.grails.plugins' name='prototype' version='1.0' />
6970
</runtime>
7071
<build>
7172
<plugin group='org.grails.plugins' name='tomcat' version='2.2.2' />

0 commit comments

Comments
 (0)