import jalview.util.MessageManager;
import jalview.viewmodel.AlignmentViewport;
-import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
});
addEscapeHandler();
Desktop.addInternalFrame(frame, MessageManager.getString("label.find"),
- MY_WIDTH, MY_HEIGHT);
- frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
- searchBox.requestFocus();
+ true, MY_WIDTH, MY_HEIGHT, true, true);
+ searchBox.getComponent().requestFocus();
}
/**
*/
boolean getFocusedViewport()
{
- if (focusfixed || Desktop.desktop == null)
+ if (focusfixed || Desktop.getDesktopPane() == null)
{
if (ap != null && av != null)
{
}
// now checks further down the window stack to fix bug
// https://mantis.lifesci.dundee.ac.uk/view.php?id=36008
- JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+ JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames();
for (int f = 0; f < frames.length; f++)
{
JInternalFrame alignFrame = frames[f];
/**
* Opens a dialog that allows the user to create sequence features for the
- * find match results.
+ * find match results
*/
@Override
public void createFeatures_actionPerformed()
{
+ if (searchResults.isEmpty())
+ {
+ return; // shouldn't happen
+ }
List<SequenceI> seqs = new ArrayList<>();
List<SequenceFeature> features = new ArrayList<>();
- String searchString = searchBox.getEditor().getItem().toString().trim();
+ String searchString = searchBox.getUserInput();
String desc = "Search Results";
/*
for (SearchResultMatchI match : searchResults.getResults())
{
seqs.add(match.getSequence().getDatasetSequence());
- features.add(new SequenceFeature(searchString, desc,
- match
- .getStart(), match.getEnd(), desc));
+ features.add(new SequenceFeature(searchString, desc, match.getStart(),
+ match.getEnd(), desc));
}
- if (ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs,
- features, true, ap))
- {
- /*
- * ensure feature display is turned on to show the new features,
- * and remove them as highlighted regions
- */
- ap.alignFrame.showSeqFeatures.setSelected(true);
- av.setShowSequenceFeatures(true);
- ap.highlightSearchResults(null);
- }
+ new FeatureEditor(ap, seqs, features, true).showDialog();
}
/**
{
createFeatures.setEnabled(false);
- String searchString = searchBox.getUserInput().trim();
+ String searchString = searchBox.getUserInput();
if (isInvalidSearchString(searchString))
{
createFeatures.setEnabled(true);
}
+ searchBox.updateCache();
+
ap.highlightSearchResults(searchResults);
// TODO: add enablers for 'SelectSequences' or 'SelectColumns' or
// 'SelectRegion' selection
{
JvOptionPane.showInternalMessageDialog(this,
MessageManager.getString("label.finished_searching"), null,
- JvOptionPane.INFORMATION_MESSAGE);
+ JvOptionPane.PLAIN_MESSAGE);
}
else
{
+ " subsequence matches found.";
}
JvOptionPane.showInternalMessageDialog(this, message, null,
- JvOptionPane.INFORMATION_MESSAGE);
+ JvOptionPane.PLAIN_MESSAGE);
}
}
- searchBox.updateCache();
}
/**