diff --git a/uk/ac/sanger/artemis/components/alignment/BamView.java b/uk/ac/sanger/artemis/components/alignment/BamView.java index 0f004373597ac1a14f1eda0b3c14847e3c6a6ce1..327825e25b9fb29d93c2ccce5d31c3c8c0aa0b7f 100644 --- a/uk/ac/sanger/artemis/components/alignment/BamView.java +++ b/uk/ac/sanger/artemis/components/alignment/BamView.java @@ -90,6 +90,7 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import javax.swing.text.JTextComponent; import org.apache.log4j.Level; @@ -116,6 +117,7 @@ import uk.ac.sanger.artemis.components.FeatureDisplay; import uk.ac.sanger.artemis.components.FileViewer; import uk.ac.sanger.artemis.components.MessageDialog; import uk.ac.sanger.artemis.components.SwingWorker; +import uk.ac.sanger.artemis.components.genebuilder.AutoCompleteComboDocument; import uk.ac.sanger.artemis.components.variant.FeatureContigPredicate; import uk.ac.sanger.artemis.editor.MultiLineToolTipUI; import uk.ac.sanger.artemis.io.EntryInformation; @@ -2510,7 +2512,9 @@ public class BamView extends JPanel addMouseMotionListener(mouseMotionListener); combo = new JComboBox(seqNames); - combo.setEditable(false); + JTextComponent editor = (JTextComponent) combo.getEditor().getEditorComponent(); + editor.setDocument(new AutoCompleteComboDocument(combo)); + combo.setEditable(true); combo.setMaximumRowCount(20); combo.addItemListener(new ItemListener() diff --git a/uk/ac/sanger/artemis/components/variant/VCFview.java b/uk/ac/sanger/artemis/components/variant/VCFview.java index d8b0e1d383de842f3c1371d2aafb99b97184212e..28170e5850fba231cee65af3abcb132bff6e90db 100644 --- a/uk/ac/sanger/artemis/components/variant/VCFview.java +++ b/uk/ac/sanger/artemis/components/variant/VCFview.java @@ -79,6 +79,7 @@ import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import javax.swing.text.JTextComponent; import net.sf.samtools.util.BlockCompressedInputStream; @@ -103,6 +104,7 @@ import uk.ac.sanger.artemis.components.FileViewer; import uk.ac.sanger.artemis.components.MessageDialog; import uk.ac.sanger.artemis.components.MultiComparator; import uk.ac.sanger.artemis.components.alignment.FileSelectionDialog; +import uk.ac.sanger.artemis.components.genebuilder.AutoCompleteComboDocument; import uk.ac.sanger.artemis.editor.MultiLineToolTipUI; import uk.ac.sanger.artemis.io.EntryInformation; import uk.ac.sanger.artemis.io.Key; @@ -360,6 +362,9 @@ public class VCFview extends JPanel } final JComboBox combo = new JComboBox(vcfReaders[0].getSeqNames()); + combo.setEditable(true); + JTextComponent editor = (JTextComponent) combo.getEditor().getEditorComponent(); + editor.setDocument(new AutoCompleteComboDocument(combo)); if(vcfReaders[0].getSeqNames().length > 1) combo.addItem("Combine References"); @@ -368,7 +373,6 @@ public class VCFview extends JPanel this.chr = vcfReaders[0].getSeqNames()[0]; combo.setSelectedItem(this.chr); - combo.setEditable(false); combo.setMaximumRowCount(20); combo.addItemListener(new ItemListener()