From: <mg...@us...> - 2007-01-10 20:22:22
|
Revision: 277 http://svn.sourceforge.net/obo/?rev=277&view=rev Author: mgibson Date: 2007-01-10 12:22:20 -0800 (Wed, 10 Jan 2007) Log Message: ----------- added more mem for ant run options fixed broken test methods in charFieldGui Modified Paths: -------------- phenote/trunk/build.xml phenote/trunk/src/java/phenote/gui/field/CharFieldGui.java phenote/trunk/src/java/phenote/gui/field/FieldPanel.java Modified: phenote/trunk/build.xml =================================================================== --- phenote/trunk/build.xml 2007-01-10 18:24:01 UTC (rev 276) +++ phenote/trunk/build.xml 2007-01-10 20:22:20 UTC (rev 277) @@ -87,10 +87,10 @@ </target> <target name="zfin" depends="compile"> - <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx120M"> + <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx200M"> <!-- arg value="-c configfilehereventually"/ --> <arg value="-c"/> - <arg value="initial-zfin.cfg"/> + <arg value="zfin-standalone.cfg"/> <classpath> <pathelement path="${classfiles}"/> <fileset dir="${lib}"> @@ -102,7 +102,7 @@ </target> <target name="fly" depends="compile"> - <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx120M"> + <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx200M"> <!-- arg value="-c configfilehereventually"/ --> <arg value="-c"/> <arg value="initial-flybase.cfg"/> @@ -117,7 +117,7 @@ </target> <target name="obd" depends="compile"> - <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx120M"> + <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx200M"> <!-- arg value="-c configfilehereventually"/ --> <arg value="-c"/> <arg value="obd.cfg"/> @@ -131,7 +131,7 @@ </java> </target> <target name="run-jar" > - <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx120M"> + <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx200M"> <!-- arg value="-c configfilehereventually"/ --> <classpath> <fileset dir="${lib}"> @@ -142,7 +142,7 @@ </target> <target name="run-conf" depends="compile"> - <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx120M"> + <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx200M"> <!-- arg value="-c configfilehereventually"/ --> <arg value="-c"/> <!-- from command line with -DCONF-FILE=initial-zfin.cfg --> @@ -159,7 +159,7 @@ <target name="test" depends="build-test"> - <java classname="org.junit.runner.JUnitCore" fork="yes" jvmargs="-Xmx120M"> + <java classname="org.junit.runner.JUnitCore" fork="yes" jvmargs="-Xmx200M"> <arg value="phenote.gui.TestPhenote"/> <classpath> <pathelement path="${classfiles}"/> Modified: phenote/trunk/src/java/phenote/gui/field/CharFieldGui.java =================================================================== --- phenote/trunk/src/java/phenote/gui/field/CharFieldGui.java 2007-01-10 18:24:01 UTC (rev 276) +++ phenote/trunk/src/java/phenote/gui/field/CharFieldGui.java 2007-01-10 20:22:20 UTC (rev 277) @@ -176,7 +176,7 @@ } - private String getLabel() { + String getLabel() { if (label == null) { if (charField.hasMoreThanOneOntology() || !charField.hasOntologies()) label = charField.getName(); @@ -260,6 +260,7 @@ private FreeTextField getFreeTextField() { return freeTextField; } + // ?? was this moved somewhere else? // /** key listener for free text fields for Cmd-V pasting for macs */ // private class TextKeyListener extends java.awt.event.KeyAdapter { // public void keyPressed(java.awt.event.KeyEvent e) { Modified: phenote/trunk/src/java/phenote/gui/field/FieldPanel.java =================================================================== --- phenote/trunk/src/java/phenote/gui/field/FieldPanel.java 2007-01-10 18:24:01 UTC (rev 276) +++ phenote/trunk/src/java/phenote/gui/field/FieldPanel.java 2007-01-10 20:22:20 UTC (rev 277) @@ -136,19 +136,19 @@ // for test to listen - move to test code? public AbstractAutoCompList getEntityComboBox() { - return getComboBox(CharFieldEnum.ENTITY); + //return getComboBox(CharFieldEnum.ENTITY); + return getComboBox("Entity"); } - // for testing - move to test? - private AbstractAutoCompList getComboBox(CharFieldEnum cfe) { + private AbstractAutoCompList getComboBox(String name) { for (CharFieldGui cfg : charFieldGuiList) - if (cfg.getCharFieldEnum() == cfe) - return cfg.getCompList(); + if (cfg.getLabel().equals(name)) return cfg.getCompList(); return null; } + public AbstractAutoCompList getQualityComboBox() { - return getComboBox(CharFieldEnum.QUALITY); + return getComboBox("Quality"); } // boolean hasLumpComboBox() { // //return lumpField.isCombo(); @@ -162,6 +162,13 @@ // GARBAGE - DELETE +// // for testing - move to test? +// private AbstractAutoCompList getComboBox(CharFieldEnum cfe) { +// for (CharFieldGui cfg : charFieldGuiList) +// if (cfg.getCharFieldEnum() == cfe) +// return cfg.getCompList(); +// return null; +// } // load up terms for term completion /// Ontology.init(); // hmmmm.... now initializes with get - thread! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |