[Rescue-svn] SF.net SVN: rescue:[30] Rescue
Status: Beta
Brought to you by:
yuranet
Menu
▾
▴
[Rescue-svn] SF.net SVN: rescue:[30] Rescue
|
From: <yu...@us...> - 2013-09-11 21:38:58
|
Revision: 30
http://sourceforge.net/p/rescue/code/30
Author: yuranet
Date: 2013-09-11 21:38:56 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
grasshopper update
Modified Paths:
--------------
Rescue/META-INF/MANIFEST.MF
Rescue/build.xml
Rescue/lib/Grasshopper.jar
Rescue/src/rescue/BrowserLauncher.java
Rescue/src/rescue/gui/RescueGUI.java
Added Paths:
-----------
Rescue/lib/httpcore-4.1.2.jar
Rescue/lib/httpmime-4.1.2.jar
Removed Paths:
-------------
Rescue/src/rescue/SimplePrintStream.java
Modified: Rescue/META-INF/MANIFEST.MF
===================================================================
--- Rescue/META-INF/MANIFEST.MF 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/META-INF/MANIFEST.MF 2013-09-11 21:38:56 UTC (rev 30)
@@ -1,3 +1,4 @@
Manifest-Version: 1.0
Created-By: Yura Mamyrin (yu...@yu...)
Main-Class: rescue.gui.RescueGUI
+Class-Path: lib/Grasshopper.jar
Modified: Rescue/build.xml
===================================================================
--- Rescue/build.xml 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/build.xml 2013-09-11 21:38:56 UTC (rev 30)
@@ -22,6 +22,7 @@
<property name="dir.build.game" location="${dir.build}/game"/>
<property name="dir.help" location="${basedir}/help"/>
<property name="dir.dist" location="dist"/>
+ <property name="dir.libs" location="lib/Grasshopper.jar"/>
<property name="file.src" location="${dir.dist}/src.zip"/>
@@ -58,7 +59,7 @@
<!-- compile the classes -->
<javac debug="on" srcdir="${basedir}/src" destdir="${dir.build.classes}" excludes="rescue/lobby/**"
- source="1.4" target="1.4" />
+ source="1.4" target="1.4" classpath="${dir.libs}" />
<!-- copy images -->
@@ -272,6 +273,10 @@
<copy file="${dir.dist}/Rescue.jar" todir="${dir.build.game}"/>
+ <copy todir="${dir.build.game}/lib">
+ <fileset dir="lib" includes="Grasshopper.jar,httpmime-4.1.2.jar,httpcore-4.1.2.jar"/>
+ </copy>
+
<copy file="${file.src}" todir="${dir.build.game}"/>
<copy todir="${dir.build.game}">
Modified: Rescue/lib/Grasshopper.jar
===================================================================
(Binary files differ)
Added: Rescue/lib/httpcore-4.1.2.jar
===================================================================
(Binary files differ)
Index: Rescue/lib/httpcore-4.1.2.jar
===================================================================
--- Rescue/lib/httpcore-4.1.2.jar 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/lib/httpcore-4.1.2.jar 2013-09-11 21:38:56 UTC (rev 30)
Property changes on: Rescue/lib/httpcore-4.1.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: Rescue/lib/httpmime-4.1.2.jar
===================================================================
(Binary files differ)
Index: Rescue/lib/httpmime-4.1.2.jar
===================================================================
--- Rescue/lib/httpmime-4.1.2.jar 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/lib/httpmime-4.1.2.jar 2013-09-11 21:38:56 UTC (rev 30)
Property changes on: Rescue/lib/httpmime-4.1.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: Rescue/src/rescue/BrowserLauncher.java
===================================================================
--- Rescue/src/rescue/BrowserLauncher.java 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/src/rescue/BrowserLauncher.java 2013-09-11 21:38:56 UTC (rev 30)
@@ -432,7 +432,7 @@
}
}
} catch (IllegalArgumentException iare) {
- browser = browser;
+ browser = null ;
errorMessage = iare.getMessage();
return null;
} catch (IllegalAccessException iae) {
Deleted: Rescue/src/rescue/SimplePrintStream.java
===================================================================
--- Rescue/src/rescue/SimplePrintStream.java 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/src/rescue/SimplePrintStream.java 2013-09-11 21:38:56 UTC (rev 30)
@@ -1,148 +0,0 @@
-package rescue;
-
-import java.io.*;
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-
-public class SimplePrintStream {
-
- public static PrintStream getSimplePrintStream(final StringWriter a) {
-
- return new PrintStream(new OutputStream() {
-
- private ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256);
- private StringWriter sw = null;
-
- { sw = a; }
-
- public void write(int b) {
-
- outputStream.write(b);
- }
-
- public void flush() throws IOException {
-
- super.flush();
-
- sw.write( outputStream.toString() );
-
- outputStream.reset();
-
- }
-
- }, true);
-
- }
-
- private static JFrame errFrame;
- private static JTextArea debugText;
-
- public static void catchErrors() {
-
-
- PrintStream ps = SimplePrintStream.getSimplePrintStream(
-
- new StringWriter() {
- public void write(String x) {
-
- // only create all this stuff if an error has happened
- if (errFrame==null) {
-
- debugText = new JTextArea();
-
- errFrame = new JFrame("an error has occurred!!!");
-
- errFrame.setDefaultCloseOperation( JFrame.DO_NOTHING_ON_CLOSE );
-
- debugText.setEditable(false);
-
- JScrollPane errScroll = new JScrollPane(debugText);
-
- Dimension size = new Dimension(400,400);
-
- errScroll.setMaximumSize(size);
- errScroll.setPreferredSize(size);
- errScroll.setMinimumSize(size);
-
- JLabel label = new JLabel(" please copy and paste this log into an e-mail and send it to yu...@yu...");
- label.setBorder( BorderFactory.createMatteBorder(10,10,10,10,Color.RED) );
-
- JButton saveErr = new JButton("save error log to file");
-
- saveErr.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent a) {
-
-
-
-
- JFileChooser fc = new JFileChooser();
- //RiskFileFilter filter = new RiskFileFilter(RiskFileFilter.RISK_LOG_FILES);
- //fc.setFileFilter(filter);
-
- int returnVal = fc.showSaveDialog(errFrame);
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- java.io.File file = fc.getSelectedFile();
- // Write your code here what to do with selected file
-
- String fileName = file.getAbsolutePath();
-
- //if (!(fileName.endsWith( "." + RiskFileFilter.RISK_LOG_FILES ))) {
- // fileName = fileName + "." + RiskFileFilter.RISK_LOG_FILES;
- //}
-
- try {
-
- FileWriter fileout = new FileWriter(fileName);
- BufferedWriter buffer = new BufferedWriter(fileout);
- PrintWriter printer = new PrintWriter(buffer);
-
- printer.write(debugText.getText());
-
- printer.close();
-
- }
-
- catch(Exception error) {
- JOptionPane.showMessageDialog(errFrame, "unable to save file: " + error.getMessage(), "save error", JOptionPane.ERROR_MESSAGE);
- }
-
- }
-
-
-
-
-
- }
- }
- );
-
- errFrame.getContentPane().add( label , BorderLayout.NORTH );
- errFrame.getContentPane().add( errScroll , BorderLayout.CENTER);
- errFrame.getContentPane().add( saveErr , BorderLayout.SOUTH);
-
- errFrame.pack();
-
- String n = System.getProperty("line.separator");
-
- debugText.append("Date: "+new java.util.Date().toString()+n+n+n);
-
- errFrame.setVisible(true);
-
- }
-
- debugText.append(x);
-
- }
- }
-
- );
-
- // catch everything in my PrintStream
- //System.setOut(ps);
- System.setErr(ps);
-
- }
-
-}
Modified: Rescue/src/rescue/gui/RescueGUI.java
===================================================================
--- Rescue/src/rescue/gui/RescueGUI.java 2012-12-19 15:35:53 UTC (rev 29)
+++ Rescue/src/rescue/gui/RescueGUI.java 2013-09-11 21:38:56 UTC (rev 30)
@@ -59,6 +59,7 @@
import java.awt.Window;
import java.awt.Container;
import java.awt.Frame;
+import net.yura.grasshopper.PopupBug;
/**
* <p> Rescue GUI </p>
@@ -932,7 +933,7 @@
*/
public static void main(String[] argv) {
- SimplePrintStream.catchErrors();
+ PopupBug.initSimple(RunRescue.NAME, RunRescue.VERSION, "");
SplashScreen ss = new SplashScreen();
ss.setVisible(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|