2004-07-12 Pierre-Luc Paour <gallery@paour.com> (1.4-RC2-b1)

	* Fixed hidden album bug in slideshow applet.
	* Fixed move album to command attempting to move when Cancel is clicked.
	* Fixed Java resize when thumbnails are present.

ChangeLog

@@ -1,3 +1,9 @@
+2004-07-12  Pierre-Luc Paour <gallery@paour.com> (1.4-RC2-b1)
+
+	* Fixed hidden album bug in slideshow applet.
+	* Fixed move album to command attempting to move when Cancel is clicked.
+	* Fixed Java resize when thumbnails are present.
+
 2004-07-10  Pierre-Luc Paour <gallery@paour.com> (1.4-RC1)
 
 	* Fixed hidden image bug in slideshow applet.

com/gallery/GalleryRemote/AlbumInspector.java

@@ -239,12 +239,16 @@ public void actionPerformed(ActionEvent e) {
 			// todo
 		} else if (source == jMove) {
 			MoveAlbumDialog mad = new MoveAlbumDialog(mf, album.getGallery(), album);
-			album.moveAlbumTo(GalleryRemote._().getCore().getMainStatusUpdate(), mad.getNewParent());
+			Album newParent = mad.getNewParent();
 
-			// todo: this is too drastic...
-			album.getGallery().reload();
+			if (newParent != null) {
+				album.moveAlbumTo(GalleryRemote._().getCore().getMainStatusUpdate(), newParent);
 
-			//album.moveAlbumTo(null, null);
+				// todo: this is too drastic...
+				album.getGallery().reload();
+
+				//album.moveAlbumTo(null, null);
+			}
 		} else if (source == jSlideshow) {
 			mf.slideshow();
 		} else if (source == jResizeTo) {

com/gallery/GalleryRemote/GalleryComm2.java

@@ -1119,9 +1119,12 @@ private void fetch(Album a, String albumName, ArrayList newPictures)
 						}
 
 						String subAlbumName = p.getProperty("album.name." + i);
+						boolean subAlbumHidden = p.getBooleanProperty("album.hidden." + i, false);
 
 						if (subAlbumName != null) {
-							fetch(a, subAlbumName, newPictures);
+							if (!subAlbumHidden) {
+								fetch(a, subAlbumName, newPictures);
+							}
 						} else {
 							Picture picture = new Picture(g);
 							picture.setOnline(true);

com/gallery/GalleryRemote/util/ImageUtils.java

@@ -326,13 +326,16 @@ public static File resizeJava(String filename, Dimension d) {
 			ImageReader reader = (ImageReader)iter.next();
 			ImageReadParam param = reader.getDefaultReadParam();
 			reader.setInput(iis, true, false);
-			IIOImage image = reader.readAll(0, param);
+
+			// Java bug with thumbnails
+			//IIOImage image = reader.readAll(0, param);
+			BufferedImage rim = (BufferedImage) reader.readAsRenderedImage(0, param);
 
 			iis.close();
 			reader.dispose();
 
 			// resize the image
-			BufferedImage rim = (BufferedImage) image.getRenderedImage();
+			//BufferedImage rim = (BufferedImage) image.getRenderedImage();
 
 			Dimension newD = getSizeKeepRatio(
 					new Dimension(rim.getWidth(), rim.getHeight()),
@@ -372,7 +375,7 @@ public static File resizeJava(String filename, Dimension d) {
 				//displayMetadata(metadata.getAsTree(metadata.getNativeMetadataFormatName()));
 
 				// todo: despite my best efforts, I can't get the ImageIO library to keep the metadata.
-				image = new IIOImage(scaledB, null, null);
+				IIOImage image = new IIOImage(scaledB, null, null);
 
 				//image.getMetadata().mergeTree(metadata.getNativeMetadataFormatName(), root);
 

defaults.properties

@@ -230,6 +230,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.4-RC1
-releaseDate=2004/07/10
+version=1.4-RC2-b1
+releaseDate=2004/07/12
 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor