[tomboy-maemo commit] r68 - in trunk/src: . Stubs Tomboy TomboyDataProvider
codesite...@google.com
Date: Tue May 20 09:32:41 2008
New Revision: 68
Removed:
trunk/src/TomboyDataProvider/
Modified:
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/Stubs/GConf.cs
trunk/src/Tomboy/Logger.cs
trunk/src/Tomboy/Note.cs
trunk/src/Tomboy/NoteManager.cs
Log:
2008-05-19 Everaldo Canuto <everald...@gmail.com>
* TomboyDataProvider: Deleted, we have now a new branch for providers.
* Makefile.am: Remove providers files from build.
* Stubs/GConf.cs: Remove providers references.
* Tomboy/Note.cs: Remove providers references.
* Tomboy/NoteManager.cs: Remove providers references.
* Tomboy/Logger.cs: Reenable text log file.
Modified: trunk/src/ChangeLog
==============================================================================
--- trunk/src/ChangeLog (original)
+++ trunk/src/ChangeLog Tue May 20 09:32:41 2008
@@ -1,3 +1,17 @@
+2008-05-19 Everaldo Canuto <everald...@gmail.com>
+
+ * TomboyDataProvider: Deleted, we have now a new branch for providers.
+
+ * Makefile.am: Remove providers files from build.
+
+ * Stubs/GConf.cs: Remove providers references.
+
+ * Tomboy/Note.cs: Remove providers references.
+
+ * Tomboy/NoteManager.cs: Remove providers references.
+
+ * Tomboy/Logger.cs: Reenable text log file.
+
2008-05-18 Everaldo Canuto <everald...@gmail.com>
* Makefile.am: Add provider files to compilation process.
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue May 20 09:32:41 2008
@@ -23,10 +23,6 @@
$(srcdir)/NoteWindow.cs \
$(srcdir)/ToCWindow.cs \
\
- $(srcdir)/TomboyDataProvider/TomboyDataProvider.cs \
- $(srcdir)/TomboyDataProvider/TomboyDataProviderFile.cs \
- $(srcdir)/TomboyDataProvider/TomboyProviderLoader.cs \
- \
$(srcdir)/Stubs/GConf.cs \
$(srcdir)/Stubs/Gnome.Url.cs \
\
Modified: trunk/src/Stubs/GConf.cs
==============================================================================
--- trunk/src/Stubs/GConf.cs (original)
+++ trunk/src/Stubs/GConf.cs Tue May 20 09:32:41 2008
@@ -20,8 +20,7 @@
{
try {
fileName = "tomboy.xml";
-// document.Load(fileName);
- Tomboy.TomboyProviderLoader.getProvider().XmlDocumentLoad(document,fileName);
+ document.Load(fileName);
}
catch {
}
@@ -50,10 +49,8 @@
{
try {
CreatePath(key);
-// TORO : devono essere fatte funzionare senno- non si avvia una
seconda volta
document.SelectSingleNode(key).InnerText = System.Convert.ToString(value);
- Tomboy.TomboyProviderLoader.getProvider().xmlDocumentSave(document,fileName);
-// document.Save(fileName);
+ document.Save(fileName);
foreach (string nkey in events.Keys) {
NotifyEventHandler handler = events[nkey] as NotifyEventHandler;
if (handler != null && key.StartsWith(nkey))
Modified: trunk/src/Tomboy/Logger.cs
==============================================================================
--- trunk/src/Tomboy/Logger.cs (original)
+++ trunk/src/Tomboy/Logger.cs Tue May 20 09:32:41 2008
@@ -34,10 +34,10 @@
public FileLogger ()
{
try {
-// log = File.CreateText (Path.Combine (
-// Environment.GetEnvironmentVariable ("HOME"),
-// ".tomboy.log"));
-// log.Flush ();
+ log = File.CreateText (Path.Combine (
+ Environment.GetEnvironmentVariable ("HOME"),
+ ".tomboy.log"));
+ log.Flush ();
} catch (IOException) {
// FIXME: Use temp file
}
Modified: trunk/src/Tomboy/Note.cs
==============================================================================
--- trunk/src/Tomboy/Note.cs (original)
+++ trunk/src/Tomboy/Note.cs Tue May 20 09:32:41 2008
@@ -800,13 +800,8 @@
NoteData note = new NoteData (uri);
string version = "";
- TomboyDataProvider provider=TomboyProviderLoader.getProvider();
-
- XmlTextReader xml = provider.getXmlTextReader (read_file, System.Text.Encoding.UTF8);
-
-// StreamReader reader = new StreamReader (read_file,
-// System.Text.Encoding.UTF8);
-// XmlTextReader xml = new XmlTextReader (reader);
+ StreamReader reader = new StreamReader (read_file, System.Text.Encoding.UTF8);
+ XmlTextReader xml = new XmlTextReader (reader);
xml.Namespaces = false;
@@ -885,31 +880,26 @@
{
string tmp_file = write_file + ".tmp";
- TomboyDataProvider provider=TomboyProviderLoader.getProvider();
-
- XmlTextWriter xml = provider.getXmlTextWriter (tmp_file, System.Text.Encoding.UTF8);
-// XmlTextWriter xml = new XmlTextWriter (tmp_file, System.Text.Encoding.UTF8);
+ XmlTextWriter xml = new XmlTextWriter (tmp_file, System.Text.Encoding.UTF8);
Write (xml, note);
- provider.textWriterClose (xml);
-
-// xml.Close ();
+ xml.Close ();
- if (provider.FileExists (write_file)) {
+ if (File.Exists (write_file)) {
string backup_path = write_file + "~";
- if (provider.FileExists (backup_path))
- provider.FileDelete (backup_path);
+ if (File.Exists (backup_path))
+ File.Delete (backup_path);
// Backup the to a ~ file, just in case
- provider.FileMove (write_file, backup_path);
+ File.Move (write_file, backup_path);
// Move the temp file to write_file
- provider.FileMove (tmp_file, write_file);
+ File.Move (tmp_file, write_file);
// Delete the ~ file
- provider.FileDelete (backup_path);
+ File.Delete (backup_path);
} else {
// Move the temp file to write_file
- provider.FileMove (tmp_file, write_file);
+ File.Move (tmp_file, write_file);
}
}
Modified: trunk/src/Tomboy/NoteManager.cs
==============================================================================
--- trunk/src/Tomboy/NoteManager.cs (original)
+++ trunk/src/Tomboy/NoteManager.cs Tue May 20 09:32:41 2008
@@ -98,15 +98,13 @@
// For overriding in test methods.
protected virtual bool DirectoryExists (string directory)
{
- return TomboyProviderLoader.getProvider().DirectoryExist(notes_dir);
-// return Directory.Exists (directory);
+ return Directory.Exists (directory);
}
// For overriding in test methods.
protected virtual DirectoryInfo CreateDirectory (string directory)
{
- return TomboyProviderLoader.getProvider().CreateDirectory (directory);
-// return Directory.CreateDirectory (directory);
+ return Directory.CreateDirectory (directory);
}
protected virtual bool FirstRun ()
@@ -197,7 +195,7 @@
protected virtual void LoadNotes ()
{
- string [] files =
TomboyProviderLoader.getProvider().DirectoryGetFiles (notes_dir, "*.note");
+ string [] files = Directory.GetFiles (notes_dir, "*.note");
foreach (string file_path in files) {
try {
@@ -264,31 +262,6 @@
public void Delete (Note note)
{
- if (TomboyProviderLoader.getProvider().FileExists (note.FilePath)) {
-/* if (backup_dir != null) {
- if (!Directory.Exists (backup_dir))
- Directory.CreateDirectory (backup_dir);
-
- string backup_path =
- Path.Combine (backup_dir,
- Path.GetFileName (note.FilePath));
- if (File.Exists (backup_path))
- File.Delete (backup_path);
-
- File.Move (note.FilePath, backup_path);
- } else
-*/
- TomboyProviderLoader.getProvider().FileDelete(note.FilePath);
- }
-
- notes.Remove (note);
- note.Delete ();
-
- Logger.Log ("Deleting note '{0}'.", note.Title);
-
- if (NoteDeleted != null)
- NoteDeleted (this, note);
-/*
if (File.Exists (note.FilePath)) {
if (backup_dir != null) {
if (!Directory.Exists (backup_dir))
@@ -312,7 +285,6 @@
if (NoteDeleted != null)
NoteDeleted (this, note);
-*/
}
string MakeNewFileName ()