--- a/javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettings.cpp	Fri May 14 15:47:24 2010 +0300
+++ b/javamanager/javasettings/appsettingsview_qt/src/javaapplicationsettings.cpp	Thu May 27 12:49:31 2010 +0300
@@ -25,6 +25,8 @@
     iTableName = "";
     iFilterColumnName = L"";
     iFilterColumnValue = L"";
+    iStorageValuesFilter = L"";
+    iValuesColumnName = L"";
 }
 
 JavaApplicationSettings::JavaApplicationSettings(const QString& aName, const QStringList& aValues):
@@ -37,6 +39,8 @@
     iTableName = "";
     iFilterColumnName = L"";
     iFilterColumnValue = L"";
+    iStorageValuesFilter = L"";
+    iValuesColumnName = L"";
 }
 
 JavaApplicationSettings::JavaApplicationSettings(const QString& aName, const QStringList& aValues, const std::wstring& aColumnName, const std::string& aTableName, const std::vector<std::wstring>& aStorageValues):
@@ -50,9 +54,11 @@
     iStorageValues = aStorageValues;
     iFilterColumnName = L"";
     iFilterColumnValue = L"";
+    iStorageValuesFilter = L"";
+    iValuesColumnName = L"";
 }
 
-JavaApplicationSettings::JavaApplicationSettings(const QString& aName, const QStringList& aValues, const std::wstring& aColumnName, const std::string& aTableName, const std::vector<std::wstring>& aStorageValues, const std::wstring& aFilterColumnName, const std::wstring& aFilterColumnValue):
+JavaApplicationSettings::JavaApplicationSettings(const QString& aName, const QStringList& aValues, const std::wstring& aColumnName, const std::string& aTableName, const std::vector<std::wstring>& aStorageValues, const std::wstring& aFilterColumnName, const std::wstring& aFilterColumnValue,  const std::wstring& aValuesColumnName):
         iValues(aValues)
 {
     iName = aName;
@@ -63,6 +69,8 @@
     iStorageValues = aStorageValues;
     iFilterColumnName = aFilterColumnName;
     iFilterColumnValue = aFilterColumnValue;
+    iStorageValuesFilter = L"";
+    iValuesColumnName = aValuesColumnName;
 }
 
 void JavaApplicationSettings::setCurrentValue(int aCurrentValue)
@@ -83,6 +91,14 @@
     return null;
 }
 
+void JavaApplicationSettings::removeValue(int aValueIndex)
+{
+    if (aValueIndex >= 0 && aValueIndex < iStorageValues.size())
+        iStorageValues.erase(iStorageValues.begin() + aValueIndex);
+    if (aValueIndex >= 0 && aValueIndex < iValues.size())
+        iValues.erase(iValues.begin() + aValueIndex);
+}
+
 int JavaApplicationSettings::getValue(const QString& aValue)
 {
     int value = -1;
@@ -101,7 +117,7 @@
     iId = aId;
 }
 
-const HbDataFormModelItem * JavaApplicationSettings::getId()
+HbDataFormModelItem * JavaApplicationSettings::getId()
 {
     return iId;
 }
@@ -141,6 +157,11 @@
     return iColumnName;
 }
 
+const std::wstring& JavaApplicationSettings::getValuesColumnName()
+{
+    return iValuesColumnName;
+}
+    
 const std::string& JavaApplicationSettings::getTableName()
 {
     return iTableName;
@@ -151,6 +172,16 @@
     return iStorageValues;
 }
 
+void JavaApplicationSettings::setStorageValuesFilter(const std::wstring& aStorageValuesFilter)
+{
+    iStorageValuesFilter = aStorageValuesFilter;
+}
+
+const std::wstring& JavaApplicationSettings::getStorageValuesFilter()
+{
+    return iStorageValuesFilter;
+}
+
 const std::wstring& JavaApplicationSettings::getFilterColumnName()
 {
     return iFilterColumnName;