[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/gui/menus PropertyMenu.java,1.3,1.4 ShowMenu.java,1.11,1.12 ThresholdMenu.java,1.3,1.4 TierPopupMenu.java,1.72,1.73

[Mark G. <mg...@us...>]

Update of /cvsroot/gmod/apollo/src/java/apollo/gui/menus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27318/src/java/apollo/gui/menus

Modified Files:
	PropertyMenu.java ShowMenu.java ThresholdMenu.java 
	TierPopupMenu.java 
Log Message:
Moved apollo.gui.schemes.FeatureProperty, TierProperty, PropertyScheme
to apollo.conf. I think the name adapter should probably move as well
(certainly shouldnt stay in gui.schemes).



Index: PropertyMenu.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/menus/PropertyMenu.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropertyMenu.java	24 Apr 2003 21:16:38 -0000	1.3
--- PropertyMenu.java	5 Apr 2004 16:38:37 -0000	1.4
***************
*** 1,6 ****
  package apollo.gui.menus;
  
  import apollo.gui.*;
- import apollo.gui.schemes.*;
  import apollo.datamodel.*;
  import apollo.dataadapter.*;
--- 1,7 ----
  package apollo.gui.menus;
  
+ import apollo.config.FeatureProperty;
+ import apollo.config.TierProperty;
  import apollo.gui.*;
  import apollo.datamodel.*;
  import apollo.dataadapter.*;

Index: ShowMenu.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/menus/ShowMenu.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ShowMenu.java	2 Apr 2004 19:50:43 -0000	1.11
--- ShowMenu.java	5 Apr 2004 16:38:37 -0000	1.12
***************
*** 6,10 ****
  import apollo.gui.genomemap.FeatureTierManagerI;
  import apollo.gui.genomemap.ViewI;
! import apollo.gui.schemes.PropertyScheme;
  
  import java.awt.*;
--- 6,10 ----
  import apollo.gui.genomemap.FeatureTierManagerI;
  import apollo.gui.genomemap.ViewI;
! import apollo.config.PropertyScheme;
  
  import java.awt.*;

Index: ThresholdMenu.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/menus/ThresholdMenu.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ThresholdMenu.java	26 Nov 2002 01:16:42 -0000	1.3
--- ThresholdMenu.java	5 Apr 2004 16:38:37 -0000	1.4
***************
*** 1,9 ****
  package apollo.gui.menus;
  
- import apollo.gui.*;
- import apollo.gui.schemes.*;
- import apollo.datamodel.*;
- import apollo.dataadapter.*;
- 
  import java.awt.*;
  import java.awt.event.*;
--- 1,4 ----
***************
*** 12,15 ****
--- 7,16 ----
  import java.util.*;
  
+ import apollo.config.FeatureProperty;
+ import apollo.config.TierProperty;
+ import apollo.gui.*;
+ import apollo.datamodel.*;
+ import apollo.dataadapter.*;
+ 
  public class ThresholdMenu extends JPopupMenu implements ActionListener {
    PropertyPanel type_panel;

Index: TierPopupMenu.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/menus/TierPopupMenu.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** TierPopupMenu.java	2 Apr 2004 19:50:43 -0000	1.72
--- TierPopupMenu.java	5 Apr 2004 16:38:37 -0000	1.73
***************
*** 4,7 ****
--- 4,9 ----
  
  import apollo.config.Config;
+ import apollo.config.FeatureProperty;
+ import apollo.config.PropertyScheme;
  import apollo.gui.*;
  import apollo.gui.genomemap.ApolloPanelI;
***************
*** 12,16 ****
  import apollo.gui.genomemap.StrandedZoomableApolloPanel;
  import apollo.gui.drawable.DrawableSeqFeature;
- import apollo.gui.schemes.*;
  import apollo.gui.detailviewers.seqexport.SeqExport;
  import apollo.gui.detailviewers.blixem.*;
--- 14,17 ----