2004-02-17 Pierre-Luc Paour <gallery@paour.com> (1.3.2-b1)

* Albums are now sorted alphabetically when using the latest protocol. * Added a new launcher in the IA project for debug, which sets the output to a console. * When IA console is set, the Log will automatically be sent to stdout. This is to make it easier to have users send in bug reports that include exceptions.
gallery · Feb 18, 2004 · b9a41a5 · b9a41a5
1 parent 2447e15
commit b9a41a5
Show file tree

Hide file tree

Showing 9 changed files with 266 additions and 19 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-17  Pierre-Luc Paour <gallery@paour.com> (1.3.2-b1)
+
+	* Albums are now sorted alphabetically when using the latest
+	  protocol.
+	* Added a new launcher in the IA project for debug, which
+	  sets the output to a console.
+	* When IA console is set, the Log will automatically be sent
+	  to stdout. This is to make it easier to have users send
+	  in bug reports that include exceptions.
+
 2004-02-12  Pierre-Luc Paour <gallery@paour.com> (1.3.1)
 
 	* Re-release...

diff --git a/build.xml b/build.xml
@@ -263,7 +263,7 @@
 
   <move file="${install}/Windows/NoVM/InstallGalleryRemote.exe" tofile="${install}/staging/GalleryRemote.${version}.Win32.NoVM.exe"/>
   <move file="${install}/Windows/VM/InstallGalleryRemote.exe" tofile="${install}/staging/GalleryRemote.${version}.Win32.VM.exe"/>
-  <move file="${install}/MacOSX/InstallGalleryRemote.zip" tofile="${install}/staging/GalleryRemote.${version}.MacOSX.NoVM.zip"/>
+  <!--move file="${install}/MacOSX/InstallGalleryRemote.zip" tofile="${install}/staging/GalleryRemote.${version}.MacOSX.NoVM.zip"/-->
   <move file="${install}/Linux/NoVM/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Linux.NoVM.bin"/>
   <move file="${install}/Linux/VM/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Linux.VM.bin"/>
   <move file="${install}/Solaris/NoVM/InstallGalleryRemote.bin" tofile="${install}/staging/GalleryRemote.${version}.Solaris.NoVM.bin"/>

diff --git a/com/gallery/GalleryRemote/GalleryComm2.java b/com/gallery/GalleryRemote/GalleryComm2.java
@@ -30,6 +30,7 @@
 import com.gallery.GalleryRemote.util.GRI18n;
 import com.gallery.GalleryRemote.util.HTMLEscaper;
 import com.gallery.GalleryRemote.util.UrlMessageDialog;
+import com.gallery.GalleryRemote.util.NaturalOrderComparator;
 
 import javax.swing.*;
 import java.awt.*;
@@ -875,7 +876,8 @@ private void list22() throws IOException, ModuleException {
 				Log.log(Log.LEVEL_TRACE, MODULE, "Linked " + name2parentName.size() + " albums to their parents");
 
 				// reorder
-				//Collections.reverse(albums);
+				Collections.sort(albums, new NaturalOrderComparator());
+				Collections.reverse(albums);
 				ArrayList orderedAlbums = new ArrayList();
 				int depth = 0;
 				while (!albums.isEmpty()) {
@@ -886,10 +888,11 @@ private void list22() throws IOException, ModuleException {
 						try {
 							if (a.getAlbumDepth() == depth) {
 								it.remove();
+								a.sortSubAlbums();
 
 								Album parentAlbum = a.getParentAlbum();
 								if (parentAlbum == null) {
-									orderedAlbums.add(a);
+									orderedAlbums.add(0, a);
 								} else {
 									int i = orderedAlbums.indexOf(parentAlbum);
 									orderedAlbums.add(i + 1, a);

diff --git a/com/gallery/GalleryRemote/GalleryRemoteMainFrame.java b/com/gallery/GalleryRemote/GalleryRemoteMainFrame.java
@@ -49,7 +49,9 @@ public void createProperties() {
 	protected void initializeGR() {
 		super.initializeGR();
 
-		Log.startLog(properties.getIntProperty(PreferenceNames.LOG_LEVEL), properties.getBooleanProperty("toSysOut"));
+		Log.startLog(properties.getIntProperty(PreferenceNames.LOG_LEVEL),
+				properties.getBooleanProperty("toSysOut") ||
+				(System.getProperty("lax.stdout.redirect") != null && System.getProperty("lax.stdout.redirect").length() > 0));
 
 		try {
 			if (isAppletMode() || !Update.upgrade()) {

diff --git a/com/gallery/GalleryRemote/Log.java b/com/gallery/GalleryRemote/Log.java
@@ -169,6 +169,7 @@ public void run() {
 		BufferedWriter writer = null;
 		running = true;
 		try {
+			System.out.println("Creating log file in " + System.getProperty("java.io.tmpdir"));
 			writer = new BufferedWriter(new FileWriter(new File(System.getProperty("java.io.tmpdir"), "GalleryRemoteLog.txt")));
 			while (running) {
 				Thread.sleep(sleepInterval);

diff --git a/com/gallery/GalleryRemote/MainFrame.java b/com/gallery/GalleryRemote/MainFrame.java
@@ -1405,6 +1405,8 @@ private void saveState(File f) {
 
 			// We've been saved, we are now clean.
 			setDirtyFlag(false);
+
+			Log.log(Log.LEVEL_TRACE, MODULE, "State saved");
 		} catch (IOException e) {
 			Log.log(Log.LEVEL_ERROR, MODULE, "Exception while trying to save state");
 			Log.logException(Log.LEVEL_ERROR, MODULE, e);

diff --git a/com/gallery/GalleryRemote/model/Album.java b/com/gallery/GalleryRemote/model/Album.java
@@ -317,6 +317,10 @@ public void sortPicturesAlphabetically() {
 		notifyListeners();
 	}
 
+	public void sortSubAlbums() {
+		Collections.sort(subAlbums, new NaturalOrderComparator());
+	}
+
 	/**
 	 * Number of pictures in the album
 	 * 

diff --git a/defaults.properties b/defaults.properties
@@ -178,6 +178,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.3.1
-releaseDate=2004/02/12
+version=1.3.2-b1
+releaseDate=2004/02/17
 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