Skip to content
Snippets Groups Projects
Commit 2573b1cd authored by tjc's avatar tjc
Browse files

updates

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@5965 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent 0484c017
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/genebuilder/GeneBuilderFrame.java,v 1.23 2007-04-26 08:46:11 tjc Exp $
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/genebuilder/GeneBuilderFrame.java,v 1.24 2007-04-27 13:57:19 tjc Exp $
*/
package uk.ac.sanger.artemis.components.genebuilder;
......@@ -286,10 +286,11 @@ public class GeneBuilderFrame extends JFrame
return transcriptBox;
}
protected void setActiveFeature(final Feature active_feature)
protected void setActiveFeature(final Feature active_feature,
final boolean isSet)
{
this.active_feature = active_feature;
feature_editor.setActiveFeature(active_feature);
feature_editor.setActiveFeature(active_feature, isSet);
}
/**
......
......@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/genebuilder/GeneComponentTree.java,v 1.16 2007-03-15 11:39:07 tjc Exp $
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/genebuilder/GeneComponentTree.java,v 1.17 2007-04-27 13:57:19 tjc Exp $
*/
package uk.ac.sanger.artemis.components.genebuilder;
......@@ -346,7 +346,7 @@ public class GeneComponentTree extends JTree
if(feature == null)
feature = new uk.ac.sanger.artemis.Feature(embl_feature);
gene_builder.setActiveFeature(feature);
gene_builder.setActiveFeature(feature, true);
if(selection != null)
selection.set(feature);
}
......
......@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/genebuilder/GeneViewerPanel.java,v 1.43 2007-04-26 08:20:06 tjc Exp $
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/genebuilder/GeneViewerPanel.java,v 1.44 2007-04-27 13:57:19 tjc Exp $
*/
package uk.ac.sanger.artemis.components.genebuilder;
......@@ -234,10 +234,8 @@ public class GeneViewerPanel extends JPanel
segment.removeFromFeature();
selection.remove(segment);
}
selection.add(feature);
gene_builder.setActiveFeature(feature);
gene_builder.setActiveFeature(feature, false);
repaint();
}
catch(ReadOnlyException e)
......@@ -376,7 +374,7 @@ public class GeneViewerPanel extends JPanel
uk.ac.sanger.artemis.Feature transcript = features.elementAt(0);
checkTranscriptBoundary(transcript);
gene_builder.setActiveFeature(transcript);
gene_builder.setActiveFeature(transcript, false);
}
});
menu.add(adjustCoords);
......@@ -1554,12 +1552,12 @@ public class GeneViewerPanel extends JPanel
selection.set(
(uk.ac.sanger.artemis.Feature)((Feature)feature).getUserData());
gene_builder.setActiveFeature(
(uk.ac.sanger.artemis.Feature)((Feature)feature).getUserData());
(uk.ac.sanger.artemis.Feature)((Feature)feature).getUserData(), true);
}
else
{
selection.set((FeatureSegment)feature);
gene_builder.setActiveFeature(((FeatureSegment)feature).getFeature());
gene_builder.setActiveFeature(((FeatureSegment)feature).getFeature(), true);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment