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
Jalview-JS/JAL-3253-applet additional static final preferences
[jalview.git]
/
src
/
jalview
/
bin
/
Cache.java
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
086419b
..
2d33478
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-20,8
+20,9
@@
*/
package jalview.bin;
*/
package jalview.bin;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.PDBEntry;
-import jalview.gui.UserDefinedColours;
+import jalview.gui.Preferences;
import jalview.schemes.ColourSchemeLoader;
import jalview.schemes.ColourSchemes;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ColourSchemeLoader;
import jalview.schemes.ColourSchemes;
import jalview.schemes.UserColourScheme;
@@
-207,7
+208,7
@@
import org.apache.log4j.SimpleLayout;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
-public class Cache
+public class Cache implements ApplicationSingletonI
{
private Cache()
{
private Cache()
@@
-224,8
+225,7
@@
public class Cache
*/
private static Cache getInstance()
{
*/
private static Cache getInstance()
{
- Instance i = Instance.getInstance();
- return (i.cache == null ? i.cache = new Cache() : i.cache);
+ return (Cache) ApplicationSingletonProvider.getInstance(Cache.class);
}
/**
}
/**
@@
-598,7
+598,7
@@
public class Cache
setProperty("VERSION", codeVersion);
// LOAD USERDEFINED COLOURS
setProperty("VERSION", codeVersion);
// LOAD USERDEFINED COLOURS
- initUserColourSchemes(getProperty("USER_DEFINED_COLOURS"));
+ initUserColourSchemes(getProperty(Preferences.USER_DEFINED_COLOURS));
}
private void deleteBuildProperties()
}
private void deleteBuildProperties()
@@
-1137,13
+1137,13
@@
public class Cache
{
if (coloursFound.toString().length() > 1)
{
{
if (coloursFound.toString().length() > 1)
{
- setProperty(UserDefinedColours.USER_DEFINED_COLOURS,
+ setProperty(Preferences.USER_DEFINED_COLOURS,
coloursFound.toString());
}
else
{
getInstance().applicationProperties
coloursFound.toString());
}
else
{
getInstance().applicationProperties
- .remove(UserDefinedColours.USER_DEFINED_COLOURS);
+ .remove(Preferences.USER_DEFINED_COLOURS);
}
}
}
}
}
}