Fixed untimely icon creation (fails on headless machines, such as my …

…build environment). Updated deploy script to push to jmullan.com and update menalto.com.
gallery · Oct 9, 2003 · 603522b · 603522b
1 parent d180d72
commit 603522b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/com/gallery/GalleryRemote/GalleryRemote.java b/com/gallery/GalleryRemote/GalleryRemote.java
@@ -40,9 +40,7 @@ public class GalleryRemote {
 	public MainFrame mainFrame = null;
 	public PropertiesFile properties = null;
 	public PropertiesFile defaults = null;
-
-	public static Image iconImage = new ImageIcon(GalleryRemote.class.getResource( "/rar_icon_16.gif" )).getImage();
-
+
 	private GalleryRemote() {
 		defaults = new PropertiesFile("defaults");
 

diff --git a/com/gallery/GalleryRemote/MainFrame.java b/com/gallery/GalleryRemote/MainFrame.java
@@ -129,6 +129,7 @@ public class MainFrame extends javax.swing.JFrame
 	public static ImageIcon iFlip;
 	public static ImageIcon iComputer;
 	public static ImageIcon iUploading;
+	public static Image iconImage = new ImageIcon(GalleryRemote.class.getResource( "/rar_icon_16.gif" )).getImage();
 
 	public static boolean IS_MAC_OS_X = (System.getProperty("mrj.version") != null);
 	//final static int MENU_MASK = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
@@ -166,7 +167,7 @@ public MainFrame() {
 			galleries.addElement( g );
 		}*/
 
-		setIconImage(GalleryRemote.iconImage);
+		setIconImage(MainFrame.iconImage);
 
 		if ( System.getProperty("os.name").toLowerCase().startsWith("mac") ) {
 			// Install shutdown handler only on Mac

diff --git a/com/gallery/GalleryRemote/PreviewFrame.java b/com/gallery/GalleryRemote/PreviewFrame.java
@@ -46,7 +46,7 @@ public class PreviewFrame extends javax.swing.JFrame {
 	public void initComponents() {
 		setTitle(GRI18n.getInstance().getString(MODULE, "title"));
 
-		setIconImage(GalleryRemote.iconImage);
+		setIconImage(MainFrame.iconImage);
 
 		setBounds(GalleryRemote.getInstance().properties.getPreviewBounds());
 

diff --git a/com/gallery/GalleryRemote/Update.java b/com/gallery/GalleryRemote/Update.java
@@ -113,7 +113,7 @@ public void showNotice() {
 
 			DialogUtil.center(this);
 
-			setIconImage(GalleryRemote.iconImage);
+			setIconImage(MainFrame.iconImage);
 
 			setVisible( true );
 		} catch ( Exception e ) {

diff --git a/deploy.sh b/deploy.sh
@@ -1,4 +1,4 @@
-cvs update -d;
+cvs -q update -d;
 
 . ant zip;
 
@@ -7,3 +7,5 @@ echo $version;
 
 rm /var/www/html/gr-staging/*
 cp gallery_remote.zip /var/www/html/gr-staging/gallery_remote_$version.zip
+
+lynx -dump -head http://jpmullan.com/galleryupdates/remote/gallery_remote_$version.zip | grep "HTTP/1.1 404" && scp gallery_remote.zip paour@jpmullan.com:remote/gallery_remote_$version.zip && . ant post