Skip to content
Snippets Groups Projects
Commit 208a9bd5 authored by tjc's avatar tjc
Browse files

minor updates

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@10248 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent 79927114
No related branches found
No related tags found
No related merge requests found
...@@ -169,14 +169,13 @@ class TransferAnnotationTool extends JFrame ...@@ -169,14 +169,13 @@ class TransferAnnotationTool extends JFrame
c.anchor = GridBagConstraints.NORTHWEST; c.anchor = GridBagConstraints.NORTHWEST;
c.gridx = 2; c.gridx = 2;
c.gridy = 0; c.gridy = 0;
c.ipadx = 0; c.ipadx = 50;
JLabel geneLabel = new JLabel("Qualifier(s)"); JLabel geneLabel = new JLabel("Qualifier(s)");
geneLabel.setFont(geneLabel.getFont().deriveFont(Font.BOLD)); geneLabel.setFont(geneLabel.getFont().deriveFont(Font.BOLD));
pane.add(geneLabel, c); pane.add(geneLabel, c);
c.gridy = 0; c.gridy = 0;
c.ipadx = 0;
c.gridx = 0; c.gridx = 0;
JLabel label = new JLabel("Gene List"); JLabel label = new JLabel("Gene List");
label.setFont(label.getFont().deriveFont(Font.BOLD)); label.setFont(label.getFont().deriveFont(Font.BOLD));
...@@ -393,10 +392,12 @@ class TransferAnnotationTool extends JFrame ...@@ -393,10 +392,12 @@ class TransferAnnotationTool extends JFrame
for(int i = 0; i < qualifierPanels.size(); i++) for(int i = 0; i < qualifierPanels.size(); i++)
{ {
QualifierPanel qP = (QualifierPanel) qualifierPanels.get(i); QualifierPanel qP = (QualifierPanel) qualifierPanels.get(i);
transferAnnotation(qP.getQualifierCheckBoxes(), int res = transferAnnotation(qP.getQualifierCheckBoxes(),
geneNameCheckBoxes, qP.getFeature(), entryGroup, geneNameCheckBoxes, qP.getFeature(), entryGroup,
sameKeyCheckBox.isSelected(), sameKeyCheckBox.isSelected(),
overwriteCheckBox.isSelected()); overwriteCheckBox.isSelected());
if(res == -1)
break;
} }
} }
}); });
...@@ -448,7 +449,7 @@ class TransferAnnotationTool extends JFrame ...@@ -448,7 +449,7 @@ class TransferAnnotationTool extends JFrame
* @param sameKey * @param sameKey
* @param overwrite * @param overwrite
*/ */
private void transferAnnotation(final Hashtable qualifierCheckBoxes, private int transferAnnotation(final Hashtable qualifierCheckBoxes,
final Vector geneNameCheckBoxes, final Vector geneNameCheckBoxes,
final Feature orginatingFeature, final Feature orginatingFeature,
final EntryGroup entryGroup, final EntryGroup entryGroup,
...@@ -499,7 +500,7 @@ class TransferAnnotationTool extends JFrame ...@@ -499,7 +500,7 @@ class TransferAnnotationTool extends JFrame
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
"No genes selected.", "No genes selected.",
"Warning", JOptionPane.WARNING_MESSAGE); "Warning", JOptionPane.WARNING_MESSAGE);
return; return -1;
} }
setCursor(new Cursor(Cursor.WAIT_CURSOR)); setCursor(new Cursor(Cursor.WAIT_CURSOR));
...@@ -588,6 +589,7 @@ class TransferAnnotationTool extends JFrame ...@@ -588,6 +589,7 @@ class TransferAnnotationTool extends JFrame
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
"Gene(s) Not Found:\n"+genesNotFound.toString(), "Gene(s) Not Found:\n"+genesNotFound.toString(),
"Gene(s) Not Found", JOptionPane.WARNING_MESSAGE); "Gene(s) Not Found", JOptionPane.WARNING_MESSAGE);
return 0;
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment