CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 97 insertions, 72 deletions

diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 9e481ae56e75..44b8833be6ea 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -36,47 +36,64 @@ import java.util.*;
 import com.sun.star.lang.Locale;
 import com.sun.star.wizards.common.*;
 
-public class QueryMetaData extends CommandMetaData {
+public class QueryMetaData extends CommandMetaData
+{
 
     FieldColumn CurFieldColumn;
     public String Command;
-    Vector CommandNamesV;
-    public PropertyValue[][] FilterConditions = new PropertyValue[][] {};
-    public PropertyValue[][] GroupByFilterConditions = new PropertyValue[][] {};
-    public String[] UniqueAggregateFieldNames = new String[]{};
+    // Vector CommandNamesV;
+    private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][] {}; */
+
+    public PropertyValue[][] GroupByFilterConditions = new PropertyValue[][]
+    {
+    };
+    public String[] UniqueAggregateFieldNames = new String[]
+    {
+    };
     public int Type = QueryType.SODETAILQUERY;
 
-    public static interface QueryType {
+    public static interface QueryType
+    {
+
         final static int SOSUMMARYQUERY = 0;
         final static int SODETAILQUERY = 1;
-
     }
 
-    public QueryMetaData(XMultiServiceFactory xMSF, Locale CharLocale, NumberFormatter oNumberFormatter) {
+    public QueryMetaData(XMultiServiceFactory xMSF, Locale CharLocale, NumberFormatter oNumberFormatter)
+    {
         super(xMSF, CharLocale, oNumberFormatter);
     }
 
-    public QueryMetaData(XMultiServiceFactory _xMSF) {
+    public QueryMetaData(XMultiServiceFactory _xMSF)
+    {
         super(_xMSF);
     }
 
-    public void setFilterConditions(PropertyValue[][] _FilterConditions) {
-        this.FilterConditions = _FilterConditions;
+    public void setFilterConditions(PropertyValue[][] _FilterConditions)
+    {
+        this.m_aFilterConditions = _FilterConditions;
     }
 
-    public PropertyValue[][] getFilterConditions() {
-        return this.FilterConditions;
+    public PropertyValue[][] getFilterConditions()
+    {
+        if (m_aFilterConditions == null)
+        {
+            m_aFilterConditions = new PropertyValue[][]
+                    {
+                    };
+        }
+        return m_aFilterConditions;
     }
 
-    public void setGroupByFilterConditions(PropertyValue[][] _GroupByFilterConditions) {
+    public void setGroupByFilterConditions(PropertyValue[][] _GroupByFilterConditions)
+    {
         this.GroupByFilterConditions = _GroupByFilterConditions;
     }
 
-    public PropertyValue[][] getGroupByFilterConditions() {
+    public PropertyValue[][] getGroupByFilterConditions()
+    {
         return this.GroupByFilterConditions;
     }
-
-
 //  public void addFieldColumn(String _FieldName, String _sCommandName){
 //      FieldColumn oFieldColumn = getFieldColumn(_FieldName, _sCommandName);
 //      if (oFieldColumn == null){
@@ -86,83 +103,88 @@ public class QueryMetaData extends CommandMetaData {
 //          FieldColumns = LocFieldColumns;
 //      }
 //    }
-
-
-    public void addSeveralFieldColumns(String[] _FieldNames, String _sCommandName){
+    public void addSeveralFieldColumns(String[] _FieldNames, String _sCommandName)
+    {
         Vector oToBeAddedFieldColumns = new Vector();
-        for (int i = 0; i < _FieldNames.length; i++){
+        for (int i = 0; i < _FieldNames.length; i++)
+        {
             FieldColumn oFieldColumn = getFieldColumn(_FieldNames[i], _sCommandName);
-            if (oFieldColumn == null){
-                oToBeAddedFieldColumns.add( new FieldColumn(this, _FieldNames[i], _sCommandName, false));
+            if (oFieldColumn == null)
+            {
+                oToBeAddedFieldColumns.add(new FieldColumn(this, _FieldNames[i], _sCommandName, false));
             }
         }
-        if (oToBeAddedFieldColumns.size() > 0){
+        if (oToBeAddedFieldColumns.size() > 0)
+        {
             int nOldFieldCount = FieldColumns.length;
             FieldColumn[] LocFieldColumns = new FieldColumn[nOldFieldCount + oToBeAddedFieldColumns.size()];
             System.arraycopy(FieldColumns, 0, LocFieldColumns, 0, nOldFieldCount);
-            for (int i = 0; i < oToBeAddedFieldColumns.size(); i++){
+            for (int i = 0; i < oToBeAddedFieldColumns.size(); i++)
+            {
                 LocFieldColumns[nOldFieldCount + i] = (FieldColumn) oToBeAddedFieldColumns.elementAt(i);
             }
             FieldColumns = LocFieldColumns;
         }
     }
 
-
-    public void reorderFieldColumns(String[] _sDisplayFieldNames){
+    public void reorderFieldColumns(String[] _sDisplayFieldNames)
+    {
         FieldColumn[] LocFieldColumns = new FieldColumn[FieldColumns.length];
-        for (int i = 0; i < _sDisplayFieldNames.length; i++){
+        for (int i = 0; i < _sDisplayFieldNames.length; i++)
+        {
             FieldColumn LocFieldColumn = this.getFieldColumnByDisplayName(_sDisplayFieldNames[i]);
             LocFieldColumns[i] = LocFieldColumn;
         }
         System.arraycopy(LocFieldColumns, 0, FieldColumns, 0, LocFieldColumns.length);
     }
 
-
-    public void removeSeveralFieldColumnsByDisplayFieldName(String[] _DisplayFieldNames){
+    public void removeSeveralFieldColumnsByDisplayFieldName(String[] _DisplayFieldNames)
+    {
         Vector oRemainingFieldColumns = new Vector();
         int a = 0;
-        for (int n = 0; n < FieldColumns.length; n++){
-            String sDisplayFieldName = FieldColumns[n].DisplayFieldName;
-            if (!(JavaTools.FieldInList(_DisplayFieldNames, sDisplayFieldName) > -1)){
+        for (int n = 0; n < FieldColumns.length; n++)
+        {
+            String sDisplayFieldName = FieldColumns[n].getDisplayFieldName();
+            if (!(JavaTools.FieldInList(_DisplayFieldNames, sDisplayFieldName) > -1))
+            {
                 oRemainingFieldColumns.add(FieldColumns[n]);
             }
         }
         FieldColumns = new FieldColumn[oRemainingFieldColumns.size()];
         oRemainingFieldColumns.toArray(FieldColumns);
-                    }
-
+    }
 
     public void removeFieldColumn(String _sFieldName, String _sCommandName)
+    {
+        FieldColumn oFieldColumn = getFieldColumn(_sFieldName, _sCommandName);
+        int a = 0;
+        if (oFieldColumn != null)
         {
-            FieldColumn oFieldColumn = getFieldColumn(_sFieldName, _sCommandName);
-            int a = 0;
-            if (oFieldColumn != null)
+            FieldColumn[] LocFieldColumns = new FieldColumn[FieldColumns.length - 1];
+            for (int i = 0; i < FieldColumns.length; i++)
             {
-                FieldColumn[] LocFieldColumns = new FieldColumn[FieldColumns.length -1];
-                for (int i = 0; i < FieldColumns.length;i++)
+                if (!FieldColumns[i].m_sFieldName.equals(_sFieldName))
                 {
-                    if (!FieldColumns[i].FieldName.equals(_sFieldName))
+                    if (!FieldColumns[i].getCommandName().equals(_sCommandName))
                     {
-                        if (!FieldColumns[i].CommandName.equals(_sCommandName))
-                        {
-                            LocFieldColumns[a] = FieldColumns[i];
-                            a++;
-                        }
+                        LocFieldColumns[a] = FieldColumns[i];
+                        a++;
                     }
                 }
-                FieldColumns = LocFieldColumns;
             }
+            FieldColumns = LocFieldColumns;
         }
+    }
 
-
-    public String[] getIncludedCommandNames() {
-        FieldColumn CurQueryField;
-        CommandNamesV = new Vector(1);
-        String CurCommandName;
+    public String[] getIncludedCommandNames()
+    {
+        // FieldColumn CurQueryField;
+        Vector CommandNamesV = new Vector(1);
+        // String CurCommandName;
         for (int i = 0; i < FieldColumns.length; i++)
         {
-            CurQueryField = FieldColumns[i];
-            CurCommandName = CurQueryField.getCommandName();
+            final FieldColumn CurQueryField = FieldColumns[i];
+            final String CurCommandName = CurQueryField.getCommandName();
             if (!CommandNamesV.contains(CurCommandName))
             {
                 CommandNamesV.addElement(CurCommandName);
@@ -173,10 +195,11 @@ public class QueryMetaData extends CommandMetaData {
         return sIncludedCommandNames;
     }
 
-
-    public static String[] getIncludedCommandNames(String[] _FieldNames) {
+    public static String[] getIncludedCommandNames(String[] _FieldNames)
+    {
         Vector CommandNames = new Vector(1);
-        for (int i = 0; i < _FieldNames.length; i++) {
+        for (int i = 0; i < _FieldNames.length; i++)
+        {
             String CurCommandName = "";
             String[] MetaList = JavaTools.ArrayoutofString(_FieldNames[i], ".");
             if (MetaList.length > 1)
@@ -196,27 +219,31 @@ public class QueryMetaData extends CommandMetaData {
         return sIncludedCommandNames;
     }
 
-    public String[] getFieldNamesOfCommand(String _sCommandName){
+    public String[] getFieldNamesOfCommand(String _sCommandName)
+    {
         CommandObject oTable = getTableByName(_sCommandName);
         return oTable.xColumns.getElementNames();
 
     }
 
-    public void initializeFieldTitleSet(boolean _bAppendMode) {
-        try {
-            this.getIncludedCommandNames(); // fills the var CommandNamesV indirectly :-(
+    public void initializeFieldTitleSet(boolean _bAppendMode)
+    {
+        try
+        {
+            // this.getIncludedCommandNames(); // fills the var CommandNamesV indirectly :-(
             if (FieldTitleSet == null)
             {
                 FieldTitleSet = new HashMap();
             }
-            for (int i = 0; i < CommandNamesV.size(); i++)
+            String[] aCommandNames = getIncludedCommandNames();
+            for (int i = 0; i < aCommandNames.length; i++)
             {
-                CommandObject oTable = getTableByName((String) CommandNamesV.elementAt(i));
+                CommandObject oTable = getTableByName(aCommandNames[i]);
                 String sTableName = oTable.Name;
                 String[] LocFieldNames = oTable.xColumns.getElementNames();
                 for (int a = 0; a < LocFieldNames.length; a++)
                 {
-                    String sDisplayFieldName = FieldColumn.composeDisplayFieldName(LocFieldNames[a], sTableName);
+                    String sDisplayFieldName = FieldColumn.composeDisplayFieldName(sTableName, LocFieldNames[a]);
                     if (!FieldTitleSet.containsKey(sDisplayFieldName))
                     {
                         FieldTitleSet.put(sDisplayFieldName, LocFieldNames[a]);
@@ -230,10 +257,11 @@ public class QueryMetaData extends CommandMetaData {
         }
     }
 
-
-    public String[] getUniqueAggregateFieldNames(){
+    public String[] getUniqueAggregateFieldNames()
+    {
         Vector UniqueAggregateFieldVector = new Vector(0);
-        for (int i = 0; i < AggregateFieldNames.length; i++) {
+        for (int i = 0; i < AggregateFieldNames.length; i++)
+        {
             if (!UniqueAggregateFieldVector.contains(AggregateFieldNames[i][0]))
             {
                 UniqueAggregateFieldVector.add(AggregateFieldNames[i][0]);
@@ -244,7 +272,6 @@ public class QueryMetaData extends CommandMetaData {
         return UniqueAggregateFieldNames;
     }
 
-
     public boolean hasNumericalFields()
     {
         for (int i = 0; i < FieldColumns.length; i++)
@@ -257,9 +284,8 @@ public class QueryMetaData extends CommandMetaData {
         return false;
     }
 
-
-
-    public int getAggregateIndex(String _DisplayFieldName){
+    public int getAggregateIndex(String _DisplayFieldName)
+    {
         int iAggregate = -1;
         if (Type == QueryType.SOSUMMARYQUERY)
         {
@@ -267,5 +293,4 @@ public class QueryMetaData extends CommandMetaData {
         }
         return iAggregate;
     }
-
 }