X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=869755280b39292b96b631e045839322191e7cd1;hb=4059c82f431d3f98931b290d9a72da2a54a0fc95;hp=e0ceeef67f4039a5644cf334096025ac37f00343;hpb=df9b85c1cf39894039018499fe802406cc37f209;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index e0ceeef..8697552 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -114,34 +114,29 @@ public class Finder extends GFinder panel.add(label, BorderLayout.NORTH); panel.add(textinput, BorderLayout.SOUTH); - int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop, - panel, "New Sequence Feature Name", - JOptionPane.OK_CANCEL_OPTION ); - if(reply != JOptionPane.OK_OPTION) - return; + SequenceI [] seqs = new SequenceI[searchResults.getSize()]; + SequenceFeature [] features = new SequenceFeature[searchResults.getSize()]; + for (int i = 0; i < searchResults.getSize(); i ++ ) { - SequenceI seq = searchResults.getResultSequence(i); + seqs[i] = searchResults.getResultSequence(i).getDatasetSequence(); - SequenceFeature sf = new SequenceFeature(textinput.getText(), + features[i] = new SequenceFeature(textinput.getText(), "Search Results", null, searchResults.getResultStart(i), - searchResults.getResultEnd(i), + searchResults.getResultEnd(i), "Search Results"); - - ap.seqPanel.seqCanvas.getFeatureRenderer().addNewFeature( - textinput.getText(), new Color(60,160,115), - "Search Results"); - - seq.getDatasetSequence().addSequenceFeature(sf); } - ap.seqPanel.seqCanvas.getFeatureRenderer().findAllFeatures(); - ap.alignFrame.showSeqFeatures.setSelected(true); - av.setShowSequenceFeatures(true); - ap.highlightSearchResults(null); + if( ap.seqPanel.seqCanvas.getFeatureRenderer() + .createNewFeatures(seqs, features)) + { + ap.alignFrame.showSeqFeatures.setSelected(true); + av.setShowSequenceFeatures(true); + ap.highlightSearchResults(null); + } } /**