Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [235] trunk/clients/gui/org.cishell.reference.gui. persistence
|
From: <bea...@us...> - 2006-10-02 15:06:11
|
Revision: 235
http://svn.sourceforge.net/cishell/?rev=235&view=rev
Author: bearsfan
Date: 2006-10-02 08:06:00 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
Using guiBuilder instead of logServices to display messages. Changed save.xml and SaveFactory to implement DataValidator (this not unit tested).
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.xml
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/Save.java
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java
Removed Paths:
-------------
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/l10n/
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/metatype/
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties 2006-10-02 14:10:08 UTC (rev 234)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties 2006-10-02 15:06:00 UTC (rev 235)
@@ -2,6 +2,6 @@
label=Save...
description=Saves data to disk
in_data=java.lang.Object
-out_data=file:*
+out_data=null
service.pid=org.cishell.reference.gui.persistence.save.Save
remoteable=false
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.xml 2006-10-02 14:10:08 UTC (rev 234)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.xml 2006-10-02 15:06:00 UTC (rev 235)
@@ -8,5 +8,7 @@
<service>
<provide interface=
"org.cishell.framework.algorithm.AlgorithmFactory"/>
+ <provide interface=
+ "org.cishell.framework.algorithm.DataValidator"/>
</service>
</component>
\ No newline at end of file
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-02 14:10:08 UTC (rev 234)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-02 15:06:00 UTC (rev 235)
@@ -44,16 +44,15 @@
private boolean confirmFileOverwrite(File file) {
String message = "The file:\n" + file.getPath()
+ "\nalready exists. Are you sure you want to overwrite it?";
- logService.log(LogService.LOG_INFO, "Confirm File Overwrite: " + message);
- return true;
- //return guiBuilder.showConfirm("File Overwrite", message, message);
+ return guiBuilder.showConfirm("File Overwrite", message, message);
}
private boolean isSaveFileValid(File file) {
boolean valid = false;
if (file.isDirectory()) {
String message = "Destination cannot be a directory. Please choose a file";
- logService.log(LogService.LOG_ERROR, "Invalid Destination: " + message);
+ guiBuilder.showError("Invalid Destination", message, message);
+ //logService.log(LogService.LOG_ERROR, "Invalid Destination: " + message);
valid = false;
} else if (file.exists()) {
valid = confirmFileOverwrite(file);
@@ -112,17 +111,17 @@
done = true ;
- //guiBuilder.showInformation("File Saved",
- // "File successfully Saved",
- // "File saved: " + selectedFile.getPath());
- logService.log(LogService.LOG_INFO, "File saved: " + selectedFile.getPath() + "\n");
+ guiBuilder.showInformation("File Saved",
+ "File successfully Saved",
+ "File saved: " + selectedFile.getPath());
+ //logService.log(LogService.LOG_INFO, "File saved: " + selectedFile.getPath() + "\n");
//DataManagerService dms = (DataManagerService)context.getService(DataManagerService.class.getName());
//dms.addData(data);
} else {
- //guiBuilder.showInformation("File Save Cancel",
- // "File save has been cancelled",
- // "File save has been cancelled");
- logService.log(LogService.LOG_INFO, "File save cancelled.\n");
+ guiBuilder.showInformation("File Save Cancel",
+ "File save has been cancelled",
+ "File save has been cancelled");
+ //logService.log(LogService.LOG_INFO, "File save cancelled.\n");
done = true;
return false;
}
@@ -145,6 +144,7 @@
return true;
}
catch (IOException ioe) {
+ guiBuilder.showError("Copy Error", "IOException during copy", ioe.getMessage());
logService.log(LogService.LOG_ERROR, ioe.getMessage());
return false;
}
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-02 14:10:08 UTC (rev 234)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-02 15:06:00 UTC (rev 235)
@@ -4,7 +4,6 @@
import org.cishell.framework.CIShellContext;
import org.cishell.framework.algorithm.Algorithm;
-import org.cishell.framework.algorithm.DataValidator;
import org.cishell.framework.data.Data;
import org.cishell.service.conversion.Converter;
import org.cishell.service.conversion.DataConversionService;
@@ -13,7 +12,7 @@
import org.eclipse.ui.PlatformUI;
import org.osgi.service.log.LogService;
-public class Save implements Algorithm, DataValidator {
+public class Save implements Algorithm {
Data[] data;
Dictionary parameters;
CIShellContext context;
@@ -43,11 +42,11 @@
final Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
if (converters.length < 1) {
- logService.log(LogService.LOG_ERROR, "No valid converters found!");
- //guiBuilder.showError("No Converters",
- // "No valid converters for data type: " +
- // data[0].getData().getClass().getName(),
- // "Please install a plugin that will save the data type to a file");
+ //logService.log(LogService.LOG_ERROR, "No valid converters found!");
+ guiBuilder.showError("No Converters",
+ "No valid converters for data type: " +
+ data[0].getData().getClass().getName(),
+ "Please install a plugin that will save the data type to a file");
}
else {
if (!parentShell.isDisposed()) {
@@ -66,15 +65,4 @@
}
return null;
}
-
- public String validate(Data[] data) {
- Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
- if (converters.length == 0) {
- return "No valid converters from " +
- data[0].getData().getClass().getName() + " to any file extension";
- }
- else {
- return "";
- }
- }
}
\ No newline at end of file
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-02 14:10:08 UTC (rev 234)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-02 15:06:00 UTC (rev 235)
@@ -5,20 +5,40 @@
import org.cishell.framework.CIShellContext;
import org.cishell.framework.algorithm.Algorithm;
import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.algorithm.DataValidator;
import org.cishell.framework.data.Data;
+import org.cishell.service.conversion.Converter;
+import org.cishell.service.conversion.DataConversionService;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.metatype.MetaTypeProvider;
-public class SaveFactory implements AlgorithmFactory {
+public class SaveFactory implements AlgorithmFactory, DataValidator {
+ private CIShellContext context;
protected void activate(ComponentContext ctxt) {}
protected void deactivate(ComponentContext ctxt) {}
public Algorithm createAlgorithm(Data[] data, Dictionary parameters, CIShellContext context) {
+ this.context = context;
return new Save(data, parameters, context);
}
public MetaTypeProvider createParameters(Data[] data) {
return null;
}
+
+ public String validate(Data[] data) {
+ DataConversionService conversionManager = (DataConversionService) context.getService(
+ DataConversionService.class.getName());
+
+ Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
+ if (converters.length == 0) {
+ return "No valid converters from " +
+ data[0].getData().getClass().getName() + " to any file extension";
+ }
+ else {
+ return "";
+ }
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
