Revision: 19296
http://sourceforge.net/p/gate/code/19296
Author: markagreenwood
Date: 2016-05-11 08:54:49 +0000 (Wed, 11 May 2016)
Log Message:
-----------
pulling in changes from trunk
Modified Paths:
--------------
gate/branches/sawdust2/src/main/gate/gui/DocumentExportMenu.java
gate/branches/sawdust2/src/main/gate/gui/MainFrame.java
Property Changed:
----------------
gate/branches/sawdust2/src/main/gate/gui/
Index: gate/branches/sawdust2/src/main/gate/gui
===================================================================
--- gate/branches/sawdust2/src/main/gate/gui 2016-05-11 08:53:27 UTC (rev
19295)
+++ gate/branches/sawdust2/src/main/gate/gui 2016-05-11 08:54:49 UTC (rev
19296)
Property changes on: gate/branches/sawdust2/src/main/gate/gui
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,7 ##
+/gate/branches/cl-experiment/src/main/gate/gui:15466-15613
+/gate/branches/new-ontology-api/src/main/gate/gui:10584-11598
+/gate/branches/release-7.0/src/main/gate/gui:15335-15398
+/gate/branches/release-8.1/src/main/gate/gui:18736-18747
+/gate/branches/sawdust/src/main/gate/gui:17055-17079
+/gate/tags/release-7.0/src/main/gate/gui:15399-15407
+/gate/trunk/src/main/gate/gui:3-7,19180-19295
\ No newline at end of property
Modified: gate/branches/sawdust2/src/main/gate/gui/DocumentExportMenu.java
===================================================================
--- gate/branches/sawdust2/src/main/gate/gui/DocumentExportMenu.java
2016-05-11 08:53:27 UTC (rev 19295)
+++ gate/branches/sawdust2/src/main/gate/gui/DocumentExportMenu.java
2016-05-11 08:54:49 UTC (rev 19296)
@@ -23,6 +23,7 @@
import gate.Resource;
import gate.corpora.export.GateXMLExporter;
import gate.creole.Parameter;
+import gate.creole.ParameterException;
import gate.creole.ResourceData;
import gate.event.CreoleEvent;
import gate.event.CreoleListener;
@@ -514,6 +515,8 @@
private ResourceParametersEditor parametersEditor;
private boolean singleFile, userCanceled;
+
+ private FeatureMap parameters;
public DocumentExportDialog() {
super(MainFrame.getInstance(), "Save As...", true);
@@ -643,8 +646,11 @@
public synchronized boolean show(DocumentExporter de,
List<List<Parameter>> params, boolean singleFile, String filePath)
{
+
+
this.singleFile = singleFile;
this.de = de;
+ this.parameters = null;
setTitle("Save as " + de.getFileType());
@@ -659,7 +665,30 @@
dispose();
if(userCanceled)
return false;
- else return true;
+
+ //update the feature map to convert values to objects of the correct
type.
+
+ parameters = parametersEditor.getParameterValues();
+
+ for (List<Parameter> disjunction : params) {
+ for (Parameter param : disjunction) {
+ if (!param.getTypeName().equals("java.lang.String") &&
parameters.containsKey(param.getName())) {
+ Object value = parameters.get(param.getName());
+ if (value instanceof String) {
+ try {
+ parameters.put(param.getName(),
param.calculateValueFromString((String)value));
+ }
+ catch (ParameterException pe) {
+ pe.printStackTrace();
+ parameters = null;
+ return false;
+ }
+ }
+ }
+ }
+ }
+
+ return true;
}
@Override
@@ -672,9 +701,7 @@
* selected or the user pressed cancel
*/
public FeatureMap getSelectedParameters() {
- if(parametersEditor != null)
- return parametersEditor.getParameterValues();
- else return null;
+ return parameters;
}
/**
Modified: gate/branches/sawdust2/src/main/gate/gui/MainFrame.java
===================================================================
--- gate/branches/sawdust2/src/main/gate/gui/MainFrame.java 2016-05-11
08:53:27 UTC (rev 19295)
+++ gate/branches/sawdust2/src/main/gate/gui/MainFrame.java 2016-05-11
08:54:49 UTC (rev 19296)
@@ -15,62 +15,6 @@
package gate.gui;
-import gate.Controller;
-import gate.CreoleRegister;
-import gate.DataStore;
-import gate.DataStoreRegister;
-import gate.Document;
-import gate.Executable;
-import gate.Factory;
-import gate.Gate;
-import gate.GateConstants;
-import gate.LanguageResource;
-import gate.Main;
-import gate.Plugin;
-import gate.ProcessingResource;
-import gate.Resource;
-import gate.VisualResource;
-import gate.creole.ANNIEConstants;
-import gate.creole.ConditionalSerialAnalyserController;
-import gate.creole.PackagedController;
-import gate.creole.ResourceData;
-import gate.creole.ResourceInstantiationException;
-import gate.creole.annic.Constants;
-import gate.event.CreoleEvent;
-import gate.event.CreoleListener;
-import gate.event.PluginListener;
-import gate.event.ProgressListener;
-import gate.event.StatusListener;
-import gate.gui.creole.manager.PluginUpdateManager;
-import gate.persist.PersistenceException;
-import gate.resources.img.svg.AvailableIcon;
-import gate.resources.img.svg.GATEIcon;
-import gate.resources.img.svg.GATEVersionIcon;
-import gate.resources.img.svg.MavenIcon;
-import gate.resources.img.svg.ReadyMadeIcon;
-import gate.swing.JMenuButton;
-import gate.swing.SpringUtilities;
-import gate.swing.XJFileChooser;
-import gate.swing.XJMenu;
-import gate.swing.XJMenuItem;
-import gate.swing.XJPopupMenu;
-import gate.swing.XJTabbedPane;
-import gate.util.Benchmark;
-import gate.util.CorpusBenchmarkTool;
-import gate.util.ExtensionFileFilter;
-import gate.util.Files;
-import gate.util.GateClassLoader;
-import gate.util.GateException;
-import gate.util.GateRuntimeException;
-import gate.util.LuckyException;
-import gate.util.NameBearer;
-import gate.util.OptionsMap;
-import gate.util.Out;
-import gate.util.persistence.PersistenceManager;
-import gate.util.reporting.DocTimeReporter;
-import gate.util.reporting.PRTimeReporter;
-import gate.util.reporting.exceptions.BenchmarkReportException;
-
import java.awt.AWTEvent;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -200,6 +144,62 @@
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
+import gate.Controller;
+import gate.CreoleRegister;
+import gate.DataStore;
+import gate.DataStoreRegister;
+import gate.Document;
+import gate.Executable;
+import gate.Factory;
+import gate.Gate;
+import gate.GateConstants;
+import gate.LanguageResource;
+import gate.Main;
+import gate.Plugin;
+import gate.ProcessingResource;
+import gate.Resource;
+import gate.VisualResource;
+import gate.creole.ANNIEConstants;
+import gate.creole.ConditionalSerialAnalyserController;
+import gate.creole.PackagedController;
+import gate.creole.ResourceData;
+import gate.creole.ResourceInstantiationException;
+import gate.creole.annic.Constants;
+import gate.event.CreoleEvent;
+import gate.event.CreoleListener;
+import gate.event.PluginListener;
+import gate.event.ProgressListener;
+import gate.event.StatusListener;
+import gate.gui.creole.manager.PluginUpdateManager;
+import gate.persist.PersistenceException;
+import gate.resources.img.svg.AvailableIcon;
+import gate.resources.img.svg.GATEIcon;
+import gate.resources.img.svg.GATEVersionIcon;
+import gate.resources.img.svg.MavenIcon;
+import gate.resources.img.svg.ReadyMadeIcon;
+import gate.swing.JMenuButton;
+import gate.swing.SpringUtilities;
+import gate.swing.XJFileChooser;
+import gate.swing.XJMenu;
+import gate.swing.XJMenuItem;
+import gate.swing.XJPopupMenu;
+import gate.swing.XJTabbedPane;
+import gate.util.Benchmark;
+import gate.util.CorpusBenchmarkTool;
+import gate.util.ExtensionFileFilter;
+import gate.util.Files;
+import gate.util.GateClassLoader;
+import gate.util.GateException;
+import gate.util.GateRuntimeException;
+import gate.util.LuckyException;
+import gate.util.NameBearer;
+import gate.util.OptionsMap;
+import gate.util.Out;
+import gate.util.persistence.PersistenceManager;
+import gate.util.reporting.DocTimeReporter;
+import gate.util.reporting.PRTimeReporter;
+import gate.util.reporting.exceptions.BenchmarkReportException;
+
/**
* The main Gate GUI frame.
*/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
