Revision: 19798
http://sourceforge.net/p/gate/code/19798
Author: markagreenwood
Date: 2016-11-25 12:53:48 +0000 (Fri, 25 Nov 2016)
Log Message:
-----------
hack so it copes with missing gate home
Modified Paths:
--------------
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/GateApplication.java
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/GateApplication.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/GateApplication.java
2016-11-25 12:52:38 UTC (rev 19797)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/GateApplication.java
2016-11-25 12:53:48 UTC (rev 19798)
@@ -17,6 +17,7 @@
* itself so that they can be serialized as a single XML object.
*/
public class GateApplication {
- Object urlList;
+ Object workspace;
+ Object urlList;
Object application;
}
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
===================================================================
---
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
2016-11-25 12:52:38 UTC (rev 19797)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java
2016-11-25 12:53:48 UTC (rev 19798)
@@ -14,30 +14,6 @@
*/
package gate.util.persistence;
-import gate.Controller;
-import gate.Corpus;
-import gate.DataStore;
-import gate.Gate;
-import gate.LanguageAnalyser;
-import gate.LanguageResource;
-import gate.Plugin;
-import gate.ProcessingResource;
-import gate.VisualResource;
-import gate.creole.ConditionalController;
-import gate.creole.ConditionalSerialAnalyserController;
-import gate.creole.ResourceInstantiationException;
-import gate.creole.SerialAnalyserController;
-import gate.event.ProgressListener;
-import gate.event.StatusListener;
-import gate.persist.GateAwareObjectInputStream;
-import gate.persist.PersistenceException;
-import gate.util.BomStrippingInputStreamReader;
-import gate.util.Err;
-import gate.util.Files;
-import gate.util.GateException;
-import gate.util.GateRuntimeException;
-import gate.util.NameBearer;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@@ -62,12 +38,10 @@
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -90,6 +64,30 @@
import com.thoughtworks.xstream.io.xml.XStream11NameCoder;
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
+import gate.Controller;
+import gate.Corpus;
+import gate.DataStore;
+import gate.Gate;
+import gate.LanguageAnalyser;
+import gate.LanguageResource;
+import gate.Plugin;
+import gate.ProcessingResource;
+import gate.VisualResource;
+import gate.creole.ConditionalController;
+import gate.creole.ConditionalSerialAnalyserController;
+import gate.creole.ResourceInstantiationException;
+import gate.creole.SerialAnalyserController;
+import gate.event.ProgressListener;
+import gate.event.StatusListener;
+import gate.persist.GateAwareObjectInputStream;
+import gate.persist.PersistenceException;
+import gate.util.BomStrippingInputStreamReader;
+import gate.util.Err;
+import gate.util.Files;
+import gate.util.GateException;
+import gate.util.GateRuntimeException;
+import gate.util.NameBearer;
+
/**
* This class provides utility methods for saving resources through
* serialisation via static methods.
@@ -524,6 +522,7 @@
private File getCanonicalFileIfPossible(File file) {
+ if (file == null) return file;
File tmp = file;
try {
tmp = tmp.getCanonicalFile();
@@ -1033,6 +1032,7 @@
// We need to put the urls and the application itself together
// as xstreams can only hold one object.
GateApplication gateApplication = new GateApplication();
+ //gateApplication.workspace = new File("cache");
gateApplication.urlList = persistentList;
gateApplication.application = persistentObject;
@@ -1091,7 +1091,9 @@
}
private static Boolean currentUseGateHome() {
- return useGateHome.get().getFirst();
+ //return useGateHome.get().getFirst();
+ //TODO remove this functionality as it no longer makes any sense
+ return false;
}
private static BooleanFlag currentHaveWarnedAboutGateHome() {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
