* @author $author$
* @version $Revision$
*/
+/*
+ * for merge with Jalview-JS
+ public class Preferences extends GPreferences implements ApplicationSingletonI
+ */
public class Preferences extends GPreferences
{
public static final String ENABLE_SPLIT_FRAME = "ENABLE_SPLIT_FRAME";
MessageManager.getString("action.text"), "Text");
// get singleton Preferences instance
- public static Preferences getPreferences()
- {
- return getPreferences(0, null);
- }
-
- public static Preferences getPreferences(int selectTab, String message)
+ public static Preferences getInstance()
{
if (INSTANCE == null || INSTANCE.frame == null
|| INSTANCE.frame.isClosed())
{
INSTANCE = new Preferences();
}
- INSTANCE.selectTab(selectTab);
- INSTANCE.setMessage(message);
return INSTANCE;
+
+ /*
+ * Replace code with the following for Jalvew-JS
+ Preferences INSTANCE = ApplicationSingletonProvider.getInstance(Preferences.class);
+ if (INSTANCE == null || INSTANCE.frame == null
+ || INSTANCE.frame.isClosed())
+ {
+ ApplicationSingletonProvider.remove(Preferences.class);
+ INSTANCE = ApplicationSingletonProvider.getInstance(Preferences.class);
+ }
+ return INSTANCE;
+ */
}
public static void openPreferences()
public static void openPreferences(int selectTab, String message)
{
- Preferences p = getPreferences(selectTab, message);
+ Preferences p = getInstance();
+ p.selectTab(selectTab);
+ p.setMessage(message);
p.frame.show();
p.frame.moveToFront();
p.frame.grabFocus();