From: gmungoc Date: Tue, 14 Aug 2018 10:04:02 +0000 (+0100) Subject: JAL-3056 no Save/Load colours xml in JalviewJS X-Git-Tag: Release_2_11_4_0~45^2~18^2~493 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=56b2e4e955f9ff00a4af3b0940757fbae5e520f1;p=jalview.git JAL-3056 no Save/Load colours xml in JalviewJS --- diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 37258e4..2512a1b 100644 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -22,6 +22,7 @@ package jalview.gui; import jalview.api.FeatureColourI; import jalview.api.FeatureSettingsControllerI; +import jalview.bin.Jalview; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; import jalview.datamodel.features.FeatureMatcher; @@ -44,6 +45,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Font; import java.awt.Graphics; import java.awt.GridLayout; @@ -1348,8 +1350,14 @@ public class FeatureSettings extends JPanel JPanel buttonPanel = new JPanel(); buttonPanel.add(ok); buttonPanel.add(cancel); - buttonPanel.add(loadColours); - buttonPanel.add(saveColours); + if (!Jalview.isJS()) + { + /* + * no save/load XML in JalviewJS for now + */ + buttonPanel.add(loadColours); + buttonPanel.add(saveColours); + } bigPanel.add(scrollPane, BorderLayout.CENTER); settingsPane.add(bigPanel, BorderLayout.CENTER); settingsPane.add(buttonPanel, BorderLayout.SOUTH);