Menu
▾
▴
cishell-svn
|
From: <bh...@us...> - 2006-10-19 17:47:20
|
Revision: 302
http://svn.sourceforge.net/cishell/?rev=302&view=rev
Author: bh2
Date: 2006-10-19 10:47:11 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
fixed File/View to work on Linux correctly
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2006-10-19 17:46:36 UTC (rev 301)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2006-10-19 17:47:11 UTC (rev 302)
@@ -7,20 +7,18 @@
import java.nio.channels.FileChannel;
import java.util.Dictionary;
-import org.osgi.service.log.LogService;
-
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.IWorkbenchWindow;
-
import org.cishell.framework.CIShellContext;
import org.cishell.framework.algorithm.Algorithm;
import org.cishell.framework.data.Data;
+import org.cishell.service.conversion.Converter;
import org.cishell.service.conversion.DataConversionService;
import org.cishell.service.guibuilder.GUIBuilderService;
-import org.cishell.service.conversion.Converter;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.osgi.service.log.LogService;
/*
* @author Weixia(Bonnie) Huang (hu...@in...)
@@ -32,8 +30,9 @@
DataConversionService conversionManager;
static GUIBuilderService guiBuilder;
LogService logger;
+ Program program;
+ File tempFile;
-
public FileView(Data[] data, Dictionary parameters, CIShellContext context) {
this.data = data;
this.parameters = parameters;
@@ -67,12 +66,11 @@
public Data[] execute() {
boolean lastSaveSuccessful = false;
String format;
- File tempFile;
+
Display display;
IWorkbenchWindow[] windows;
final Shell parentShell;
-
windows = PlatformUI.getWorkbench().getWorkbenchWindows();
if (windows.length == 0){
return null;
@@ -107,19 +105,26 @@
}
}
}
- //display the file content
- Program program = Program.findProgram("txt");
+
+
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ program = Program.findProgram("txt");
+ }});
+
if (program == null) {
guiBuilder.showError("No Text Viewer",
"No valid text viewer for the .txt file. " +
"The file is located at: "+tempFile.getAbsolutePath(),
"Unable to open default text viewer. File is located at: "+
tempFile.getAbsolutePath());
- return null;
}
else {
if (lastSaveSuccessful == true) {
- program.execute(tempFile.getAbsolutePath());
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ program.execute(tempFile.getAbsolutePath());
+ }});
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-12-07 20:32:37
|
Revision: 346
http://svn.sourceforge.net/cishell/?rev=346&view=rev
Author: huangb
Date: 2006-12-07 12:32:26 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
If the selected data is an in-memory JAVA object, some times, only one
converter can save the data to a file. In this case, the length of the
converters equals to 1. So the application should use this converter to
save the data to a temporary file directly and then bring the text editor.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2006-12-07 16:45:38 UTC (rev 345)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2006-12-07 20:32:26 UTC (rev 346)
@@ -96,8 +96,15 @@
data[i].getData().getClass().getName(),
"Please install a plugin that will save the data type to a file");
}
+ else if (converters.length == 1){
+ //If length=1, use the unique path to save it directly
+ //and bring the text editor.
+ Data newData = converters[0].convert(data[i]);
+ copy((File)newData.getData(), tempFile);
+ lastSaveSuccessful = true;
+ }
else {
- if (!parentShell.isDisposed()) {
+ if (!parentShell.isDisposed()) {
DataViewer dataViewer = new DataViewer(parentShell, data[i], converters);
display.syncExec(dataViewer);
lastSaveSuccessful = dataViewer.isSaved;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zh...@us...> - 2008-02-26 19:52:40
|
Revision: 639
http://cishell.svn.sourceforge.net/cishell/?rev=639&view=rev
Author: zhang45
Date: 2008-02-26 11:51:53 -0800 (Tue, 26 Feb 2008)
Log Message:
-----------
improvement for viewing csv,
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2008-02-26 16:58:55 UTC (rev 638)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2008-02-26 19:51:53 UTC (rev 639)
@@ -123,39 +123,55 @@
}else{
- final Converter[] converters = conversionManager.findConverters(data[i], "file-ext:*");
+ final Converter[] convertersCSV = conversionManager.findConverters(data[i], "file-ext:csv");
+ //logger.log(LogService.LOG_ERROR, "convertersCSV's length = " + convertersCSV.length);
+ if (convertersCSV.length == 1)
+ {
+ Data newDataCSV = convertersCSV[0].convert(data[i]);
+ tempFile = getTempFileCSV();
+ isCSVFile = true;
+ copy((File)newDataCSV.getData(), tempFile);
+ lastSaveSuccessful = true;
+
+ }
+ else if (convertersCSV.length > 1)
+ {
+ Data newDataCSV = convertersCSV[0].convert(data[i]);
+ for (int j = 1; j < convertersCSV.length; j++ )
+ {
+ newDataCSV = convertersCSV[j].convert(newDataCSV);
+ }
+ tempFile = getTempFileCSV();
+ isCSVFile = true;
+ copy((File)newDataCSV.getData(), tempFile);
+ lastSaveSuccessful = true;
+ }
+ else{
+ final Converter[] converters = conversionManager.findConverters(data[i], "file-ext:*");
- if (converters.length < 1) {
- guiBuilder.showError("No Converters",
- "No valid converters for data type: " +
- data[i].getData().getClass().getName(),
- "Please install a plugin that will save the data type to a file");
- }
- else if (converters.length == 1){
- //If length=1, use the unique path to save it directly
- //and bring the text editor.
- Data newData = converters[0].convert(data[i]);
- if (format.startsWith("prefuse.data.Table"))
- {
- tempFile = getTempFileCSV();
- isCSVFile = true;
+ if (converters.length < 1) {
+ guiBuilder.showError("No Converters",
+ "No valid converters for data type: " +
+ data[i].getData().getClass().getName(),
+ "Please install a plugin that will save the data type to a file");
+ }
+ else if (converters.length == 1){
+ //If length=1, use the unique path to save it directly
+ //and bring the text editor.
+ Data newData = converters[0].convert(data[i]);
+ tempFile = getTempFile();
+ copy((File)newData.getData(), tempFile);
+ lastSaveSuccessful = true;
+ }
+ else {
+ if (!parentShell.isDisposed()) {
+ DataViewer dataViewer = new DataViewer(parentShell, data[i], converters);
+ display.syncExec(dataViewer);
+ lastSaveSuccessful = dataViewer.isSaved;
+ tempFile = dataViewer.theFile;
+ }
}
- else
- {
- tempFile = getTempFile();
-
- }
- copy((File)newData.getData(), tempFile);
- lastSaveSuccessful = true;
- }
- else {
- if (!parentShell.isDisposed()) {
- DataViewer dataViewer = new DataViewer(parentShell, data[i], converters);
- display.syncExec(dataViewer);
- lastSaveSuccessful = dataViewer.isSaved;
- tempFile = dataViewer.theFile;
- }
- }
+ }
}
if (isCSVFile){//TC181
Display.getDefault().syncExec(new Runnable() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X