mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
dedicated to DennisBergkamp
i tried to create a small workaround for the problem, but because i don't get the same error as you, could you try it, please?
This commit is contained in:
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -198,6 +198,7 @@ src/forge/Time.java svneol=native#text/plain
|
|||||||
src/forge/UndoCommand.java svneol=native#text/plain
|
src/forge/UndoCommand.java svneol=native#text/plain
|
||||||
src/forge/Wait.java svneol=native#text/plain
|
src/forge/Wait.java svneol=native#text/plain
|
||||||
src/forge/WinLose.java svneol=native#text/plain
|
src/forge/WinLose.java svneol=native#text/plain
|
||||||
|
src/forge/_ObjectInputStream.java svneol=native#text/plain
|
||||||
src/forge/error/ErrorViewer.java svneol=native#text/plain
|
src/forge/error/ErrorViewer.java svneol=native#text/plain
|
||||||
src/forge/error/ExceptionHandler.java -text svneol=native#text/plain
|
src/forge/error/ExceptionHandler.java -text svneol=native#text/plain
|
||||||
src/forge/gui/ForgeAction.java svneol=native#text/plain
|
src/forge/gui/ForgeAction.java svneol=native#text/plain
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
|
|
||||||
package forge;
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
@@ -168,7 +166,7 @@ public class DeckIO {
|
|||||||
//~
|
//~
|
||||||
if(!file.exists()) return;
|
if(!file.exists()) return;
|
||||||
|
|
||||||
ObjectInputStream in = new ObjectInputStream(new FileInputStream(file));
|
ObjectInputStream in = new _ObjectInputStream(new FileInputStream(file));
|
||||||
|
|
||||||
deckList = (ArrayList<Deck>) in.readObject();
|
deckList = (ArrayList<Deck>) in.readObject();
|
||||||
boosterMap = (Map<String, Deck[]>) in.readObject();
|
boosterMap = (Map<String, Deck[]>) in.readObject();
|
||||||
@@ -183,9 +181,9 @@ public class DeckIO {
|
|||||||
private void writeFile() {
|
private void writeFile() {
|
||||||
try {
|
try {
|
||||||
//~
|
//~
|
||||||
if(file == null) {
|
if(file == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//~
|
//~
|
||||||
if(!file.exists()) file.createNewFile();
|
if(!file.exists()) file.createNewFile();
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
|
|
||||||
package forge;
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ActionListener;
|
import java.awt.event.ActionListener;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -23,20 +26,20 @@ import forge.error.ErrorViewer;
|
|||||||
import forge.properties.ForgeProps;
|
import forge.properties.ForgeProps;
|
||||||
import forge.properties.NewConstants;
|
import forge.properties.NewConstants;
|
||||||
|
|
||||||
interface DeckDisplay
|
|
||||||
{
|
|
||||||
public void updateDisplay(CardList top, CardList bottom);
|
|
||||||
|
|
||||||
//top shows available card pool
|
interface DeckDisplay {
|
||||||
//if constructed, top shows all cards
|
public void updateDisplay(CardList top, CardList bottom);
|
||||||
//if sealed, top shows 5 booster packs
|
|
||||||
//if draft, top shows cards that were chosen
|
|
||||||
public CardList getTop();
|
|
||||||
|
|
||||||
//bottom shows cards that the user has chosen for his library
|
//top shows available card pool
|
||||||
public CardList getBottom();
|
//if constructed, top shows all cards
|
||||||
|
//if sealed, top shows 5 booster packs
|
||||||
|
//if draft, top shows cards that were chosen
|
||||||
|
public CardList getTop();
|
||||||
|
|
||||||
public void setTitle(String message);
|
//bottom shows cards that the user has chosen for his library
|
||||||
|
public CardList getBottom();
|
||||||
|
|
||||||
|
public void setTitle(String message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
|
public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
|
||||||
@@ -326,7 +329,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
|
|||||||
Object check = null;
|
Object check = null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ObjectInputStream in = new ObjectInputStream(new FileInputStream(file));
|
ObjectInputStream in = new _ObjectInputStream(new FileInputStream(file));
|
||||||
check = in.readObject();
|
check = in.readObject();
|
||||||
|
|
||||||
in.close();
|
in.close();
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
|
|
||||||
package forge;
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ActionListener;
|
import java.awt.event.ActionListener;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -261,7 +264,7 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar {
|
|||||||
Object check = null;
|
Object check = null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ObjectInputStream in = new ObjectInputStream(new FileInputStream(file));
|
ObjectInputStream in = new _ObjectInputStream(new FileInputStream(file));
|
||||||
check = in.readObject();
|
check = in.readObject();
|
||||||
|
|
||||||
in.close();
|
in.close();
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
|
|
||||||
package forge;
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
@@ -36,7 +39,7 @@ public class IO {
|
|||||||
// Map has unchecked cast
|
// Map has unchecked cast
|
||||||
private void readMap() {
|
private void readMap() {
|
||||||
try {
|
try {
|
||||||
ObjectInputStream in = new ObjectInputStream(new FileInputStream(file));
|
ObjectInputStream in = new _ObjectInputStream(new FileInputStream(file));
|
||||||
map = (Map<String, Serializable>) in.readObject();
|
map = (Map<String, Serializable>) in.readObject();
|
||||||
in.close();
|
in.close();
|
||||||
} catch(Exception ex) {
|
} catch(Exception ex) {
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
|
|
||||||
package forge;
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
@@ -63,7 +66,7 @@ public class NewIO {
|
|||||||
|
|
||||||
private ObjectInputStream getReader() {
|
private ObjectInputStream getReader() {
|
||||||
try {
|
try {
|
||||||
return new ObjectInputStream(new FileInputStream(file));
|
return new _ObjectInputStream(new FileInputStream(file));
|
||||||
} catch(IOException ex) {
|
} catch(IOException ex) {
|
||||||
ErrorViewer.showError(ex);
|
ErrorViewer.showError(ex);
|
||||||
throw new RuntimeException("IO : getReader() - error - " + ex);
|
throw new RuntimeException("IO : getReader() - error - " + ex);
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ public class QuestData implements NewConstants {
|
|||||||
static public QuestData loadData() {
|
static public QuestData loadData() {
|
||||||
try {
|
try {
|
||||||
//read file "questData"
|
//read file "questData"
|
||||||
ObjectInputStream in = new ObjectInputStream(new FileInputStream(ForgeProps.getFile(QUEST.DATA)));
|
ObjectInputStream in = new _ObjectInputStream(new FileInputStream(ForgeProps.getFile(QUEST.DATA)));
|
||||||
Object o = in.readObject();
|
Object o = in.readObject();
|
||||||
in.close();
|
in.close();
|
||||||
|
|
||||||
|
|||||||
39
src/forge/_ObjectInputStream.java
Normal file
39
src/forge/_ObjectInputStream.java
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
/**
|
||||||
|
* _ObjectInputStream.java
|
||||||
|
*
|
||||||
|
* Created on 29.10.2009
|
||||||
|
*/
|
||||||
|
|
||||||
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.ObjectInputStream;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The class _ObjectInputStream.
|
||||||
|
*
|
||||||
|
* @version V0.0 29.10.2009
|
||||||
|
* @author Clemens Koza
|
||||||
|
*/
|
||||||
|
public class _ObjectInputStream extends ObjectInputStream {
|
||||||
|
public _ObjectInputStream() throws IOException {
|
||||||
|
super();
|
||||||
|
enableResolveObject(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public _ObjectInputStream(InputStream is) throws IOException {
|
||||||
|
super(is);
|
||||||
|
enableResolveObject(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Object resolveObject(Object obj) throws IOException {
|
||||||
|
Class<?> c = obj.getClass().getComponentType();
|
||||||
|
if(c != null && "Deck".equals(c.getName())) {
|
||||||
|
return new Deck[((Object[]) obj).length];
|
||||||
|
} else return obj;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user