X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;h=a93cdcbf560a0e35daada06936b73dfc565761a4;hb=36dceb54710feb97a81f4bd69ad051f316141dc3;hp=4536b1a754b449e98dea0652aa1d4d69a9f9f0c3;hpb=b62d7ddaf034d0bb6b4c347aedd582f69d1119cc;p=jalview.git diff --git a/src/jalview/appletgui/FeatureRenderer.java b/src/jalview/appletgui/FeatureRenderer.java index 4536b1a..a93cdcb 100644 --- a/src/jalview/appletgui/FeatureRenderer.java +++ b/src/jalview/appletgui/FeatureRenderer.java @@ -20,6 +20,14 @@ */ package jalview.appletgui; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceI; +import jalview.schemes.AnnotationColourGradient; +import jalview.schemes.GraduatedColor; +import jalview.util.MessageManager; +import jalview.viewmodel.AlignmentViewport; + import java.awt.BorderLayout; import java.awt.Button; import java.awt.Choice; @@ -35,15 +43,6 @@ import java.awt.TextArea; import java.awt.TextField; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.Hashtable; - -import jalview.datamodel.SearchResults; -import jalview.datamodel.SequenceFeature; -import jalview.datamodel.SequenceI; -import jalview.schemes.AnnotationColourGradient; -import jalview.schemes.GraduatedColor; -import jalview.util.MessageManager; -import jalview.viewmodel.AlignmentViewport; /** * DOCUMENT ME! @@ -54,11 +53,6 @@ import jalview.viewmodel.AlignmentViewport; public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRenderer { - - // Holds web links for feature groups and feature types - // in the form label|link - Hashtable featureLinks = null; - /** * Creates a new FeatureRenderer object. * @@ -69,9 +63,6 @@ public class FeatureRenderer extends { super(); this.av = av; - - setTransparencyAvailable(!System.getProperty("java.version") - .startsWith("1.1")); } static String lastFeatureAdded; @@ -154,6 +145,7 @@ public class FeatureRenderer extends super(null); } + @Override public void paint(Graphics g) { Dimension d = getSize(); @@ -227,6 +219,7 @@ public class FeatureRenderer extends overlaps.addItemListener(new java.awt.event.ItemListener() { + @Override public void itemStateChanged(java.awt.event.ItemEvent e) { int index = overlaps.getSelectedIndex(); @@ -326,8 +319,7 @@ public class FeatureRenderer extends String title = newFeatures ? MessageManager .getString("label.create_new_sequence_features") : MessageManager.formatMessage("label.amend_delete_features", - new String[] - { sequences[0].getName() }); + new String[] { sequences[0].getName() }); final JVDialog dialog = new JVDialog(ap.alignFrame, title, true, 385, 240); @@ -345,6 +337,7 @@ public class FeatureRenderer extends dialog.buttonPanel.add(deleteButton, 1); deleteButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { deleteFeature = true; @@ -358,12 +351,6 @@ public class FeatureRenderer extends start.setText(features[0].getBegin() + ""); end.setText(features[0].getEnd() + ""); description.setText(features[0].getDescription()); - Color col = getColour(name.getText()); - if (col == null) - { - col = new jalview.schemes.UserColourScheme() - .createColourFromName(name.getText()); - } Object fcol = getFeatureStyle(name.getText()); // simply display the feature color in a box colourPanel.updateColor(fcol); @@ -371,6 +358,7 @@ public class FeatureRenderer extends // TODO: render the graduated color in the box. colourPanel.addMouseListener(new java.awt.event.MouseAdapter() { + @Override public void mousePressed(java.awt.event.MouseEvent evt) { if (!colourPanel.isGcol)