Skip to content

Commit

Permalink
Added support for reloading the cache, refactored some names.
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Luc Paour committed May 8, 2003
1 parent 4e62ab1 commit acc298d
Showing 1 changed file with 34 additions and 7 deletions.
41 changes: 34 additions & 7 deletions com/gallery/GalleryRemote/ThumbnailCache.java
Expand Up @@ -61,6 +61,7 @@ public ThumbnailCache( MainFrame mf ) {
* Main processing method for the ThumbnailLoader object
*/
public void run() {
Thread.yield();
int loaded = 0;
int pId = mf.startProgress(0, toLoad.size(), "Loading thumbnails", false);
//Log.log(Log.TRACE, MODULE, "Starting " + iFilename);
Expand Down Expand Up @@ -111,7 +112,7 @@ public void preloadThumbnail( String filename ) {
*@param filename path to the file
*/
public void preloadThumbnailFirst( String filename ) {
Log.log(Log.TRACE, MODULE, "preloadThumbnail " + filename);
Log.log(Log.TRACE, MODULE, "preloadThumbnailFirst " + filename);

if (!thumbnails.containsKey(filename)) {
toLoad.push( filename );
Expand All @@ -124,7 +125,7 @@ public void preloadThumbnailFirst( String filename ) {
/**
* Ask for several thumnails to be loaded
*
*@param files enumeration of File objects that should be loaded
*@param files enumeration of Picture objects that should be loaded
*/
public void preloadThumbnailFiles( Enumeration files ) {
Log.log(Log.TRACE, MODULE, "preloadThumbnail " + files);
Expand All @@ -146,18 +147,44 @@ public void preloadThumbnailFiles( Enumeration files ) {
*
*@param filenames an array of File objects
*/
public void preloadThumbnails( File[] filenames ) {
Log.log(Log.TRACE, MODULE, "preloadThumbnail " + filenames);
public void preloadThumbnailFiles( File[] files ) {
Log.log(Log.TRACE, MODULE, "preloadThumbnailFiles " + files);

for ( int i = 0; i < files.length; i++ ) {
String filename = files[i].getPath();

if (!thumbnails.containsKey(filename)) {
toLoad.add( 0, filename );
}
}

rerun();
}

/**
* Ask for an enumeration fo file names to be loaded
*
* @param filenames an enumeration of String file names
*/
public void preloadThumbnails( Enumeration filenames ) {
Log.log(Log.TRACE, MODULE, "preloadThumbnails " + filenames);

for ( int i = 0; i < filenames.length; i++ ) {
if (!thumbnails.containsKey(filenames[i])) {
toLoad.add( 0, ( (File) filenames[i] ).getPath() );
while ( filenames.hasMoreElements() ) {
String filename = (String) filenames.nextElement();
if (!thumbnails.containsKey(filename)) {
toLoad.add( 0, filename );
}
}

rerun();
}

public void reload() {
Enumeration e = ((Hashtable) thumbnails.clone()).keys();
thumbnails.clear();
preloadThumbnails(e);
}


void rerun() {
if ( !stillRunning && GalleryRemote.getInstance().properties.getShowThumbnails() ) {
Expand Down

0 comments on commit acc298d

Please sign in to comment.