CWS-TOOLING: integrate CWS dba31g

2009-02-06 09:31:37 +0100 fs  r267443 : line ends
2009-02-06 09:31:16 +0100 fs  r267442 : line ends
2009-01-26 09:21:13 +0100 msc  r266904 : #i10000# reactive tests
2009-01-21 12:38:53 +0100 msc  r266657 : #i98316# add bugid
2009-01-20 14:49:04 +0100 msc  r266584 : i97307
2009-01-20 13:43:22 +0100 oj  r266572 : #i978i97860# merge changes from dba31h
2009-01-19 12:12:27 +0100 oj  r266487 : #i97307# wrong shortcuts
2009-01-12 11:45:03 +0100 fs  r266139 : #i97867# ImplPaint: don't paint if there are not items (yet)
2009-01-08 20:34:46 +0100 fs  r266039 : ignore output paths
2009-01-08 20:25:45 +0100 fs  r266038 : spelling: unxols4 -> unxsols4
2009-01-08 20:16:10 +0100 fs  r266037 : BUILD_QADEVOOO
2009-01-08 20:15:35 +0100 fs  r266036 : ignore output paths
2009-01-07 22:47:01 +0100 fs  r265978 : close the document after the test
2009-01-07 22:40:22 +0100 fs  r265977 : tweak the test, some behavior worked in a timing-dependent fashion only
2009-01-07 13:21:48 +0100 lla  r265961 : #i96526# need FileAccess instead of File due to URL incompatibity
2009-01-07 12:27:19 +0100 lla  r265959 : #i96526# need FileAccess instead of File due to URL incompatibity
2009-01-06 13:30:04 +0100 fs  r265917 : #158964# GetFormControl: don't accept requests for model which do not belong to the page displayed in the given view
2009-01-06 13:30:04 +0100 fs  r265916 : #158964# GetUnoControl: don't accept requests for a view where a foreign page is displayed
2009-01-06 13:26:37 +0100 fs  r265915 : #158964# FmXPageViewWinRec::dispose: catch exceptions (fixes the symptom, the root cause is fixed elsewhere)
2009-01-06 09:52:38 +0100 oj  r265897 : #i97307# shortcuts
2009-01-06 09:41:26 +0100 fs  r265896 : #i10000#
2009-01-05 13:40:38 +0100 fs  r265866 : CWS-TOOLING: rebase CWS dba31g to trunk@265758 (milestone: DEV300:m38)
2008-12-18 11:35:43 +0100 fs  r265678 : document the new InputRequired property
2008-12-17 07:25:18 +0100 oj  r265578 : #i97307# insert new Accelerators handling in configuration
2008-12-16 09:52:27 +0100 lla  r265526 : #i96526# error message is a problem with no existance default.otr occur
2008-12-16 09:33:14 +0100 oj  r265525 : #i96948# remove merge conflict with StreamName
2008-12-16 09:22:12 +0100 oj  r265524 : #i96935# set reportcomponent for custom shape
2008-12-15 10:32:38 +0100 oj  r265463 : #i96965# do not add connection for selfreferencing table
2008-12-12 14:00:56 +0100 fs  r265416 : #i97044# EnableFocusSelectionHide=FALSE => don't hide selection when not focused (this is more of a side effect), and preserve the selection when gaining the focus (this is the desired effect)
2008-12-11 15:32:32 +0100 fs  r265319 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 15:31:25 +0100 fs  r265317 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 13:45:06 +0100 fs  r265296 : #i97137#
2008-12-11 12:43:00 +0100 fs  r265285 : #i97134#
2008-12-10 13:20:28 +0100 lla  r265175 : #94067# add (APP|SYS)FONT to XUnitConversion interface implementation
2008-12-10 13:08:22 +0100 lla  r265173 : #i94067# add (APP|SYS)FONT
2008-12-10 09:21:39 +0100 fs  r265151 : #i95010# implement a non-hacky solution for #i94033#, by making Begin/Do/EndCompleteRedraw virtual
2008-12-09 17:29:32 +0100 fs  r265120 : #i96636#

5 files changed, 65 insertions, 4 deletions

diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 59b79b2c2496..ef8a63146e4e 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -44,7 +44,9 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
 { // extends ReportWizard
 
     // ReportTextDocument CurReportDocument;
-    IReportDocument CurReportDocument;//    PropertyValue[] CurProperties;
+    IReportDocument CurReportDocument;
+
+//    PropertyValue[] CurProperties;
     static boolean bStopProcess;
     static String sProgressDBConnection;
     static String sProgressDataImport;
diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java
index b4e7ac32e9c1..af8476f5c3e9 100644
--- a/wizards/com/sun/star/wizards/report/IReportDocument.java
+++ b/wizards/com/sun/star/wizards/report/IReportDocument.java
@@ -257,4 +257,10 @@ public interface IReportDocument
     public void setCommandType(int CommandType);
 
     public void setCommand(String Command);
+
+    /**
+     * check internal invariants
+     * @throws a
+     */
+    public void checkInvariants() throws java.lang.Exception;
 }
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 27e88e287585..b7e7d2c4f47a 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -61,7 +61,8 @@ public class ReportLayouter
     public String[][] LayoutFiles;
     public String[][] ContentFiles;
     // private Desktop.OfficePathRetriever curofficepath;
-    Object aOrientationImage;    // boolean m_bLandscape = true;
+    Object aOrientationImage;
+    // boolean m_bLandscape = true;
     private XMultiServiceFactory m_xMSF;
 
     public ReportLayouter(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, UnoDialog _CurUnoDialog)
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index d7f38eb37b9c..fb45ad376107 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -612,7 +612,9 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
     public void setGrouping(String[] aGroupFieldNames)
     {
         getRecordParser().prependSortFieldNames(aGroupFieldNames);
-    }// TODO: we have to change to String List!!!!
+    }
+
+// TODO: we have to change to String List!!!!
     private ArrayList m_aReportPath = null;
 
     public ArrayList getReportPath()
@@ -728,4 +730,8 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         getRecordParser().Command = _sCommand;
     // throw new UnsupportedOperationException("Not supported yet.");
     }
+
+    public void checkInvariants() throws java.lang.Exception
+    {
+    }
 }
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 7d9db8c76488..65ec553f6183 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -35,6 +35,7 @@ package com.sun.star.wizards.report;
 // import com.sun.star.wizards.reportbuilder.ReportBuilderImplementation;
 import com.sun.star.awt.Size;
 import com.sun.star.awt.TextEvent;
+import com.sun.star.awt.VclWindowPeerAttribute;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XFixedText;
@@ -49,6 +50,8 @@ import com.sun.star.deployment.XPackageInformationProvider;
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XServiceInfo;
+import com.sun.star.logging.XLogger;
+import com.sun.star.logging.XLoggerPool;
 import com.sun.star.sdb.CommandType;
 
 import com.sun.star.uno.AnyConverter;
@@ -92,7 +95,9 @@ public class ReportWizard extends WizardDialog implements XTextListener, XComple
     public static final int SOGROUPPAGE = 3;
     public static final int SOSORTPAGE = 4;
     public static final int SOTEMPLATEPAGE = 5;
-    public static final int SOSTOREPAGE = 6;    // ReportTextDocument CurReportDocument;
+    public static final int SOSTOREPAGE = 6;
+
+    // ReportTextDocument CurReportDocument;
     // ReportTextImplementation CurReportDocument;
     IReportDocument CurReportDocument;
     static String sMsgWizardName;
@@ -564,6 +569,26 @@ public class ReportWizard extends WizardDialog implements XTextListener, XComple
         return sLocation;
     }
 
+private static XLogger m_xLogger;
+
+private static void initializeLogger(XMultiServiceFactory _xMSF)
+{
+    XComponentContext xContext = Helper.getComponentContext(_xMSF);
+
+    Object aLoggerPool = xContext.getValueByName("/singletons/com.sun.star.logging.LoggerPool");
+    if (aLoggerPool == null)
+    {
+        System.out.println("Can't get singleton from logging");
+    }
+    final XLoggerPool xLoggerPool = (XLoggerPool)UnoRuntime.queryInterface(XLoggerPool.class, aLoggerPool);
+    m_xLogger = xLoggerPool.getNamedLogger("com.sun.star.wizards.ReportBuilder");
+}
+
+public static XLogger getLogger()
+{
+    return m_xLogger;
+}
+
     public XComponent[] startReportWizard(XMultiServiceFactory _xMSF, PropertyValue[] CurPropertyValue)
     {
         return startReportWizard(_xMSF, CurPropertyValue, false);
@@ -571,9 +596,13 @@ public class ReportWizard extends WizardDialog implements XTextListener, XComple
 
     public XComponent[] startReportWizard(XMultiServiceFactory _xMSF, PropertyValue[] CurPropertyValue, boolean _bDebug)
     {
+            initializeLogger(_xMSF);
+            getLogger().log(com.sun.star.logging.LogLevel.SEVERE, "Start Report Wizard");
+
         XComponent[] ret = null;
         this.xMSF = _xMSF;
         DBGPROPERTYVALUE = CurPropertyValue;
+
         // CurReportDocument = new ReportTextDocument(xMSF, ReportPath + "/stl-default.ott", m_oResource );
         // if (isReportBuilderInstalled())
         // {
@@ -655,11 +684,15 @@ public class ReportWizard extends WizardDialog implements XTextListener, XComple
 
             //        CurDBMetaData = CurReportDocument.getRecordParser();
 //                tests();
+
             if (CurReportDocument.getRecordParser().getConnection(CurPropertyValue))
             {
                 // CurReportDocument.getDoc().xProgressBar.setValue(20);
                 CurReportDocument.getRecordParser().oSQLQueryComposer = new SQLQueryComposer(CurReportDocument.getRecordParser());
                 buildSteps();
+
+                CurReportDocument.checkInvariants();
+
                 this.CurDBCommandFieldSelection.preselectCommand(CurPropertyValue, false);
 
                 createWindowPeer(CurReportDocument.getWizardParent());
@@ -671,6 +704,19 @@ public class ReportWizard extends WizardDialog implements XTextListener, XComple
             }
             CurReportDocument.getRecordParser().dispose();
         }
+        catch (java.io.IOException e)
+        {
+            String sMessage = e.getMessage();
+            if (sMessage.equals("default.otr"))
+            {
+                sMessage = m_oResource.getResText(UIConsts.RID_REPORT + 92);
+            }
+            else
+            {
+            }
+            // show a dialog with the error message
+            SystemDialog.showMessageBox(xMSF, "ErrorBox", VclWindowPeerAttribute.OK, sMessage);
+        }
         catch (java.lang.Exception jexception)
         {
             jexception.printStackTrace(System.out);