Author: gburt
Date: Mon Feb 4 19:39:58 2008
New Revision: 3143
URL: http://svn.gnome.org/viewvc/banshee?rev=3143&view=rev
Log:
2008-02-04 Gabriel Burt <[EMAIL PROTECTED]>
*
src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs:
* src/Core/Banshee.Services/Banshee.Collection/TrackListModel.cs:
* src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:
* src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistCore.cs:
*
src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:
* src/Core/Banshee.Services/Banshee.Sources/Source.cs:
* src/Core/Hyena/Hyena.mdp:
* src/Core/Hyena/Makefile.am:
* src/Core/Hyena/Hyena.Data.Query/*:
* src/Core/Hyena/Hyena.Query/*: Change Hyena.Data.Query namespace to
Hyena.Query.
Added:
trunk/banshee/src/Core/Hyena/Hyena.Query/
- copied from r3142, /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/
Removed:
trunk/banshee/src/Core/Hyena/Hyena.Data.Query/
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/TrackListModel.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistCore.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/DateQueryValue.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/FileSizeQueryValue.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/IntegerQueryValue.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryField.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryFieldSet.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryListNode.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryNode.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryOperator.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryParser.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryTermNode.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryToken.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/QueryValue.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/StringQueryValue.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/UserQueryParser.cs
trunk/banshee/src/Core/Hyena/Hyena.Query/XmlQueryParser.cs
trunk/banshee/src/Core/Hyena/Hyena.mdp
trunk/banshee/src/Core/Hyena/Makefile.am
Modified:
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
==============================================================================
---
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
(original)
+++
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
Mon Feb 4 19:39:58 2008
@@ -36,7 +36,7 @@
using Hyena;
using Hyena.Data;
using Hyena.Data.Sqlite;
-using Hyena.Data.Query;
+using Hyena.Query;
using Banshee.Base;
using Banshee.Database;
@@ -85,7 +85,7 @@
if (String.IsNullOrEmpty(Filter)) {
filter_query = null;
} else {
- Hyena.Data.Query.UserQueryParser qp = new UserQueryParser
(Filter);
+ Hyena.Query.UserQueryParser qp = new UserQueryParser (Filter);
QueryNode n = qp.BuildTree (field_set);
filter_query = n.ToSql (field_set);
@@ -94,7 +94,7 @@
Console.WriteLine ("query: {0}", Filter);
Console.WriteLine ("Xml for Query: {0}", n.ToXml (field_set,
true));
Console.WriteLine ("Sql for Query: {0}", filter_query);
- Hyena.Data.Query.QueryParser qp2 = new XmlQueryParser (n.ToXml
(field_set));
+ Hyena.Query.QueryParser qp2 = new XmlQueryParser (n.ToXml
(field_set));
QueryNode n2 = qp2.BuildTree (field_set);
if (n2 != null) {
Console.WriteLine ("User query for Xml: {0}",
n2.ToUserQuery ());
Modified:
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/TrackListModel.cs
==============================================================================
---
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/TrackListModel.cs
(original)
+++
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/TrackListModel.cs
Mon Feb 4 19:39:58 2008
@@ -30,7 +30,7 @@
using System.Collections.Generic;
using Hyena.Data;
-using Hyena.Data.Query;
+using Hyena.Query;
using Banshee.ServiceStack;
Modified:
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
Mon Feb 4 19:39:58 2008
@@ -34,7 +34,7 @@
using System.Collections.Generic;
using Hyena.Data;
-using Hyena.Data.Query;
+using Hyena.Query;
using Hyena.Data.Sqlite;
using Banshee.Collection.Database;
Modified:
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistCore.cs
==============================================================================
---
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistCore.cs
(original)
+++
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistCore.cs
Mon Feb 4 19:39:58 2008
@@ -5,7 +5,7 @@
using Mono.Unix;
-using Hyena.Data.Query;
+using Hyena.Query;
using Banshee.Base;
using Banshee.Sources;
Modified:
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
==============================================================================
---
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
(original)
+++
trunk/banshee/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
Mon Feb 4 19:39:58 2008
@@ -34,7 +34,7 @@
using Mono.Unix;
-using Hyena.Data.Query;
+using Hyena.Query;
using Hyena.Data.Sqlite;
using Banshee.Base;
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs Mon Feb
4 19:39:58 2008
@@ -34,7 +34,7 @@
using Mono.Unix;
using Hyena.Data;
-using Hyena.Data.Query;
+using Hyena.Query;
using Banshee.Collection;
using Banshee.ServiceStack;
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/DateQueryValue.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/DateQueryValue.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/DateQueryValue.cs Mon Feb 4
19:39:58 2008
@@ -32,7 +32,7 @@
using Hyena;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public enum RelativeDateFactor {
Second = 1,
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/FileSizeQueryValue.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/FileSizeQueryValue.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/FileSizeQueryValue.cs Mon Feb
4 19:39:58 2008
@@ -33,7 +33,7 @@
using Hyena;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public enum FileSizeFactor {
None = 1,
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/IntegerQueryValue.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/IntegerQueryValue.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/IntegerQueryValue.cs Mon Feb
4 19:39:58 2008
@@ -32,7 +32,7 @@
using Hyena;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class IntegerQueryValue : QueryValue
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryField.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryField.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryField.cs Mon Feb 4
19:39:58 2008
@@ -31,7 +31,7 @@
using System.Text;
using System.Collections.Generic;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class QueryField
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryFieldSet.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryFieldSet.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryFieldSet.cs Mon Feb 4
19:39:58 2008
@@ -31,7 +31,7 @@
using System.Text;
using System.Collections.Generic;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class QueryFieldSet
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryListNode.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryListNode.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryListNode.cs Mon Feb 4
19:39:58 2008
@@ -32,7 +32,7 @@
using System.Text;
using System.Collections.Generic;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public enum Keyword {
Not,
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryNode.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryNode.cs (original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryNode.cs Mon Feb 4
19:39:58 2008
@@ -32,7 +32,7 @@
using System.IO;
using System.Text;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public abstract class QueryNode
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryOperator.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryOperator.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryOperator.cs Mon Feb 4
19:39:58 2008
@@ -32,7 +32,7 @@
using System.Text;
using System.Collections.Generic;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class Operator
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryParser.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryParser.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryParser.cs Mon Feb 4
19:39:58 2008
@@ -31,7 +31,7 @@
using System.IO;
using System.Text;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public abstract class QueryParser
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryTermNode.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryTermNode.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryTermNode.cs Mon Feb 4
19:39:58 2008
@@ -32,7 +32,7 @@
using System.Text;
using System.Collections.Generic;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class QueryTermNode : QueryNode
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryToken.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryToken.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryToken.cs Mon Feb 4
19:39:58 2008
@@ -28,7 +28,7 @@
using System;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public enum TokenID {
Unknown,
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/QueryValue.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/QueryValue.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/QueryValue.cs Mon Feb 4
19:39:58 2008
@@ -32,7 +32,7 @@
using Hyena;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public abstract class QueryValue
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/StringQueryValue.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/StringQueryValue.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/StringQueryValue.cs Mon Feb
4 19:39:58 2008
@@ -32,7 +32,7 @@
using Hyena;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class StringQueryValue : QueryValue
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/UserQueryParser.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/UserQueryParser.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/UserQueryParser.cs Mon Feb 4
19:39:58 2008
@@ -31,7 +31,7 @@
using System.IO;
using System.Text;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class UserQueryParser : QueryParser
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.Query/XmlQueryParser.cs
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Query/XmlQueryParser.cs
(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Query/XmlQueryParser.cs Mon Feb 4
19:39:58 2008
@@ -31,7 +31,7 @@
using System.Text;
using System.Xml;
-namespace Hyena.Data.Query
+namespace Hyena.Query
{
public class XmlQueryParser : QueryParser
{
Modified: trunk/banshee/src/Core/Hyena/Hyena.mdp
==============================================================================
--- trunk/banshee/src/Core/Hyena/Hyena.mdp (original)
+++ trunk/banshee/src/Core/Hyena/Hyena.mdp Mon Feb 4 19:39:58 2008
@@ -15,11 +15,11 @@
<File name="Hyena.Data/ISortableColumn.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data/ModelSelection.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data/SortType.cs" subtype="Code" buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryListNode.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryNode.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryParser.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryTermNode.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryToken.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryListNode.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryNode.cs" subtype="Code" buildaction="Compile"
/>
+ <File name="Hyena.Query/QueryParser.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryTermNode.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryToken.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data/PropertyStore.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.CommandLine/Layout.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.CommandLine/LayoutOption.cs" subtype="Code"
buildaction="Compile" />
@@ -35,10 +35,10 @@
<File name="Hyena.Collections/IntervalHeap.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Collections/Selection.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Collections/SelectionProxy.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryField.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/UserQueryParser.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/XmlQueryParser.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryFieldSet.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryField.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/UserQueryParser.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/XmlQueryParser.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryFieldSet.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data.Sqlite/DatabaseColumn.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data.Sqlite/DatabaseColumnAttribute.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data.Sqlite/SqliteModelProvider.cs" subtype="Code"
buildaction="Compile" />
@@ -47,12 +47,12 @@
<File name="Hyena.Data.Sqlite/ICacheableDatabaseModel.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena.Data/ModelCache.cs" subtype="Code" buildaction="Compile"
/>
<File name="Hyena.Data.Sqlite/SqliteModelCache.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/DateQueryValue.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/FileSizeQueryValue.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/IntegerQueryValue.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryOperator.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/QueryValue.cs" subtype="Code"
buildaction="Compile" />
- <File name="Hyena.Data.Query/StringQueryValue.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/DateQueryValue.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/FileSizeQueryValue.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/IntegerQueryValue.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryOperator.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/QueryValue.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Hyena.Query/StringQueryValue.cs" subtype="Code"
buildaction="Compile" />
<File name="Hyena/Timer.cs" subtype="Code" buildaction="Compile" />
<File name="Hyena/Utilities.cs" subtype="Code" buildaction="Compile" />
<File name="Hyena.SExpEngine/ArithmeticFunctionSet.cs" subtype="Code"
buildaction="Compile" />
@@ -89,4 +89,4 @@
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/banshee/src/Core/Hyena/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Hyena/Makefile.am (original)
+++ trunk/banshee/src/Core/Hyena/Makefile.am Mon Feb 4 19:39:58 2008
@@ -11,21 +11,21 @@
Hyena.CommandLine/Layout.cs \
Hyena.CommandLine/LayoutGroup.cs \
Hyena.CommandLine/LayoutOption.cs \
- Hyena.Data.Query/DateQueryValue.cs \
- Hyena.Data.Query/FileSizeQueryValue.cs \
- Hyena.Data.Query/IntegerQueryValue.cs \
- Hyena.Data.Query/QueryField.cs \
- Hyena.Data.Query/QueryFieldSet.cs \
- Hyena.Data.Query/QueryListNode.cs \
- Hyena.Data.Query/QueryNode.cs \
- Hyena.Data.Query/QueryOperator.cs \
- Hyena.Data.Query/QueryParser.cs \
- Hyena.Data.Query/QueryTermNode.cs \
- Hyena.Data.Query/QueryToken.cs \
- Hyena.Data.Query/QueryValue.cs \
- Hyena.Data.Query/StringQueryValue.cs \
- Hyena.Data.Query/UserQueryParser.cs \
- Hyena.Data.Query/XmlQueryParser.cs \
+ Hyena.Query/DateQueryValue.cs \
+ Hyena.Query/FileSizeQueryValue.cs \
+ Hyena.Query/IntegerQueryValue.cs \
+ Hyena.Query/QueryField.cs \
+ Hyena.Query/QueryFieldSet.cs \
+ Hyena.Query/QueryListNode.cs \
+ Hyena.Query/QueryNode.cs \
+ Hyena.Query/QueryOperator.cs \
+ Hyena.Query/QueryParser.cs \
+ Hyena.Query/QueryTermNode.cs \
+ Hyena.Query/QueryToken.cs \
+ Hyena.Query/QueryValue.cs \
+ Hyena.Query/StringQueryValue.cs \
+ Hyena.Query/UserQueryParser.cs \
+ Hyena.Query/XmlQueryParser.cs \
Hyena.Data.Sqlite/DatabaseColumn.cs \
Hyena.Data.Sqlite/DatabaseColumnAttribute.cs \
Hyena.Data.Sqlite/HyenaSqliteCommand.cs \
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
