[Gmod-apollo-cmts] CVS: apollo/src/java Makefile,1.95.2.43.2.6,1.95.2.43.2.7

[Michele C. <mc...@us...>]

Update of /cvsroot/gmod/apollo/src/java
In directory usw-pr-cvs1:/tmp/cvs-serv2305

Modified Files:
      Tag: before_merge_branch
	Makefile 
Log Message:
Chromosome - returns species name
KaryotypeAdapter implements KaryotypeAdapter interface
EnsemblAnalysisPanel - changed border. Catches exceptions
EnsemblChromosomePanel = changed border
EnsemblDatabasePanel   = changed border - checks whether paths exist
EnsemblDbDetailPanel - changed border
EnsemblDbPanel  = tried to fix the layout and failed.  Also lots of 
unfinished phutzing around
ScaleView - debug line
StrandedZoomableApolloPanel - debug
SyntenyLinkPanel - debug
SyntenyPanel - changed default size to something smaller than my display
SyntenyMenu -= changed humanregion and mouseregion to region1 and region2. Added in speciesconfig for database names and paths etc
SyntenyViewMenu - debug line



Index: Makefile
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/Makefile,v
retrieving revision 1.95.2.43.2.6
retrieving revision 1.95.2.43.2.7
diff -C2 -d -r1.95.2.43.2.6 -r1.95.2.43.2.7
*** Makefile	28 Jun 2002 16:35:56 -0000	1.95.2.43.2.6
--- Makefile	30 Jul 2002 13:17:44 -0000	1.95.2.43.2.7
***************
*** 26,30 ****
  # for version 1.2 and up optimisation${APOLLO_ROOT}/jars/jacorb.jar
  #JFLAGS = -d classfiles -O -classpath ${APOLLO_ROOT}/src/java:${APOLLO_ROOT}/src/java/classfiles:${APOLLO_ROOT}/jars/org.bdgp.jar:${APOLLO_ROOT}/jars/junit.jar:${CLASSPATH}
! JFLAGS = -d classfiles -O -classpath ${APOLLO_ROOT}/src/java:${APOLLO_ROOT}/src/java/classfiles:${APOLLO_ROOT}/../../apolloecs2/flybase/software/bdgp-java:${APOLLO_ROOT}/jars/junit.jar:${APOLLO_ROOT}/jars/psgr2s.jar:${APOLLO_ROOT}/jars/bdgp.jar:${APOLLO_ROOT}/data:${APOLLO_ROOT}/jars/jacorb.jar:${APOLLO_ROOT}/jars/idl.jar:/users/searle/progs/apollo-ensembl/apollo-ensembl/src:${CLASSPATH}
  
  #location of apollo java sources
--- 26,30 ----
  # for version 1.2 and up optimisation${APOLLO_ROOT}/jars/jacorb.jar
  #JFLAGS = -d classfiles -O -classpath ${APOLLO_ROOT}/src/java:${APOLLO_ROOT}/src/java/classfiles:${APOLLO_ROOT}/jars/org.bdgp.jar:${APOLLO_ROOT}/jars/junit.jar:${CLASSPATH}
! JFLAGS = -d classfiles -O -classpath .:${APOLLO_ROOT}/src/java:${APOLLO_ROOT}/src/java/classfiles:${APOLLO_ROOT}/../../apolloecs2/flybase/software/bdgp-java:${APOLLO_ROOT}/jars/junit.jar:${APOLLO_ROOT}/jars/psgr2s.jar:${APOLLO_ROOT}/jars/bdgp.jar:${APOLLO_ROOT}/data:${APOLLO_ROOT}/jars/jacorb.jar:${APOLLO_ROOT}/jars/idl.jar:/Users/michele/cvs/apollo-ensembl/apollo-ensembl/src:${CLASSPATH}
  
  #location of apollo java sources
***************
*** 54,58 ****
  	classfiles/apollo/dataadapter/CGI.class \
  	classfiles/apollo/dataadapter/ChromosomeAdapter.class \
- 	classfiles/apollo/dataadapter/CurationSetBuilder.class \
  	classfiles/apollo/dataadapter/DataAdapterException.class \
  	classfiles/apollo/dataadapter/DetailedSyntenyCGIAdapter.class \
--- 54,57 ----