[Galleon-commits] galleon/src/org/lnicholls/galleon/apps/movies Movies.java,1.1,1.2

[Leon N. <ja...@us...>]

Update of /cvsroot/galleon/galleon/src/org/lnicholls/galleon/apps/movies
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30863/src/org/lnicholls/galleon/apps/movies

Modified Files:
	Movies.java 
Log Message:
Podcasting improvements; bug fixes

Index: Movies.java
===================================================================
RCS file: /cvsroot/galleon/galleon/src/org/lnicholls/galleon/apps/movies/Movies.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Movies.java	17 Jul 2005 15:46:28 -0000	1.1
--- Movies.java	28 Jul 2005 02:57:15 -0000	1.2
***************
*** 404,407 ****
--- 404,412 ----
  
  			if (movie.getThumbUrl().length()>0) {
+ 				if (mImageThread != null && mImageThread.isAlive()) {
+ 					mImageThread.interrupt();
+ 					mImageThread = null;
+ 				}
+ 				
  				mImageThread = new Thread() {
  					public void run() {
***************
*** 412,416 ****
--- 417,425 ----
  							Image image = Tools.retrieveCachedImage(new URL(movie.getThumbUrl()));
  							if (image==null)
+ 							{
  								image = Tools.getImage(new URL(movie.getThumbUrl()), -1, -1);
+ 								if (image!=null)
+ 									Tools.cacheImage(image, image.getWidth(null), image.getHeight(null), movie.getThumbUrl());
+ 							}
  							if (image != null) {
  								synchronized (this) {
***************
*** 436,441 ****
  			else
  			{
- 				setPainting(false);
  				try {
  					mImage.setVisible(false);
  					if (mImage.getResource() != null)
--- 445,450 ----
  			else
  			{
  				try {
+ 					setPainting(false);
  					mImage.setVisible(false);
  					if (mImage.getResource() != null)
***************
*** 448,461 ****
  
  		private void clearImage() {
- 			setPainting(false);
  			try {
  				if (mImageThread != null && mImageThread.isAlive()) {
  					mImageThread.interrupt();
  					mImageThread = null;
- 
- 					mImage.setVisible(false);
- 					if (mImage.getResource() != null)
- 						mImage.getResource().remove();
  				}
  			} finally {
  				setPainting(true);
--- 457,470 ----
  
  		private void clearImage() {
  			try {
+ 				setPainting(false);
  				if (mImageThread != null && mImageThread.isAlive()) {
  					mImageThread.interrupt();
  					mImageThread = null;
  				}
+ 				mImage.setVisible(false);
+ 				if (mImage.getResource() != null)
+ 					mImage.getResource().remove();
+ 				getBApp().flush();
  			} finally {
  				setPainting(true);
***************
*** 523,527 ****
  		private Thread mImageThread;
  
! 		private Resource mAnim = getResource("*2000");
  	}
  
--- 532,536 ----
  		private Thread mImageThread;
  
! 		private Resource mAnim = getResource("*1000");
  	}
  
***************
*** 758,763 ****
  						if (mResults.size() == 0) {
  							synchronized (this) {
- 								setPainting(false);
  								try {
  									mBusy.setVisible(false);
  									getBApp().flush();
--- 767,772 ----
  						if (mResults.size() == 0) {
  							synchronized (this) {
  								try {
+ 									setPainting(false);
  									mBusy.setVisible(false);
  									getBApp().flush();
***************
*** 774,779 ****
  						if (image != null) {
  							synchronized (this) {
- 								setPainting(false);
  								try {
  									if (mImageView.getResource() != null)
  										mImageView.getResource().remove();
--- 783,788 ----
  						if (image != null) {
  							synchronized (this) {
  								try {
+ 									setPainting(false);
  									if (mImageView.getResource() != null)
  										mImageView.getResource().remove();
***************
*** 798,803 ****
  					} finally {
  						synchronized (this) {
- 							setPainting(false);
  							try {
  								if (mResults != null && mResults.size() > 0)
  									mPosText.setValue(String.valueOf(mPos + 1) + " of "
--- 807,812 ----
  					} finally {
  						synchronized (this) {
  							try {
+ 								setPainting(false);
  								if (mResults != null && mResults.size() > 0)
  									mPosText.setValue(String.valueOf(mPos + 1) + " of "
***************
*** 830,835 ****
  
  		public boolean handleExit() {
- 			setPainting(false);
  			try {
  				if (mImageThread != null && mImageThread.isAlive()) {
  					mImageThread.interrupt();
--- 839,844 ----
  
  		public boolean handleExit() {
  			try {
+ 				setPainting(false);
  				if (mImageThread != null && mImageThread.isAlive()) {
  					mImageThread.interrupt();
***************
*** 903,906 ****
--- 912,916 ----
  				public void reload() {
  					try {
+ 						log.debug("Movies");
  						HashMap currentTheaters = new HashMap();
  						HashMap currentMovies = new HashMap();
***************
*** 1106,1109 ****
--- 1116,1120 ----
  								}
  							}
+ 							parser = null;
  						} catch (Exception ex) {
  							Tools.logException(Movies.class, ex);
***************
*** 1114,1118 ****
  							try
  							{
! 								NodeFilter filter = null;
  						           NodeList list = new NodeList ();
  						           
--- 1125,1129 ----
  							try
  							{
! 									NodeFilter filter = null;
  						           NodeList list = new NodeList ();
  						           
***************
*** 1276,1279 ****
--- 1287,1291 ----
  							               }
  							           }
+ 							           parser = null;
  						           }								
  							} catch (Exception ex) {