X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=5b48e2da0828a4dce44a3341d3c344d4389a40af;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=8b33debd11d818a982d45f72215efbeef79c8224;hpb=20ee237bee8261a2e14299a90d97a88701d47733;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 8b33deb..5b48e2d 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -30,6 +30,7 @@ import jalview.jbgui.GPreferences; import jalview.jbgui.GSequenceLink; import jalview.schemes.ColourSchemeProperty; import jalview.util.MessageManager; +import jalview.util.Platform; import jalview.ws.sifts.SiftsSettings; import java.awt.BorderLayout; @@ -40,7 +41,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.File; -import java.util.Collection; +import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; import java.util.Vector; @@ -88,8 +89,6 @@ public class Preferences extends GPreferences public static final String SHOW_AUTOCALC_ABOVE = "SHOW_AUTOCALC_ABOVE"; - public static final String HIDE_INTRONS = "HIDE_INTRONS"; - private static final int MIN_FONT_SIZE = 1; private static final int MAX_FONT_SIZE = 30; @@ -98,7 +97,7 @@ public class Preferences extends GPreferences * Holds name and link separated with | character. Sequence ID must be * $SEQUENCE_ID$ or $SEQUENCE_ID=/.possible | chars ./=$ */ - public static Vector sequenceURLLinks; + public static Vector sequenceURLLinks; /** * Holds name and link separated with | character. Sequence IDS and Sequences @@ -108,14 +107,14 @@ public class Preferences extends GPreferences * (TODO: proper escape for using | to separate ids or sequences */ - public static Vector groupURLLinks; + public static List groupURLLinks; static { String string = Cache .getDefault( "SEQUENCE_LINKS", "EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"); - sequenceURLLinks = new Vector(); + sequenceURLLinks = new Vector(); try { @@ -154,10 +153,10 @@ public class Preferences extends GPreferences * .properties file as '|' separated strings */ - groupURLLinks = new Vector(); + groupURLLinks = new ArrayList(); } - Vector nameLinks, urlLinks; + Vector nameLinks, urlLinks; JInternalFrame frame; @@ -165,6 +164,16 @@ public class Preferences extends GPreferences private WsPreferences wsPrefs; + private OptionsParam promptEachTimeOpt = new OptionsParam( + MessageManager.getString("label.prompt_each_time"), + "Prompt each time"); + + private OptionsParam lineArtOpt = new OptionsParam( + MessageManager.getString("label.lineart"), "Lineart"); + + private OptionsParam textOpt = new OptionsParam( + MessageManager.getString("action.text"), "Text"); + /** * Creates a new Preferences object. */ @@ -177,11 +186,12 @@ public class Preferences extends GPreferences dasTab.add(dasSource, BorderLayout.CENTER); wsPrefs = new WsPreferences(); wsTab.add(wsPrefs, BorderLayout.CENTER); - int width = 500, height = 470; - if (new jalview.util.Platform().isAMac()) + int width = 500, height = 450; + new jalview.util.Platform(); + if (Platform.isAMac()) { width = 570; - height = 500; + height = 480; } Desktop.addInternalFrame(frame, @@ -243,7 +253,6 @@ public class Preferences extends GPreferences idItalics.setSelected(Cache.getDefault("ID_ITALICS", true)); wrap.setSelected(Cache.getDefault("WRAP_ALIGNMENT", false)); - hideIntrons.setSelected(Cache.getDefault(HIDE_INTRONS, true)); gapSymbolCB.addItem("-"); gapSymbolCB.addItem("."); @@ -332,8 +341,8 @@ public class Preferences extends GPreferences /* * Set Connections tab defaults */ - nameLinks = new Vector(); - urlLinks = new Vector(); + nameLinks = new Vector(); + urlLinks = new Vector(); for (int i = 0; i < sequenceURLLinks.size(); i++) { String link = sequenceURLLinks.elementAt(i).toString(); @@ -360,12 +369,23 @@ public class Preferences extends GPreferences /* * Set Output tab defaults */ - epsRendering - .addItem(MessageManager.getString("label.prompt_each_time")); - epsRendering.addItem(MessageManager.getString("label.lineart")); - epsRendering.addItem(MessageManager.getString("action.text")); - epsRendering.setSelectedItem(Cache.getDefault("EPS_RENDERING", - "Prompt each time")); + epsRendering.addItem(promptEachTimeOpt); + epsRendering.addItem(lineArtOpt); + epsRendering.addItem(textOpt); + String defaultEPS = Cache.getDefault("EPS_RENDERING", + "Prompt each time"); + if (defaultEPS.equalsIgnoreCase("Text")) + { + epsRendering.setSelectedItem(textOpt); + } + else if (defaultEPS.equalsIgnoreCase("Lineart")) + { + epsRendering.setSelectedItem(lineArtOpt); + } + else + { + epsRendering.setSelectedItem(promptEachTimeOpt); + } autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false)); userIdWidth.setEnabled(!autoIdWidth.isSelected()); userIdWidthlabel.setEnabled(!autoIdWidth.isSelected()); @@ -461,8 +481,6 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", Boolean.toString(wrap.isSelected())); - Cache.applicationProperties.setProperty(HIDE_INTRONS, - Boolean.toString(hideIntrons.isSelected())); Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText()); @@ -518,15 +536,8 @@ public class Preferences extends GPreferences /* * Save Output settings */ - if (epsRendering.getSelectedItem().equals("Prompt each time")) - { - Cache.applicationProperties.remove("EPS_RENDERING"); - } - else - { - Cache.applicationProperties.setProperty("EPS_RENDERING", epsRendering - .getSelectedItem().toString()); - } + Cache.applicationProperties.setProperty("EPS_RENDERING", + ((OptionsParam) epsRendering.getSelectedItem()).getCode()); /* * Save Connections settings @@ -538,7 +549,7 @@ public class Preferences extends GPreferences if (nameLinks.size() > 0) { StringBuffer links = new StringBuffer(); - sequenceURLLinks = new Vector(); + sequenceURLLinks = new Vector(); for (int i = 0; i < nameLinks.size(); i++) { sequenceURLLinks.addElement(nameLinks.elementAt(i) + "|" @@ -673,11 +684,11 @@ public class Preferences extends GPreferences public void startupFileTextfield_mouseClicked() { JalviewFileChooser chooser = new JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] { + Cache.getProperty("LAST_DIRECTORY"), new String[] { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "jar" }, new String[] { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" }, - jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT")); + Cache.getProperty("DEFAULT_FILE_FORMAT")); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle(MessageManager .getString("label.select_startup_file")); @@ -686,8 +697,9 @@ public class Preferences extends GPreferences if (value == JalviewFileChooser.APPROVE_OPTION) { - jalview.bin.Cache.applicationProperties.setProperty( - "DEFAULT_FILE_FORMAT", chooser.getSelectedFormat()); + Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT", + chooser + .getSelectedFormat().toString()); startupFileTextfield.setText(chooser.getSelectedFile() .getAbsolutePath()); } @@ -854,7 +866,7 @@ public class Preferences extends GPreferences super.showunconserved_actionPerformed(e); } - public static Collection getGroupURLLinks() + public static List getGroupURLLinks() { return groupURLLinks; } @@ -986,4 +998,57 @@ public class Preferences extends GPreferences } } + public class OptionsParam + { + private String name; + + private String code; + + public OptionsParam(String name, String code) + { + this.name = name; + this.code = code; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getCode() + { + return code; + } + + public void setCode(String code) + { + this.code = code; + } + + @Override + public String toString() + { + return name; + } + + @Override + public boolean equals(Object that) + { + if (!(that instanceof OptionsParam)) + { + return false; + } + return this.code.equalsIgnoreCase(((OptionsParam) that).code); + } + + @Override + public int hashCode(){ + return name.hashCode() + code.hashCode(); + } + } }