2003-12-03 Pierre-Luc Paour <gallery@paour.com> (1.3-b7)

	* Merged changes from the recently released GR 1.2.

ChangeLog

@@ -1,3 +1,7 @@
+2003-12-03  Pierre-Luc Paour <gallery@paour.com> (1.3-b7)
+
+	* Merged changes from the recently released GR 1.2.
+
 2003-11-20  Pierre-Luc Paour <gallery@paour.com> (1.3-b6)
 
 	* Refined the file saving UI, adding Save As and Close, as well as updating
@@ -45,6 +49,11 @@
 	* Album Inspector added (not yet fully functionnal)
 	* this is a preliminary release
 
+2003-11-25  Pierre-Luc Paour <gallery@paour.com> (1.2)
+
+	* Release
+	* Fixed the usual Java 1.3 bug.
+
 2003-11-09  Pierre-Luc Paour <gallery@paour.com> (1.2-b15)
 
 	* Fixed jpegtran execution on platforms other than Win32 (bad command line)

build.xml

@@ -3,14 +3,15 @@
 		A part of the Gallery project
 	</description>
 	<!-- set global properties for this build -->
-	<property name="src" location="."/>
-	<property name="build" location="build"/>
-	<property name="lib" location="lib"/>
-	<property name="img" location="img"/>
-	<property name="dist"  location="dist"/>
-	<property name="install"  location="gallery_remote_Build_Output/Web_Installers/InstData"/>
-	<property name="docbase"  location="../gallery_docs"/>
-	<property name="docdist"  location="${docbase}/dist/grpackage"/>
+	<property name="src" location="." />
+	<property name="build" location="build" />
+	<property name="lib" location="lib" />
+	<property name="img" location="img" />
+	<property name="dist" location="dist" />
+	<property name="install" location="gallery_remote_Build_Output/Web_Installers/InstData" />
+	<property name="docbase" location="../gallery_docs" />
+	<property name="docdist" location="${docbase}/dist/grpackage" />
+	<property name="iafolder" location="G:\\Program Files\\InstallAnywhere 6 Enterprise" />
 
 	<taskdef name="jarbundler"
 		classpath="${lib}/jarbundler-0.1.jar"
@@ -80,7 +81,6 @@
 			<fileset dir="." includes="ChangeLog" />
 			<fileset dir="." includes="GalleryRemote.jar" />
 			<fileset dir="." includes="ReadMe.html" />
-			<!--zipfileset dir="./lib" includes="JSX1.0.7.4.jar" prefix="lib"/-->
 			<zipfileset dir="./lib" includes="metadata-extractor-2.1.jar" prefix="lib"/>
 			<zipfileset dir="./img" includes="*" prefix="img"/>
 		</zip>
@@ -119,9 +119,13 @@
 
 	<target name="installer" depends="jar, docs"
 		description="Build the installer" >
-		<exec executable="build">
-			<arg file="gallery_remote.iap_xml" />
-		</exec>
+	<!--target name="installer"
+		description="Build the installer" -->
+
+		<taskdef name="buildinstaller" classname="com.zerog.ia.integration.ant.InstallAnywhereAntTask"
+			classpath="${iafolder}/resource/build/iaant.jar" />
+
+		<buildinstaller IAProjectFile="${basedir}/gallery_remote.iap_xml" IALocation="${iafolder}"/>
 	</target>
 
 	<target name="docs" description="Build documentation">
@@ -191,7 +195,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/InstallGalleryRemote.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" />

com/gallery/GalleryRemote/MainFrame.java

@@ -1827,6 +1827,7 @@ public Component getTreeCellRendererComponent(
 			iDelete = new ImageIcon(MainFrame.class.getResource("/Delete16.gif"));
 			iRight = new ImageIcon(MainFrame.class.getResource("/RotateRight24.gif"));
 			iLeft = new ImageIcon(MainFrame.class.getResource("/RotateLeft24.gif"));
+			iFlip = new ImageIcon(MainFrame.class.getResource("/FlipHoriz24.gif"));
 
 			iComputer = new ImageIcon(MainFrame.class.getResource("/computer.gif"));
 			iUploading = new ImageIcon(MainFrame.class.getResource("/uploading.gif"));

com/gallery/GalleryRemote/Update.java

@@ -244,7 +244,7 @@ public static boolean upgrade() {
 		String laxClasspath = lax.getProperty("lax.class.path");
 		String classpath = GalleryRemote.getInstance().properties.getProperty("classpath");
 
-		if (! classpath.equals(laxClasspath)) {
+		if (classpath != null && ! classpath.equals(laxClasspath)) {
 			Log.log(Log.LEVEL_INFO, MODULE, "Patching LAX classpath");
 
 			try {

com/gallery/GalleryRemote/util/GRI18n.java

@@ -17,8 +17,10 @@
 
 
 public class GRI18n implements PreferenceNames {
-    private static final String RESNAME =
-            "com.gallery.GalleryRemote.resources.GRResources";
+	private static final String RESNAME =
+			"com.gallery.GalleryRemote.resources.GRResources";
+	private static final String RESPATH =
+			"com/gallery/GalleryRemote/resources/GRResources";
     private static final String MODULE = "GRI18n";
 
     private static Locale grLocale;
@@ -125,7 +127,6 @@ public static List getAvailableLocales() {
     }
 
     private static List initAvailableLocales() {
-        String resPath = RESNAME.replaceAll("\\.", "/");
         String locPath;
         String loc;
         List aList = new LinkedList();
@@ -140,7 +141,7 @@ private static List initAvailableLocales() {
             loc = list[i].toString();
             if (!loc.startsWith(prefix)) {
                 prefix = loc;
-                locPath = resPath + "_" + loc + ".properties";
+                locPath = RESPATH + "_" + loc + ".properties";
                 if (ClassLoader.getSystemClassLoader().getResource(locPath) != null)
                     aList.add(list[i]);
             }

defaults.properties

@@ -125,11 +125,12 @@ updateCheckBeta=true
 updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.php
 
 # The classpath that should be used in the LAX
-classpath=GalleryRemote.jar;lib/JSX1.0.7.4.jar;lib/metadata-extractor-2.1.jar;lax.jar;img
+# this property should only be enabled when the LAX classpath needs to be updated
+#classpath=GalleryRemote.jar;lib/JSX1.0.7.4.jar;lib/metadata-extractor-2.1.jar;lax.jar;img
 
 #
 # --- Do not edit below this line ---
 #
-version=1.3-b6
-releaseDate=2003/11/20
+version=1.3-b7
+releaseDate=2003/12/03
 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\nAmedeo Paglione\nChris Schwerdt\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\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