Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [836] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <nor...@us...> - 2007-08-14 09:28:50
|
Revision: 836
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=836&view=rev
Author: northern_sky
Date: 2007-08-14 02:28:48 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
misc cleanup
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -21,10 +21,11 @@
*
*/
-#endregion
+#endregion Copyright (C) 2005-2007 Team MediaPortal
+#region Imports
+
using System;
-
using System.Collections;
using System.Collections.Generic;
using System.IO;
@@ -37,6 +38,7 @@
using System.Data.SQLite;
using GUIPrograms.Items;
+#endregion Imports
namespace GUIPrograms.Database
{
/// <summary>
@@ -45,16 +47,21 @@
/// </summary>
public sealed class DatabaseHandler
{
+ #region Variables
+
private SQLiteConnection sqlLiteConnection = null;
private List<ApplicationItem> globalApplicationItemList = new List<ApplicationItem>();
private readonly string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
private static DatabaseHandler instance = new DatabaseHandler();
+ #endregion Variables
+
+ #region Constructors/Destructors
+
// Explicit static constructor to tell C# compiler
// not to mark type as beforefieldinit
static DatabaseHandler() { }
-
private DatabaseHandler()
{
string DatabasePath = Config.GetFile(Config.Dir.Database, DATABASEFILE);
@@ -89,28 +96,15 @@
}
}
+ #endregion Constructors/Destructors
+
+ #region Properties
+
public static DatabaseHandler DBHandlerInstance
{
get { return instance; }
}
- private void SetPragmas()
- {
- ExecuteStmtNonQuery("PRAGMA default_cache_size=3000");
- ExecuteStmtNonQuery("PRAGMA count_changes=1");
- ExecuteStmtNonQuery("PRAGMA short_column_names=1");
- ExecuteStmtNonQuery("PRAGMA auto_vacuum=1");
- }
-
- /*static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
- {
- ApplicationItem targetApp = globalApplicationItemList.GetAppByID(curLink.TargetAppID);
- if (targetApp != null)
- {
- targetApp.LaunchFile(curLink, MPGUIMode);
- }
- }*/
-
// we can always keep an connection open in sqllite..
//to expensive closing it
public SQLiteConnection SqlLiteConn
@@ -125,167 +119,20 @@
}
}
- /// <summary>
- /// Create db tables etc,if not already exist
- /// </summary>
- /// <returns></returns>
- bool CreateDBTables()
+ public List<ApplicationItem> ApplicationItemList
{
- string sqlStmt = @"CREATE TABLE
- tblApplicationItem
- (
- applicationId INTEGER PRIMARY KEY,
- fatherNodeId INTEGER,
- title TEXT,
- filename TEXT,
- arguments TEXT,
- windowstyle TEXT,
- startupdir TEXT,
- useShellExecute BOOL,
- useQuotes BOOL,
- applicationItemType TEXT,
- source TEXT,
- imagefile TEXT,
- filedirectory TEXT,
- imagedirectory TEXT,
- validExtensions TEXT,
- enabled BOOL,
- importValidImagesOnly BOOL,
- iposition INTEGER,
- refreshGUIAllowed BOOL,
- platformId INTEGER,
- waitForExit BOOL,
- preLaunch TEXT,
- postLaunch TEXT
- )";
-
-
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, genreId INTEGER, genreStyleId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE tblFileLinkItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, updateFlag INTEGER)";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE tblSetting (settingid INTEGER PRIMARY KEY, key TEXT, value TEXT)";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE
- tblGenre
- (
- genreId INTEGER PRIMARY KEY,
- genre TEXT
- )";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE
- tblPlatform
- (
- platformId INTEGER PRIMARY KEY,
- platform TEXT
- )";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE TABLE
- tblManufacturer
- (
- manufacturerId INTEGER PRIMARY KEY,
- manufacturer TEXT
- )";
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"CREATE INDEX idxFile1 ON tblFileItem(applicationId)";
- ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE INDEX idxApp1 ON tblApplicationItem(fatherNodeId)";
- ExecuteStmtNonQuery(sqlStmt);
- sqlStmt = @"CREATE UNIQUE INDEX idxFilterItem1 ON tblFileLinkItem(applicationId, fileID, grouperAppID)";
- ExecuteStmtNonQuery(sqlStmt);
-
- return true;
- }
-
- /// <summary>
- /// Inserting some default values so that the db is preloaded
- /// Should always be there.
- /// </summary>
- private void InsertDefaultDBValues()
- {
-
- string sqlStmt = @"INSERT INTO
- tblGenre
- (
- genre
- )
- VALUES
- (
- 'Unknown'
- )";
-
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"INSERT INTO
- tblManufacturer
- (
- manufacturer
- )
- VALUES
- (
- 'Unknown'
- )";
-
-
- ExecuteStmtNonQuery(sqlStmt);
-
- sqlStmt = @"INSERT INTO
- tblPlatform
- (
- platform
- )
- VALUES
- (
- 'Unknown'
- )";
-
- ExecuteStmtNonQuery(sqlStmt);
-
-
- using (SQLiteTransaction transaction = SqlLiteConn.BeginTransaction())
+ get
{
- FillDefaultDBLexiconHelper("tblPlatform", "platform", CreateSystemLexiconList());
- FillDefaultDBLexiconHelper("tblManufacturer", "manufacturer", CreateManufacturerLexiconList());
- FillDefaultDBLexiconHelper("tblGenre", "genre", CreateGenreLexiconList());
-
- transaction.Commit();
+ return globalApplicationItemList;
}
-
}
- private void FillDefaultDBLexiconHelper(string tableName, string columnName, List<string> itemList)
- {
- SQLiteParameter[] paramCollection = new SQLiteParameter[1];
- SQLiteParameter paramInsertValue = new SQLiteParameter("@insertValue", DbType.String);
- paramCollection[0] = paramInsertValue;
+ #endregion Properties
- string sqlStmt = @"
- INSERT INTO
- " + tableName + @"
- (
- " + columnName + @"
- )
- VALUES
- (
- @insertValue
- );";
+ #region Public Methods
- foreach (string insertValue in itemList)
- {
- paramCollection[0].Value = insertValue;
- ExecuteStmtNonQuery(sqlStmt, paramCollection);
- }
- }
+ #region dbsettings
- #region dbsettings
public string ReadSetting(string Key)
{
string sqlStmt = string.Empty;
@@ -310,7 +157,7 @@
return keyValue;
}
- int CountKey(string Key)
+ public int CountKey(string Key)
{
string sqlStmt = string.Empty;
int keyValue = 0;
@@ -347,7 +194,6 @@
WHERE
key = '" + Key + "'";
-
}
else
{
@@ -369,7 +215,6 @@
public int LexiconDataExists(string tableName, string columnName, string fieldValue)
{
-
SQLiteParameter[] parameterArray = new SQLiteParameter[1];
parameterArray[0] = GetParameter<string>(fieldValue, "@fieldValue", DbType.String);
@@ -396,7 +241,6 @@
try
{
-
int lexiconId = ExecuteStmtScalar<Int32>(sqlStmt, parameterArray);
//lexion didnt exist, we save it
@@ -417,78 +261,12 @@
}
- #region default lexiconvalues
-
- private static List<string> CreateGenreLexiconList()
- {
- List<string> genreList = new List<string>();
-
-
- genreList.Add("Shooter");
- genreList.Add("Platform");
- genreList.Add("Adventure");
-
- return genreList;
- }
-
- private static List<string> CreateManufacturerLexiconList()
- {
- List<string> manufacturerList = new List<string>();
-
- manufacturerList.Add("Sega");
- manufacturerList.Add("Nintendo");
- manufacturerList.Add("Konami");
-
- return manufacturerList;
- }
-
- private static List<string> CreateSystemLexiconList()
- {
- List<string> systemList = new List<string>();
- systemList.Add("");
- systemList.Add("Atari 5200");
- systemList.Add("Atari 7800");
- systemList.Add("Atari Lynx");
- systemList.Add("Atari ST");
- systemList.Add("Atari Video Computer System");
- systemList.Add("Commodore 64/128");
- systemList.Add("Commodore Amiga");
- systemList.Add("Game Boy");
- systemList.Add("Game Boy Advance");
- systemList.Add("Game Boy Color");
- systemList.Add("Neo Geo");
- systemList.Add("Nintendo 64");
- systemList.Add("Nintendo Entertainment System");
- systemList.Add("PlayStation");
- systemList.Add("Sega Dreamcast");
- systemList.Add("Sega Game Gear");
- systemList.Add("Sega Genesis");
- systemList.Add("Sega Master System");
- systemList.Add("Super NES");
- systemList.Add("TurboGrafx-16");
- systemList.Add("Arcade");
- systemList.Add("PC");
- return systemList;
- }
-
- #endregion default lexiconvalues
-
- public List<ApplicationItem> ApplicationItemList
- {
- get
- {
- return globalApplicationItemList;
- }
- }
-
public ItemType GetItemType(string columnName, string tableName, int id)
{
ItemType itemType = ItemType.UNKNOWN;
+ string sqlStmt = "SELECT " + columnName + " FROM " + tableName + " WHERE applicationId = " + id;
- string sqlStmt = "select " + columnName + " from " + tableName + " where applicationid = " + id;
-
- itemType = ProgramUtils.StringToSourceType(ExecuteStmtScalar(sqlStmt).ToString());
- return itemType;
+ return ProgramUtils.StringToSourceType(ExecuteStmtScalar(sqlStmt).ToString());
}
#region dataaccess help methods
@@ -499,7 +277,6 @@
try
{
-
using (SQLiteCommand command = new SQLiteCommand(SqlLiteConn))
{
command.CommandText = stmt;
@@ -551,7 +328,6 @@
public T ExecuteStmtScalar<T>(string stmt, SQLiteParameter[] paramcollection)
{
-
object o = null;
try
{
@@ -592,7 +368,7 @@
return o;
}
- public static SQLiteParameter GetParameter<G>(G value, string parameterName, DbType type)
+ public SQLiteParameter GetParameter<G>(G value, string parameterName, DbType type)
{
SQLiteParameter parameter = new SQLiteParameter(parameterName, type);
parameter.Value = value;
@@ -604,28 +380,259 @@
public void LoadAllApplicationItems()
{
- try
+
+ globalApplicationItemList.Clear();
+
+ using (SQLiteCommand command = SqlLiteConn.CreateCommand())
{
- globalApplicationItemList.Clear();
-
- using (SQLiteCommand command = SqlLiteConn.CreateCommand())
+ command.CommandText = "SELECT * FROM tblApplicationItem ORDER BY iposition";
+ using (SQLiteDataReader dataReader = command.ExecuteReader())
{
- command.CommandText = "SELECT * FROM tblApplicationItem order by iposition";
- using (SQLiteDataReader dataReader = command.ExecuteReader())
+ while (dataReader.Read())
{
- while (dataReader.Read())
- {
- ApplicationItem applicationItem = (ApplicationItem)ApplicationItemFactory.AppFactory.GetApplicationItem(GetItemType("applicationItemType", "tblApplicationItem", Convert.ToInt32(dataReader["applicationId"])), dataReader);
- // applicationItem.OnLaunchFilelink += new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink);
- globalApplicationItemList.Add(applicationItem);
- }
+ ApplicationItem applicationItem = (ApplicationItem) ItemFactory.ItemFactoryInstance.GetItem(GetItemType("applicationItemType", "tblApplicationItem", Convert.ToInt32(dataReader["applicationId"])), dataReader);
+ // applicationItem.OnLaunchFilelink += new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink);
+ globalApplicationItemList.Add(applicationItem);
}
}
}
- catch (SQLiteException ex)
+ }
+
+
+
+ #endregion Public Methods
+
+ #region Private Methods
+
+ private void SetPragmas()
+ {
+ ExecuteStmtNonQuery("PRAGMA default_cache_size=3000");
+ ExecuteStmtNonQuery("PRAGMA count_changes=1");
+ ExecuteStmtNonQuery("PRAGMA short_column_names=1");
+ ExecuteStmtNonQuery("PRAGMA auto_vacuum=1");
+ }
+
+ /// <summary>
+ /// Create db tables etc,if not already exist
+ /// </summary>
+ /// <returns></returns>
+ private bool CreateDBTables()
+ {
+ string sqlStmt = @"CREATE TABLE
+ tblApplicationItem
+ (
+ applicationId INTEGER PRIMARY KEY,
+ fatherNodeId INTEGER,
+ title TEXT,
+ filename TEXT,
+ arguments TEXT,
+ windowstyle TEXT,
+ startupdir TEXT,
+ useShellExecute BOOL,
+ useQuotes BOOL,
+ applicationItemType TEXT,
+ source TEXT,
+ imagefile TEXT,
+ filedirectory TEXT,
+ imagedirectory TEXT,
+ validExtensions TEXT,
+ enabled BOOL,
+ importValidImagesOnly BOOL,
+ iposition INTEGER,
+ refreshGUIAllowed BOOL,
+ platformId INTEGER,
+ waitForExit BOOL,
+ preLaunch TEXT,
+ postLaunch TEXT
+ )";
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE tblFileItem (fileid INTEGER PRIMARY KEY, applicationId INTEGER, title TEXT, filename TEXT, imagefile TEXT, genreId INTEGER, genreStyleId INTEGER, country TEXT, manufacturerId INTEGER, year INTEGER, rating INTEGER, overview TEXT, platformId INTEGER, lastTimeLaunched TEXT, launchcount INTEGER, categorydata TEXT, gameInfoUrl TEXT)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE tblFileLinkItem (applicationId INTEGER, grouperAppID INTEGER, fileID INTEGER, filename TEXT, updateFlag INTEGER)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE tblSetting (settingid INTEGER PRIMARY KEY, key TEXT, value TEXT)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE
+ tblGenre
+ (
+ genreId INTEGER PRIMARY KEY,
+ genre TEXT
+ )";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE
+ tblPlatform
+ (
+ platformId INTEGER PRIMARY KEY,
+ platform TEXT
+ )";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE TABLE
+ tblManufacturer
+ (
+ manufacturerId INTEGER PRIMARY KEY,
+ manufacturer TEXT
+ )";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"CREATE INDEX idxFile1 ON tblFileItem(applicationId)";
+ ExecuteStmtNonQuery(sqlStmt);
+ sqlStmt = @"CREATE INDEX idxApp1 ON tblApplicationItem(fatherNodeId)";
+ ExecuteStmtNonQuery(sqlStmt);
+ sqlStmt = @"CREATE UNIQUE INDEX idxFilterItem1 ON tblFileLinkItem(applicationId, fileID, grouperAppID)";
+ ExecuteStmtNonQuery(sqlStmt);
+
+ return true;
+ }
+
+ /// <summary>
+ /// Inserting some default values so that the db is preloaded
+ /// Should always be there.
+ /// </summary>
+ private void InsertDefaultDBValues()
+ {
+ string sqlStmt = @"INSERT INTO
+ tblGenre
+ (
+ genre
+ )
+ VALUES
+ (
+ 'Unknown'
+ )";
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"INSERT INTO
+ tblManufacturer
+ (
+ manufacturer
+ )
+ VALUES
+ (
+ 'Unknown'
+ )";
+
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ sqlStmt = @"INSERT INTO
+ tblPlatform
+ (
+ platform
+ )
+ VALUES
+ (
+ 'Unknown'
+ )";
+
+ ExecuteStmtNonQuery(sqlStmt);
+
+ using (SQLiteTransaction transaction = SqlLiteConn.BeginTransaction())
{
- Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+ FillDefaultDBLexiconHelper("tblPlatform", "platform", CreateSystemLexiconList());
+ FillDefaultDBLexiconHelper("tblManufacturer", "manufacturer", CreateManufacturerLexiconList());
+ FillDefaultDBLexiconHelper("tblGenre", "genre", CreateGenreLexiconList());
+
+ transaction.Commit();
}
}
+
+ private void FillDefaultDBLexiconHelper(string tableName, string columnName, List<string> itemList)
+ {
+ SQLiteParameter[] paramCollection = new SQLiteParameter[1];
+ SQLiteParameter paramInsertValue = new SQLiteParameter("@insertValue", DbType.String);
+ paramCollection[0] = paramInsertValue;
+
+ string sqlStmt = @"
+ INSERT INTO
+ " + tableName + @"
+ (
+ " + columnName + @"
+ )
+ VALUES
+ (
+ @insertValue
+ );";
+
+ foreach (string insertValue in itemList)
+ {
+ paramCollection[0].Value = insertValue;
+ ExecuteStmtNonQuery(sqlStmt, paramCollection);
+ }
+ }
+
+ #region default lexiconvalues
+
+ private static List<string> CreateGenreLexiconList()
+ {
+ List<string> genreList = new List<string>();
+
+ genreList.Add("Shooter");
+ genreList.Add("Platform");
+ genreList.Add("Adventure");
+
+ return genreList;
+ }
+
+ private static List<string> CreateManufacturerLexiconList()
+ {
+ List<string> manufacturerList = new List<string>();
+
+ manufacturerList.Add("Sega");
+ manufacturerList.Add("Nintendo");
+ manufacturerList.Add("Konami");
+
+ return manufacturerList;
+ }
+
+ private static List<string> CreateSystemLexiconList()
+ {
+ List<string> systemList = new List<string>();
+ systemList.Add("");
+ systemList.Add("Atari 5200");
+ systemList.Add("Atari 7800");
+ systemList.Add("Atari Lynx");
+ systemList.Add("Atari ST");
+ systemList.Add("Atari Video Computer System");
+ systemList.Add("Commodore 64/128");
+ systemList.Add("Commodore Amiga");
+ systemList.Add("Game Boy");
+ systemList.Add("Game Boy Advance");
+ systemList.Add("Game Boy Color");
+ systemList.Add("Neo Geo");
+ systemList.Add("Nintendo 64");
+ systemList.Add("Nintendo Entertainment System");
+ systemList.Add("PlayStation");
+ systemList.Add("Sega Dreamcast");
+ systemList.Add("Sega Game Gear");
+ systemList.Add("Sega Genesis");
+ systemList.Add("Sega Master System");
+ systemList.Add("Super NES");
+ systemList.Add("TurboGrafx-16");
+ systemList.Add("Arcade");
+ systemList.Add("PC");
+
+ return systemList;
+ }
+
+ #endregion default lexiconvalues
+
+ #endregion Private Methods
+
+ /*static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
+ {
+ ApplicationItem targetApp = globalApplicationItemList.GetAppByID(curLink.TargetAppID);
+ if (targetApp != null)
+ {
+ targetApp.LaunchFile(curLink, MPGUIMode);
+ }
+ }*/
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -679,7 +679,7 @@
{
if (SaveAppItem())
{
- ApplicationItem newApplication = (ApplicationItem)ApplicationItemFactory.AppFactory.GetApplicationItem(newSourceType, null);
+ ApplicationItem newApplication = (ApplicationItem) ItemFactory.ItemFactoryInstance.GetItem(newSourceType, null);
globalApplicationList.Add(newApplication);
newApplication.FatherID = GetTreeNodeApplicationItemId();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -1128,7 +1128,7 @@
/* public ApplicationItem CloneAppItem(ApplicationItem sourceApp)
{
- ApplicationItem newApp = (ApplicationItem)ApplicationItemFactory.AppFactory.GetApplicationItem(sqlDB, sourceApp.SourceType, null, 0);
+ ApplicationItem newApp = (ApplicationItem)ItemFactory.itemFactoryInstance.GetItem(sqlDB, sourceApp.SourceType, null, 0);
newApp.Assign(sourceApp);
newApp.ApplicationItemId = -1; // to force a sql INSERT when written
Add(newApp);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -519,12 +519,12 @@
{
if ( ViewHandler.IsFilterQuery )
{
- FilterItem curFile = ( FilterItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILTERITEM, dataReader );
+ FilterItem curFile = (FilterItem) itemFactoryInstance.GetItem(ItemType.FILTERITEM, dataReader);
ItemList.Add( curFile );
}
else
{
- FileItem curFile = ( FileItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILEITEM, dataReader );
+ FileItem curFile = (FileItem) itemFactoryInstance.GetItem(ItemType.FILEITEM, dataReader);
ItemList.Add( curFile );
}
}
@@ -761,29 +761,29 @@
SQLiteParameter[] parameterArray = new SQLiteParameter[23];
ApplicationItemId = GetNewAppID(); // important to avoid subsequent inserts!
//params for question + values
- parameterArray[0] = DatabaseHandler.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
- parameterArray[1] = DatabaseHandler.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32);
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String);
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<string>( Arguments, "@arguments", DbType.String);
- parameterArray[5] = DatabaseHandler.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String);
- parameterArray[6] = DatabaseHandler.GetParameter<string>( StartupDir, "@startupDir", DbType.String );
- parameterArray[7] = DatabaseHandler.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
- parameterArray[8] = DatabaseHandler.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
- parameterArray[9] = DatabaseHandler.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String );
- parameterArray[10] = DatabaseHandler.GetParameter<string>( Source, "@source", DbType.String);
- parameterArray[11] = DatabaseHandler.GetParameter<string>( imageFile, "@imageFile", DbType.String );
- parameterArray[12] = DatabaseHandler.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
- parameterArray[13] = DatabaseHandler.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
- parameterArray[14] = DatabaseHandler.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
- parameterArray[15] = DatabaseHandler.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
- parameterArray[16] = DatabaseHandler.GetParameter<int>( Position, "@position", DbType.Int32 );
- parameterArray[17] = DatabaseHandler.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
- parameterArray[18] = DatabaseHandler.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
- parameterArray[19] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32);
- parameterArray[20] = DatabaseHandler.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean);
- parameterArray[21] = DatabaseHandler.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String);
- parameterArray[22] = DatabaseHandler.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String);
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>( Arguments, "@arguments", DbType.String);
+ parameterArray[5] = dbHandlerInstance.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String);
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>( StartupDir, "@startupDir", DbType.String );
+ parameterArray[7] = dbHandlerInstance.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
+ parameterArray[8] = dbHandlerInstance.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String );
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>( Source, "@source", DbType.String);
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>( imageFile, "@imageFile", DbType.String );
+ parameterArray[12] = dbHandlerInstance.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
+ parameterArray[13] = dbHandlerInstance.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
+ parameterArray[14] = dbHandlerInstance.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
+ parameterArray[15] = dbHandlerInstance.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
+ parameterArray[16] = dbHandlerInstance.GetParameter<int>( Position, "@position", DbType.Int32 );
+ parameterArray[17] = dbHandlerInstance.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
+ parameterArray[18] = dbHandlerInstance.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
+ parameterArray[19] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32);
+ parameterArray[20] = dbHandlerInstance.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean);
+ parameterArray[21] = dbHandlerInstance.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String);
+ parameterArray[22] = dbHandlerInstance.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String);
// " + ProgramUtils.TrueOrFalseToInt(UseShellExecute.ToString()) + @",
//'" + ProgramUtils.ApplicationTypeToString(SourceType) + @"',
@@ -866,29 +866,29 @@
SQLiteParameter[] parameterArray = new SQLiteParameter[23];
//params for question + values
- parameterArray[0] = DatabaseHandler.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
- parameterArray[1] = DatabaseHandler.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32 );
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String );
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<string>( Arguments, "@arguments", DbType.String);
- parameterArray[5] = DatabaseHandler.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String );
- parameterArray[6] = DatabaseHandler.GetParameter<string>( StartupDir, "@startupDir", DbType.String);
- parameterArray[7] = DatabaseHandler.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
- parameterArray[8] = DatabaseHandler.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
- parameterArray[9] = DatabaseHandler.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String);
- parameterArray[10] = DatabaseHandler.GetParameter<string>( Source, "@source", DbType.String );
- parameterArray[11] = DatabaseHandler.GetParameter<string>( imageFile, "@imageFile", DbType.String );
- parameterArray[12] = DatabaseHandler.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
- parameterArray[13] = DatabaseHandler.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
- parameterArray[14] = DatabaseHandler.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
- parameterArray[15] = DatabaseHandler.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
- parameterArray[16] = DatabaseHandler.GetParameter<int>( Position, "@position", DbType.Int32);
- parameterArray[17] = DatabaseHandler.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
- parameterArray[18] = DatabaseHandler.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
- parameterArray[19] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
- parameterArray[20] = DatabaseHandler.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean );
- parameterArray[21] = DatabaseHandler.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String );
- parameterArray[22] = DatabaseHandler.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String );
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>( FatherID, "@fatherNodeId", DbType.Int32 );
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String );
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>( Arguments, "@arguments", DbType.String);
+ parameterArray[5] = dbHandlerInstance.GetParameter<string>( ProgramUtils.WindowStyleToStr( WindowStyle ), "@windowStyle", DbType.String );
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>( StartupDir, "@startupDir", DbType.String);
+ parameterArray[7] = dbHandlerInstance.GetParameter<bool>( UseShellExecute, "@useShellExecute", DbType.Boolean );
+ parameterArray[8] = dbHandlerInstance.GetParameter<bool>( UseQuotes, "@useQuotes", DbType.Boolean);
+ parameterArray[9] = dbHandlerInstance.GetParameter<string>( ProgramUtils.ApplicationTypeToString( SourceType ), "@applicationItemType", DbType.String);
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>( Source, "@source", DbType.String );
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>( imageFile, "@imageFile", DbType.String );
+ parameterArray[12] = dbHandlerInstance.GetParameter<string>( FileDirectory, "@fileDirectory", DbType.String );
+ parameterArray[13] = dbHandlerInstance.GetParameter<string>( ImageDirectory, "@imageDirectory", DbType.String );
+ parameterArray[14] = dbHandlerInstance.GetParameter<string>( ValidExtensions, "@validExtensions", DbType.String);
+ parameterArray[15] = dbHandlerInstance.GetParameter<bool>( ImportValidImagesOnly, "@importValidImagesOnly", DbType.Boolean );
+ parameterArray[16] = dbHandlerInstance.GetParameter<int>( Position, "@position", DbType.Int32);
+ parameterArray[17] = dbHandlerInstance.GetParameter<bool>( Enabled, "@enabled", DbType.Boolean);
+ parameterArray[18] = dbHandlerInstance.GetParameter<bool>( RefreshGUIAllowed, "@refreshGUIAllowed", DbType.Boolean );
+ parameterArray[19] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
+ parameterArray[20] = dbHandlerInstance.GetParameter<bool>( WaitForExit, "@waitForExit", DbType.Boolean );
+ parameterArray[21] = dbHandlerInstance.GetParameter<string>( PreLaunch, "@preLaunch", DbType.String );
+ parameterArray[22] = dbHandlerInstance.GetParameter<string>( PostLaunch, "@postLaunch", DbType.String );
try
{
@@ -936,7 +936,7 @@
if ( ApplicationItemId == -1 ) return;
SQLiteParameter[] paramArray = new SQLiteParameter[1];
- paramArray[0] = DatabaseHandler.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
+ paramArray[0] = dbHandlerInstance.GetParameter<int>( ApplicationItemId, "@applicationItemId", DbType.Int32 );
try
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -32,23 +32,24 @@
namespace GUIPrograms.Items
{
/// <summary>
- /// Factory object that creates the matchin Application descendant class
+ /// Factory like object that creates the matchin Application descendant class
/// depending on the sourceType parameter
/// Descendant classes differ in LOADING and REFRESHING filelists
/// </summary>
- public class ApplicationItemFactory
+ public class ItemFactory
{
- static public ApplicationItemFactory AppFactory = new ApplicationItemFactory();
-
- // singleton. Dont allow any instance of this class
- private ApplicationItemFactory() { }
+ static private ItemFactory itemFactoryInstance = new ItemFactory();
- static ApplicationItemFactory()
+ public static ItemFactory ItemFactoryInstance
{
- // nothing to create......
+ get { return ItemFactory.itemFactoryInstance; }
}
+
+ // singleton. Dont allow any instance of this class
+ private ItemFactory() { }
+ static ItemFactory() { }
- public BaseItem GetApplicationItem(ItemType sourceType,SQLiteDataReader dataReader)
+ public BaseItem GetItem(ItemType sourceType,SQLiteDataReader dataReader)
{
BaseItem item = null;
switch (sourceType)
@@ -81,7 +82,7 @@
private ApplicationItem AppItemFactory(SQLiteDataReader dataReader,ItemType sourceType)
{
- ApplicationItem item = null;//= (ApplicationItem)appFactory.GetApplicationItem(sqlDB, ProgramUtils.GetSourceType(results, recordIndex, "applicationItemType"), null, 0);
+ ApplicationItem item = null;//= (ApplicationItem)appFactory.GetItem(sqlDB, ProgramUtils.GetSourceType(results, recordIndex, "applicationItemType"), null, 0);
switch (sourceType)
{
@@ -130,8 +131,6 @@
return item;
}
-
-
private FileItem FileItemFactory(SQLiteDataReader dataReader)
{
FileItem newFile = new FileItem();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGrouper.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -137,12 +137,12 @@
{
if ( ViewHandler.IsFilterQuery )
{
- FilterItem curFile = ( FilterItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILTERITEM, dataReader );
+ FilterItem curFile = ( FilterItem ) itemFactoryInstance.GetItem( ItemType.FILTERITEM, dataReader );
ItemList.Add( curFile );
}
else
{
- FileItem curFile = ( FileItem ) ApplicationItemFactory.AppFactory.GetApplicationItem( ItemType.FILEITEM, dataReader );
+ FileItem curFile = ( FileItem ) itemFactoryInstance.GetItem( ItemType.FILEITEM, dataReader );
ItemList.Add( curFile );
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/BaseItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -23,6 +23,7 @@
{
protected DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
+ protected ItemFactory itemFactoryInstance = ItemFactory.ItemFactoryInstance;
public ProgramViewHandler ViewHandler = ProgramViewHandler.Instance;
public string filePath = "";
//s protected FilelinkItemList fileLinks = null;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -460,22 +460,22 @@
SQLiteParameter[] parameterArray = new SQLiteParameter[15];
// parameterArray[0] = GetParameter<int>( ApplicationItemId, "@fileid", DbType.Int32, "applicationId" );
- parameterArray[0] = DatabaseHandler.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
- parameterArray[1] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String );
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
- parameterArray[5] = DatabaseHandler.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
- parameterArray[6] = DatabaseHandler.GetParameter<string>( Country, "@country", DbType.String );
- parameterArray[7] = DatabaseHandler.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32 );
- parameterArray[8] = DatabaseHandler.GetParameter<int>( Year, "@year", DbType.Int32 );
- parameterArray[9] = DatabaseHandler.GetParameter<int>( Rating, "@rating", DbType.Int32 );
- parameterArray[10] = DatabaseHandler.GetParameter<string>( Overview, "@overview", DbType.String );
- parameterArray[11] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
- parameterArray[12] = DatabaseHandler.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
- parameterArray[13] = DatabaseHandler.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
- parameterArray[14] = DatabaseHandler.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
- // parameterArray[16] = DatabaseHandler.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
+ parameterArray[1] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String );
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
+ parameterArray[5] = dbHandlerInstance.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
+ parameterArray[6] = dbHandlerInstance.GetParameter<string>( Country, "@country", DbType.String );
+ parameterArray[7] = dbHandlerInstance.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32 );
+ parameterArray[8] = dbHandlerInstance.GetParameter<int>( Year, "@year", DbType.Int32 );
+ parameterArray[9] = dbHandlerInstance.GetParameter<int>( Rating, "@rating", DbType.Int32 );
+ parameterArray[10] = dbHandlerInstance.GetParameter<string>( Overview, "@overview", DbType.String );
+ parameterArray[11] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
+ parameterArray[12] = dbHandlerInstance.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
+ parameterArray[13] = dbHandlerInstance.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
+ parameterArray[14] = dbHandlerInstance.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
+ // parameterArray[16] = dbHandlerInstance.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
try
{
@@ -539,23 +539,23 @@
{
SQLiteParameter[] parameterArray = new SQLiteParameter[16];
- parameterArray[0] = DatabaseHandler.GetParameter<int>( FileID, "@fileid", DbType.Int32);
- parameterArray[1] = DatabaseHandler.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
- parameterArray[2] = DatabaseHandler.GetParameter<string>( Title, "@title", DbType.String );
- parameterArray[3] = DatabaseHandler.GetParameter<string>( Filename, "@filename", DbType.String );
- parameterArray[4] = DatabaseHandler.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
- parameterArray[5] = DatabaseHandler.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
- parameterArray[6] = DatabaseHandler.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
- parameterArray[7] = DatabaseHandler.GetParameter<string>( Country, "@country", DbType.String );
- parameterArray[8] = DatabaseHandler.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32);
- parameterArray[9] = DatabaseHandler.GetParameter<int>( Year, "@year", DbType.Int32 );
- parameterArray[10] = DatabaseHandler.GetParameter<int>( Rating, "@rating", DbType.Int32 );
- parameterArray[11] = DatabaseHandler.GetParameter<string>( Overview, "@overview", DbType.String );
- parameterArray[12] = DatabaseHandler.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
- parameterArray[13] = DatabaseHandler.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
- parameterArray[14] = DatabaseHandler.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
- parameterArray[15] = DatabaseHandler.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
- // parameterArray[17] = DatabaseHandler.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>( FileID, "@fileid", DbType.Int32);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>( AppID, "@applicationId", DbType.Int32 );
+ parameterArray[2] = dbHandlerInstance.GetParameter<string>( Title, "@title", DbType.String );
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>( Filename, "@filename", DbType.String );
+ parameterArray[4] = dbHandlerInstance.GetParameter<string>( Imagefile, "@imagefile", DbType.String );
+ parameterArray[5] = dbHandlerInstance.GetParameter<int>( GenreId, "@genreId", DbType.Int32 );
+ parameterArray[6] = dbHandlerInstance.GetParameter<int>( GenreStyleId, "@genreStyleId", DbType.Int32 );
+ parameterArray[7] = dbHandlerInstance.GetParameter<string>( Country, "@country", DbType.String );
+ parameterArray[8] = dbHandlerInstance.GetParameter<int>( ManufacturerId, "@manufacturerId", DbType.Int32);
+ parameterArray[9] = dbHandlerInstance.GetParameter<int>( Year, "@year", DbType.Int32 );
+ parameterArray[10] = dbHandlerInstance.GetParameter<int>( Rating, "@rating", DbType.Int32 );
+ parameterArray[11] = dbHandlerInstance.GetParameter<string>( Overview, "@overview", DbType.String );
+ parameterArray[12] = dbHandlerInstance.GetParameter<int>( PlatformId, "@platformId", DbType.Int32 );
+ parameterArray[13] = dbHandlerInstance.GetParameter<DateTime>( LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime );
+ parameterArray[14] = dbHandlerInstance.GetParameter<int>( LaunchCount, "@launchcount", DbType.Int32 );
+ parameterArray[15] = dbHandlerInstance.GetParameter<string>( GameInfoURL, "@gameInfoUrl", DbType.String );
+ // parameterArray[17] = dbHandlerInstance.GetParameter<bool>( IsFolder, "@isFolder", DbType.Boolean );
string sqlStmt = @"
UPDATE
@@ -591,9 +591,9 @@
LaunchCount = LaunchCount + 1;
SQLiteParameter[] parameterArray = new SQLiteParameter[3];
- parameterArray[0] = DatabaseHandler.GetParameter<DateTime>(LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime);
- parameterArray[1] = DatabaseHandler.GetParameter<int>(LaunchCount, "@launchCount", DbType.Int32);
- parameterArray[2] = DatabaseHandler.GetParameter<int>(FileID, "@fileId", DbType.Int32);
+ parameterArray[0] = dbHandlerInstance.GetParameter<DateTime>(LastTimeLaunched, "@lastTimeLaunched", DbType.DateTime);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>(LaunchCount, "@launchCount", DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<int>(FileID, "@fileId", DbType.Int32);
try
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-14 06:47:43 UTC (rev 835)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs 2007-08-14 09:28:48 UTC (rev 836)
@@ -99,10 +99,10 @@
private void Insert()
{
SQLiteParameter[] parameterArray = new SQLiteParameter[3];
- parameterArray[0] = DatabaseHandler.GetParameter<int>(TargetAppID,"@targetApplicationItemId",DbType.Int32);
- parameterArray[1] = DatabaseHandler.GetParameter<int>(AppID,"@applicationItemId",DbType.Int32);
- parameterArray[2] = DatabaseHandler.GetParameter<int>(FileID,"@fileId",DbType.Int32);
- parameterArray[3] = DatabaseHandler.GetParameter<string>(Filename,"@filename",DbType.String);
+ parameterArray[0] = dbHandlerInstance.GetParameter<int>(TargetAppID,"@targetApplicationItemId",DbType.Int32);
+ parameterArray[1] = dbHandlerInstance.GetParameter<int>(AppID,"@applicationItemId",DbType.Int32);
+ parameterArray[2] = dbHandlerInstance.GetParameter<int>(FileID,"@fileId",DbType.Int32);
+ parameterArray[3] = dbHandlerInstance.GetParameter<string>(Filename,"@filename",DbType.String);
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
