[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.7,1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13065/src/jake2/qcommon

Modified Files:
	Q2DataDialog.java 
Log Message:
download mirror selection

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Q2DataDialog.java	22 Sep 2004 19:22:09 -0000	1.7
--- Q2DataDialog.java	25 Sep 2004 15:17:45 -0000	1.8
***************
*** 8,11 ****
--- 8,13 ----

  import java.awt.*;
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
  import java.io.*;
  import java.net.URL;
***************
*** 15,18 ****
--- 17,21 ----
  import java.util.zip.ZipFile;

+ import javax.imageio.ImageIO;
  import javax.swing.*;

***************
*** 152,155 ****
--- 155,159 ----
  		getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);

+ 		progressPanel = new ProgressPanel(this);
  		installPanel = new InstallPanel(this);

***************
*** 159,170 ****

      private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed
- 		dir = jTextField1.getText();
  		showInstallPanel();
- 		installPanel.destDir = dir;
- 		
- 		dir += "/baseq2";
- 		jTextField1.setText(dir);
- 		
- 		new Thread(installPanel).start();
      }//GEN-LAST:event_installButtonActionPerformed

--- 163,167 ----
***************
*** 176,182 ****
      private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed

!     	dir = jTextField1.getText();
!     	Cvar.Set("cddir", dir);
!     	FS.setCDDir();

      	synchronized(this) {
--- 173,180 ----
      private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed

!     	if (dir != null) {
!     		Cvar.Set("cddir", dir);
!     		FS.setCDDir();
!     	}

      	synchronized(this) {
***************
*** 196,201 ****
      	try {
  			dir = chooser.getSelectedFile().getCanonicalPath();
! 		} catch (IOException e) {}
! 		jTextField1.setText(dir);

      }//GEN-LAST:event_changeButtonActionPerformed
--- 194,200 ----
      	try {
  			dir = chooser.getSelectedFile().getCanonicalPath();
! 		} catch (Exception e) {}
! 		if (dir != null) jTextField1.setText(dir);
! 		else dir = jTextField1.getText();

      }//GEN-LAST:event_changeButtonActionPerformed
***************
*** 213,216 ****
--- 212,216 ----
      private javax.swing.JPanel choosePanel;
      private JPanel statusPanel;
+     private ProgressPanel progressPanel;
      private InstallPanel installPanel;
      private JLabel status;
***************
*** 223,226 ****
--- 223,227 ----
  	void showChooseDialog() {
  		getContentPane().remove(statusPanel);
+ 		getContentPane().remove(progressPanel);
  		getContentPane().remove(installPanel);
  		getContentPane().add(choosePanel, BorderLayout.SOUTH);
***************
*** 231,234 ****
--- 232,236 ----
  	void showStatus() {
  		getContentPane().remove(choosePanel);
+ 		getContentPane().remove(installPanel);
  		getContentPane().add(statusPanel, BorderLayout.SOUTH);
  		validate();
***************
*** 236,241 ****
--- 238,252 ----
  	}

+ 	void showProgressPanel() {
+ 		getContentPane().remove(choosePanel);
+ 		getContentPane().remove(installPanel);
+ 		getContentPane().add(progressPanel, BorderLayout.SOUTH);
+ 		validate();
+ 		repaint();
+ 	}
+ 	
  	void showInstallPanel() {
  		getContentPane().remove(choosePanel);
+ 		getContentPane().remove(statusPanel);
  		getContentPane().add(installPanel, BorderLayout.SOUTH);
  		validate();
***************
*** 265,274 ****
  		Jake2Canvas() {
  			setSize(400, 200);
! 			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/splash.png"));
! 			while (!Toolkit.getDefaultToolkit().prepareImage(image, -1, -1, null)) {
! 				try {
! 					Thread.sleep(50);
! 				} catch (InterruptedException e) {}
! 			} 
  		}

--- 276,283 ----
  		Jake2Canvas() {
  			setSize(400, 200);
! 			try {
! 				image = ImageIO.read(getClass().getResource("/splash.png"));
! 			} catch (Exception e) {}
! 
  		}

***************
*** 283,295 ****
  	}

! 	static class InstallPanel extends JPanel implements Runnable {

- 		static final String[] locs = { 
- 			"ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake2/q2-314-demo-x86.exe",
- 			"ftp://ftp.demon.co.uk/pub/mirrors/idsoftware/quake2/q2-314-demo-x86.exe",
- 			"ftp://ftp.fragzone.se/pub/spel/quake2/q2-314-demo-x86.exe",
- 			"ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe"  };
  		static byte[] buf = new byte[8192];
  		String destDir;

  		JProgressBar progress = new JProgressBar();
--- 292,442 ----
  	}

! 	static class InstallPanel extends JPanel {
! 		
! 		private static final String[][] mirrors = {
! 		{"LOC gate", "ftp://gate/q2-314-demo-x86.exe"}, // local test @home
! 		{"DE ftp.fu-berlin.de", "ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake2/q2-314-demo-x86.exe"},
! 		{"UK ftp.demon.co.uk", "ftp://ftp.demon.co.uk/pub/mirrors/idsoftware/quake2/q2-314-demo-x86.exe"},
! 		{"SE ftp.fragzone.se", "ftp://ftp.fragzone.se/pub/spel/quake2/q2-314-demo-x86.exe"},
! 		{"US ftp.idsoftware.com", "ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe"}  };		
! 		private Q2DataDialog parent;
! 		private JComboBox mirrorBox;
! 		private JTextField destDir;
! 		private JButton cancel;
! 		private JButton exit;
! 		private JButton install;
! 		private JButton choose;
! 		
! 		public InstallPanel(Q2DataDialog d) {
! 			initComponents();
! 			initMirrors();
! 			parent = d;
! 		}
! 		
! 		private void initComponents() {
! 			GridBagConstraints constraints = new GridBagConstraints();
! 			setLayout(new GridBagLayout());
! 			Dimension d = new Dimension(400, 100);
! 			setMinimumSize(d);
! 			setMaximumSize(d);
! 			setPreferredSize(d);
! 			
! 			constraints.gridx = 0;
! 			constraints.gridy = 0;
! 			constraints.insets = new Insets(5, 5, 0, 5);
! 			constraints.anchor = GridBagConstraints.SOUTHWEST;
! 			add(new JLabel("download mirror"), constraints);
! 			
! 			constraints.gridx = 0;
! 			constraints.gridy = 1;
! 			constraints.insets = new Insets(5, 5, 5, 5);
! 			add(new JLabel("destination directory"), constraints);
! 			
! 			constraints.gridx = 1;
! 			constraints.gridy = 0;
! 			constraints.weightx = 1;
! 			constraints.gridwidth = 3;
! 			constraints.insets = new Insets(5, 5, 0, 5);
! 			constraints.fill = GridBagConstraints.HORIZONTAL;
! 			mirrorBox = new JComboBox();
! 			add(mirrorBox, constraints);
! 			
! 			constraints.gridx = 1;
! 			constraints.gridy = 1;
! 			constraints.gridwidth = 2;
! 			constraints.fill = GridBagConstraints.BOTH;
! 			constraints.insets = new Insets(5, 5, 5, 5);
! 			destDir = new JTextField();
! 			add(destDir, constraints);
! 			
! 			constraints.gridx = 3;
! 			constraints.gridy = 1;
! 			constraints.weightx = 0;
! 			constraints.gridwidth = 1;
! 			constraints.fill = GridBagConstraints.NONE;
! 			choose = new JButton("...");
! 			choose.addActionListener(new ActionListener() {
! 				public void actionPerformed(ActionEvent e) {
! 					choose();
! 				}});
! 			add(choose, constraints);
! 			
! 			constraints.gridx = 0;
! 			constraints.gridy = 2;
! 			constraints.gridwidth = 1;
! 			constraints.weighty = 1;
! 			constraints.fill = GridBagConstraints.NONE;
! 			cancel = new JButton("Cancel");
! 			cancel.addActionListener(new ActionListener() {
! 			public void actionPerformed(ActionEvent e) {
! 				cancel();
! 			}});
! 			add(cancel, constraints);
! 			
! 			constraints.gridx = 0;
! 			constraints.gridy = 2;
! 			constraints.gridwidth = 4;
! 			constraints.anchor = GridBagConstraints.SOUTH;
! 			exit = new JButton("Exit");
! 			exit.addActionListener(new ActionListener() {
! 			public void actionPerformed(ActionEvent e) {
! 				exit();
! 			}});
! 			add(exit, constraints);						
! 
! 			constraints.gridx = 2;
! 			constraints.gridy = 2;
! 			constraints.gridwidth = 2;
! 			constraints.anchor = GridBagConstraints.SOUTHEAST;
! 			install = new JButton("Install");
! 			install.addActionListener(new ActionListener() {
! 			public void actionPerformed(ActionEvent e) {
! 				install();
! 			}});
! 			add(install, constraints);			
! 		}
! 		
! 		private void initMirrors() {
! 			for (int i = 0; i < mirrors.length; i++) {
! 				mirrorBox.addItem(mirrors[i][0]);
! 			}
! 		}
! 		
! 		private void cancel() {
! 			parent.showChooseDialog();
! 		}
! 		
! 		private void install() {
! 			parent.progressPanel.destDir = destDir.getText();
! 			parent.progressPanel.mirror = mirrors[mirrorBox.getSelectedIndex()][1];
! 			parent.showProgressPanel();
! 			new Thread(parent.progressPanel).start();
! 		}
! 		
! 		private void exit() {
! 			System.exit(0);
! 		}
! 		
! 		private void choose() {
! 			JFileChooser chooser = new JFileChooser();
! 			chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
! 			chooser.setDialogType(JFileChooser.CUSTOM_DIALOG);
! 			chooser.setMultiSelectionEnabled(false);
! 			chooser.setDialogTitle("choose destination directory");
! 			chooser.showDialog(this, "OK");
!     	
! 			String dir = null;
! 			try {
! 				dir = chooser.getSelectedFile().getCanonicalPath();
! 			} catch (IOException e) {}
! 			destDir.setText(dir);			
! 		}
! 	}
! 	
! 	static class ProgressPanel extends JPanel implements Runnable {

  		static byte[] buf = new byte[8192];
  		String destDir;
+ 		String mirror;

  		JProgressBar progress = new JProgressBar();
***************
*** 297,301 ****
  		Q2DataDialog parent;

! 		public InstallPanel(Q2DataDialog d) {
  			initComponents();
  			parent = d;
--- 444,448 ----
  		Q2DataDialog parent;

! 		public ProgressPanel(Q2DataDialog d) {
  			initComponents();
  			parent = d;
***************
*** 341,370 ****
  			catch (Exception e) {}
  			try {
! 				if (!dir.isDirectory() || !dir.canWrite()) return;
  			}
  			catch (Exception e) {
  				return;
  			}

! 			for (int i = 0; i < locs.length; i++) {
! 				try {
! 					URL url = new URL(locs[i]);
! 					URLConnection conn = url.openConnection();
! 					int length = conn.getContentLength();
! 					progress.setMaximum(length / 1024);

! 					in = conn.getInputStream();

! 					outFile = File.createTempFile("Jake2Data", ".zip");
! 					outFile.deleteOnExit();
! 					out = new FileOutputStream(outFile);

! 					copyStream(in, out);
! 					break;
  				} catch (Exception e) {}
  			}
  			try {
  				installData(outFile.getCanonicalPath());
! 			} catch (Exception e) {}

--- 488,532 ----
  			catch (Exception e) {}
  			try {
! 				if (!dir.isDirectory() || !dir.canWrite()) {
! 					endInstall();
! 					return;
! 				} 
  			}
  			catch (Exception e) {
+ 				endInstall();
  				return;
  			}

! 			try {
! 				URL url = new URL(mirror);
! 				URLConnection conn = url.openConnection();
! 				int length = conn.getContentLength();
! 				progress.setMaximum(length / 1024);

! 				in = conn.getInputStream();

! 				outFile = File.createTempFile("Jake2Data", ".zip");
! 				outFile.deleteOnExit();
! 				out = new FileOutputStream(outFile);

! 				copyStream(in, out);
! 			} catch (Exception e) {
! 				endInstall();
! 				return;
! 			} finally {
! 				try {
! 					in.close();
  				} catch (Exception e) {}
+ 				try {
+ 					out.close();
+ 				} catch (Exception e) {}		
  			}
+ 			
  			try {
  				installData(outFile.getCanonicalPath());
! 			} catch (Exception e) {
! 				endInstall();
! 				return;
! 			}

***************
*** 373,376 ****
--- 535,539 ----
  			} catch (Exception e) {}

+ 			parent.dir = destDir + "/baseq2";
  			parent.showChooseDialog();
  			parent.okButtonActionPerformed(null);
***************
*** 378,382 ****

! 		void installData(String filename) {
  			try {
  				ZipFile f = new ZipFile(filename);
--- 541,547 ----

! 		void installData(String filename) throws Exception {
! 			InputStream in = null;
! 			OutputStream out = null;
  			try {
  				ZipFile f = new ZipFile(filename);
***************
*** 396,409 ****
  							progress.setValue(0); 
  							outFile.getParentFile().mkdirs();
! 							OutputStream out = new FileOutputStream(outFile);
! 							InputStream in = f.getInputStream(entry);
  							copyStream(in, out);
  						}
  					}
  				}
! 			} catch (Exception e) {}
  		}

! 		void copyStream(InputStream in, OutputStream out) {
  			try {
  				int c = 0;
--- 561,585 ----
  							progress.setValue(0); 
  							outFile.getParentFile().mkdirs();
! 							out = new FileOutputStream(outFile);
! 							in = f.getInputStream(entry);
  							copyStream(in, out);
  						}
  					}
  				}
! 			} catch (Exception e) {
! 				throw new Exception();
! 			} finally {
! 				try {in.close();} catch (Exception e1) {}
! 				try {out.close();} catch (Exception e1) {}				
! 			}
  		}

! 		void endInstall() {
! 			parent.dir = destDir + "/baseq2";
! 			parent.showChooseDialog();
! 			parent.okButtonActionPerformed(null);			
! 		}
! 		
! 		void copyStream(InputStream in, OutputStream out) throws Exception {
  			try {
  				int c = 0;
***************
*** 414,427 ****
  					progress.setValue(c / 1024);
  				}
! 			} catch (Exception e) {}
! 			
! 			try {
! 				in.close();
! 			} catch (Exception e) {}
! 			try {
! 				out.close();
! 			} catch (Exception e) {}			
  		}
  	}
! 	
  }
--- 590,605 ----
  					progress.setValue(c / 1024);
  				}
! 			} catch (Exception e) {
! 				throw new Exception();
! 			} finally {
! 				try {
! 					in.close();
! 				} catch (Exception e) {}
! 				try {
! 					out.close();
! 				} catch (Exception e) {}
! 			}			
  		}
  	}
! 
  }