git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3515 Build a WSPreferences page for Slivka services.
[jalview.git]
/
src
/
jalview
/
gui
/
Preferences.java
diff --git
a/src/jalview/gui/Preferences.java
b/src/jalview/gui/Preferences.java
index
a0a7511
..
c921331
100755
(executable)
--- a/
src/jalview/gui/Preferences.java
+++ b/
src/jalview/gui/Preferences.java
@@
-192,6
+192,8
@@
public class Preferences extends GPreferences
private WsPreferences wsPrefs;
private WsPreferences wsPrefs;
+ private SlivkaPreferences slivkaPrefs;
+
private OptionsParam promptEachTimeOpt = new OptionsParam(
MessageManager.getString("label.prompt_each_time"),
"Prompt each time");
private OptionsParam promptEachTimeOpt = new OptionsParam(
MessageManager.getString("label.prompt_each_time"),
"Prompt each time");
@@
-212,6
+214,8
@@
public class Preferences extends GPreferences
frame.setContentPane(this);
wsPrefs = new WsPreferences();
wsTab.add(wsPrefs, BorderLayout.CENTER);
frame.setContentPane(this);
wsPrefs = new WsPreferences();
wsTab.add(wsPrefs, BorderLayout.CENTER);
+ slivkaTab.add(slivkaPrefs = new SlivkaPreferences(),
+ BorderLayout.CENTER);
int width = 500, height = 450;
new jalview.util.Platform();
if (Platform.isAMac())
int width = 500, height = 450;
new jalview.util.Platform();
if (Platform.isAMac())
@@
-481,7
+485,7
@@
public class Preferences extends GPreferences
doReset.addActionListener(onReset);
// filter to display only custom urls
doReset.addActionListener(onReset);
// filter to display only custom urls
- final RowFilter<TableModel, Object> customUrlFilter = new RowFilter<TableModel, Object>()
+ final RowFilter<TableModel, Object> customUrlFilter = new RowFilter<>()
{
@Override
public boolean include(
{
@Override
public boolean include(