Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [237] trunk/clients/gui/org.cishell.reference.gui. persistence
|
From: <bh...@us...> - 2006-10-04 01:43:35
|
Revision: 237
http://svn.sourceforge.net/cishell/?rev=237&view=rev
Author: bh2
Date: 2006-10-02 09:14:28 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
Cleaned up File/Save stuff
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF
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
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF 2006-10-02 15:53:38 UTC (rev 236)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF 2006-10-02 16:14:28 UTC (rev 237)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Persistence Plug-in
-Bundle-SymbolicName: org.cishell.reference.gui.persistence
+Bundle-SymbolicName: org.cishell.reference.gui.persistence;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
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 15:53:38 UTC (rev 236)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-02 16:14:28 UTC (rev 237)
@@ -52,7 +52,6 @@
if (file.isDirectory()) {
String message = "Destination cannot be a directory. Please choose a file";
guiBuilder.showError("Invalid Destination", message, message);
- //logService.log(LogService.LOG_ERROR, "Invalid Destination: " + message);
valid = false;
} else if (file.exists()) {
valid = confirmFileOverwrite(file);
@@ -111,17 +110,8 @@
done = true ;
- 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);
+ logService.log(LogService.LOG_INFO, "Saved: " + selectedFile.getPath() + "\n");
} 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");
done = true;
return false;
}
@@ -145,7 +135,6 @@
}
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 15:53:38 UTC (rev 236)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-02 16:14:28 UTC (rev 237)
@@ -10,7 +10,6 @@
import org.cishell.service.guibuilder.GUIBuilderService;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
-import org.osgi.service.log.LogService;
public class Save implements Algorithm {
Data[] data;
@@ -21,7 +20,7 @@
private GUIBuilderService guiBuilder;
private DataConversionService conversionManager;
- private LogService logService;
+ //private LogService logService;
public Save(Data[] data, Dictionary parameters, CIShellContext context) {
this.data = data;
@@ -33,7 +32,7 @@
this.conversionManager = (DataConversionService) context.getService(
DataConversionService.class.getName());
- this.logService = (LogService)context.getService(LogService.class.getName());
+ //this.logService = (LogService)context.getService(LogService.class.getName());
this.guiBuilder = (GUIBuilderService)context.getService(GUIBuilderService.class.getName());
}
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 15:53:38 UTC (rev 236)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-02 16:14:28 UTC (rev 237)
@@ -3,6 +3,7 @@
import java.util.Dictionary;
import org.cishell.framework.CIShellContext;
+import org.cishell.framework.LocalCIShellContext;
import org.cishell.framework.algorithm.Algorithm;
import org.cishell.framework.algorithm.AlgorithmFactory;
import org.cishell.framework.algorithm.DataValidator;
@@ -16,7 +17,9 @@
public class SaveFactory implements AlgorithmFactory, DataValidator {
private CIShellContext context;
- protected void activate(ComponentContext ctxt) {}
+ protected void activate(ComponentContext ctxt) {
+ context = new LocalCIShellContext(ctxt.getBundleContext());
+ }
protected void deactivate(ComponentContext ctxt) {}
public Algorithm createAlgorithm(Data[] data, Dictionary parameters, CIShellContext context) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
