Menu
▾
▴
cishell-svn
|
From: <bh...@us...> - 2006-10-16 19:34:11
|
Revision: 283
http://svn.sourceforge.net/cishell/?rev=283&view=rev
Author: bh2
Date: 2006-10-16 12:34:05 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
Made FileSaver print to the console upon successful load rather than popping up a gui
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-16 19:33:28 UTC (rev 282)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-16 19:34:05 UTC (rev 283)
@@ -19,6 +19,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
/**
* Persist the file to disk for the user
@@ -31,6 +32,7 @@
private Shell parent;
private GUIBuilderService guiBuilder;
+ private LogService log;
/**
@@ -42,6 +44,7 @@
public FileSaver(Shell parent, CIShellContext context){
this.parent = parent;
this.guiBuilder = (GUIBuilderService)context.getService(GUIBuilderService.class.getName());
+ this.log = (LogService) context.getService(LogService.class.getName());
}
/**
@@ -134,9 +137,7 @@
done = true;
- guiBuilder.showInformation("Data Saved",
- "Data successfully saved to disk",
- "Saved: " + selectedFile.getPath());
+ log.log(LogService.LOG_INFO, "Saved: " + selectedFile.getPath());
} else {
done = true;
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-11-27 17:24:48
|
Revision: 340
http://svn.sourceforge.net/cishell/?rev=340&view=rev
Author: bh2
Date: 2006-11-27 09:24:41 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Bug fix for bug: https://nwb.slis.indiana.edu/wiki/?n=Nwbtool.SaveTextFile
Now saving files without a file:*->file-ext:* converter can be saved correctly.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-11-21 22:31:51 UTC (rev 339)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-11-27 17:24:41 UTC (rev 340)
@@ -100,7 +100,11 @@
}
dialog.setFilterPath(currentDir.getPath());
- dialog.setFilterExtensions(new String[]{"*." + ext});
+
+ if (ext != null && !ext.equals("*")) {
+ dialog.setFilterExtensions(new String[]{"*." + ext});
+ }
+
dialog.setText("Choose File");
String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
@@ -119,7 +123,7 @@
if (!isSaveFileValid(selectedFile))
continue;
if (ext != null && ext.length() != 0)
- if (!selectedFile.getPath().endsWith(ext))
+ if (!selectedFile.getPath().endsWith(ext) && !ext.equals("*"))
selectedFile = new File(selectedFile.getPath()+'.'+ ext);
Data newData = converter.convert(data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2007-06-28 21:32:38
|
Revision: 407
http://svn.sourceforge.net/cishell/?rev=407&view=rev
Author: mwlinnem
Date: 2007-06-28 14:32:33 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Changed suggested name for saved files to be more reasonable.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2007-06-27 18:55:18 UTC (rev 406)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2007-06-28 21:32:33 UTC (rev 407)
@@ -108,11 +108,15 @@
dialog.setText("Choose File");
String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
- if (fileLabel == null) {
- dialog.setFileName("*." + ext);
- } else {
- dialog.setFileName(fileLabel + '.' + ext);
- }
+ String suggestedFileName = getFileName(fileLabel);
+ dialog.setFileName(suggestedFileName + "." + ext);
+// String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
+//
+// if (fileLabel == null) {
+// dialog.setFileName("*." + ext);
+// } else {
+// dialog.setFileName(fileLabel + '.' + ext);
+// }
boolean done = false;
@@ -173,4 +177,16 @@
return false;
}
}
+
+ private String getFileName(String fileLabel) {
+ int descriptionEndIndex = fileLabel.lastIndexOf(":");
+ int filePathEndIndex = fileLabel.lastIndexOf(File.separator);
+ int extensionBeginIndex = fileLabel.indexOf(".");
+
+ int startIndex = Math.max(descriptionEndIndex, filePathEndIndex) + 1;
+ int endIndex = Math.min(extensionBeginIndex, fileLabel.length());
+
+ String fileName = fileLabel.substring(startIndex, endIndex);
+ return fileName;
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2007-06-29 20:31:37
|
Revision: 408
http://svn.sourceforge.net/cishell/?rev=408&view=rev
Author: mwlinnem
Date: 2007-06-29 13:31:32 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
Fixed bug with suggested file names when saving.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2007-06-28 21:32:33 UTC (rev 407)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2007-06-29 20:31:32 UTC (rev 408)
@@ -108,10 +108,9 @@
dialog.setText("Choose File");
String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
- String suggestedFileName = getFileName(fileLabel);
+ String suggestedFileName = getFileName(fileLabel);
dialog.setFileName(suggestedFileName + "." + ext);
-// String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
-//
+
// if (fileLabel == null) {
// dialog.setFileName("*." + ext);
// } else {
@@ -179,14 +178,36 @@
}
private String getFileName(String fileLabel) {
+
+ //index variables will be -1 if index is not found.
int descriptionEndIndex = fileLabel.lastIndexOf(":");
int filePathEndIndex = fileLabel.lastIndexOf(File.separator);
- int extensionBeginIndex = fileLabel.indexOf(".");
-
+
+ //doesn't matter if either variable is -1, since startIndex will be
+ //zero and none of the string will be cut off the front.
int startIndex = Math.max(descriptionEndIndex, filePathEndIndex) + 1;
- int endIndex = Math.min(extensionBeginIndex, fileLabel.length());
- String fileName = fileLabel.substring(startIndex, endIndex);
+ String fileNameWithExtension = fileLabel.substring(startIndex);
+
+
+ //find the first character of the file name extension.
+ int extensionBeginIndex = fileNameWithExtension.indexOf(".");
+
+ int endIndex;
+
+ if (extensionBeginIndex != -1) {
+ //we found a period in the file name.
+ endIndex = extensionBeginIndex; //cut off everything after
+ //first period.
+ } else {
+ //we didn't find an extension on the file name.
+ endIndex = fileLabel.length(); // don't cut any off the end.
+ }
+ endIndex = Math.min(extensionBeginIndex, fileLabel.length());
+
+ String fileNameWithoutExtension = fileNameWithExtension.substring(0, endIndex);
+
+ String fileName = fileNameWithoutExtension;
return fileName;
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2007-11-14 17:24:02
|
Revision: 549
http://cishell.svn.sourceforge.net/cishell/?rev=549&view=rev
Author: mwlinnem
Date: 2007-11-14 09:23:59 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Fixed bug for certain file names.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2007-10-16 19:30:41 UTC (rev 548)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2007-11-14 17:23:59 UTC (rev 549)
@@ -203,7 +203,6 @@
//we didn't find an extension on the file name.
endIndex = fileLabel.length(); // don't cut any off the end.
}
- endIndex = Math.min(extensionBeginIndex, fileLabel.length());
String fileNameWithoutExtension = fileNameWithExtension.substring(0, endIndex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-02-07 21:38:49
|
Revision: 619
http://cishell.svn.sourceforge.net/cishell/?rev=619&view=rev
Author: mwlinnem
Date: 2008-02-07 13:38:27 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
Fixed code that crashed the save dialog when saving data with certain labels.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2008-02-07 00:15:28 UTC (rev 618)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2008-02-07 21:38:27 UTC (rev 619)
@@ -191,7 +191,7 @@
//find the first character of the file name extension.
- int extensionBeginIndex = fileNameWithExtension.indexOf(".");
+ int extensionBeginIndex = fileNameWithExtension.lastIndexOf(".");
int endIndex;
@@ -201,7 +201,7 @@
//first period.
} else {
//we didn't find an extension on the file name.
- endIndex = fileLabel.length(); // don't cut any off the end.
+ endIndex = fileNameWithExtension.length(); // don't cut any off the end.
}
String fileNameWithoutExtension = fileNameWithExtension.substring(0, endIndex);
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