From 43bc29afd8838df553acb08a6aa5dc080a382249 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 15 Jan 2003 02:31:50 +0000 Subject: [PATCH] Static variables go above static constants. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2149 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/media/image/ImageManager.java | 16 ++++++++-------- src/java/com/threerings/media/tile/TileSet.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java index 9f2729543..db3add394 100644 --- a/src/java/com/threerings/media/image/ImageManager.java +++ b/src/java/com/threerings/media/image/ImageManager.java @@ -1,5 +1,5 @@ // -// $Id: ImageManager.java,v 1.38 2003/01/15 00:47:08 mdb Exp $ +// $Id: ImageManager.java,v 1.39 2003/01/15 02:31:50 mdb Exp $ package com.threerings.media.image; @@ -486,6 +486,13 @@ public class ImageManager /** Data providers for different resource sets. */ protected HashMap _providers = new HashMap(); + /** Register our image cache size with the runtime adjustments + * framework. */ + protected static RuntimeAdjust.IntAdjust _cacheSize = + new RuntimeAdjust.IntAdjust( + "Size (in images) of the image manager LRU cache [requires reboot]", + IMAGE_CACHE_SIZE_KEY, MediaPrefs.config, DEFAULT_IMAGE_CACHE_SIZE); + /** The classname of the ImageIO-based image loader which we attempt * to use but fallback from if we're not running a JVM that has * ImageIO support. */ @@ -498,11 +505,4 @@ public class ImageManager /** The maximum number of images that may be cached at any one time. */ protected static final int DEFAULT_IMAGE_CACHE_SIZE = 100; - - /** Register our image cache size with the runtime adjustments - * framework. */ - protected static RuntimeAdjust.IntAdjust _cacheSize = - new RuntimeAdjust.IntAdjust( - "Size (in images) of the image manager LRU cache [requires reboot]", - IMAGE_CACHE_SIZE_KEY, MediaPrefs.config, DEFAULT_IMAGE_CACHE_SIZE); } diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java index 28c505769..b74f714fe 100644 --- a/src/java/com/threerings/media/tile/TileSet.java +++ b/src/java/com/threerings/media/tile/TileSet.java @@ -1,5 +1,5 @@ // -// $Id: TileSet.java,v 1.37 2003/01/15 00:47:09 mdb Exp $ +// $Id: TileSet.java,v 1.38 2003/01/15 02:31:50 mdb Exp $ package com.threerings.media.tile; @@ -302,17 +302,17 @@ public abstract class TileSet /** A weak cache of our tiles. */ protected static LRUHashMap _tiles; - /** The config key for our cache size property. */ - protected static final String TILE_CACHE_SIZE_KEY = - "narya.media.tile.cache_size"; - - /** The default tile cache size. */ - protected static final int DEFAULT_TILE_CACHE_SIZE = 500; - /** Register our tile cache size with the runtime adjustments * framework. */ protected static RuntimeAdjust.IntAdjust _cacheSize = new RuntimeAdjust.IntAdjust( "Size (in tiles) of the tile LRU cache [requires reboot]", TILE_CACHE_SIZE_KEY, MediaPrefs.config, DEFAULT_TILE_CACHE_SIZE); + + /** The config key for our cache size property. */ + protected static final String TILE_CACHE_SIZE_KEY = + "narya.media.tile.cache_size"; + + /** The default tile cache size. */ + protected static final int DEFAULT_TILE_CACHE_SIZE = 500; }