#88408# Added support for WrongJavaVersion and BadPartnership exceptions.

4 files changed, 90 insertions, 9 deletions

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 87d7b25dff00..b988f5fa2f7c 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iahndl.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: sb $ $Date: 2001-08-09 06:39:14 $
+ *  last change: $Author: sb $ $Date: 2001-08-16 13:41:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,9 +79,15 @@
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include "com/sun/star/beans/PropertyValue.hpp"
 #endif
+#ifndef _COM_SUN_STAR_JAVA_WRONGJAVAVERSIONEXCEPTION_HPP_
+#include "com/sun/star/java/WrongJavaVersionException.hpp"
+#endif
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #endif
+#ifndef _COM_SUN_STAR_SYNC2_BADPARTNERSHIPEXCEPTION_HPP_
+#include "com/sun/star/sync2/BadPartnershipException.hpp"
+#endif
 #ifndef _COM_SUN_STAR_TASK_CLASSIFIEDINTERACTIONREQUEST_HPP_
 #include "com/sun/star/task/ClassifiedInteractionRequest.hpp"
 #endif
@@ -984,6 +990,8 @@ UUIInteractionHandler::handle(
     star::ucb::InteractiveCHAOSException aCHAOSException;
     star::ucb::InteractiveBadTransferURLException aTransferException;
     star::ucb::InteractiveWrongMediumException aWrongMediumException;
+    star::java::WrongJavaVersionException aWrongJavaVersionException;
+    star::sync2::BadPartnershipException aBadPartnershipException;
     try
     {
         if (aTheRequest >>= aIOException)
@@ -1301,6 +1309,40 @@ UUIInteractionHandler::handle(
             nButton = aErrorBox.Execute();
             eExecute = EXECUTE_NO;
         }
+        else if (aTheRequest >>= aWrongJavaVersionException)
+            nErrorID
+                = aWrongJavaVersionException.DetectedVersion.getLength()
+                          == 0 ?
+                      aWrongJavaVersionException.LowestSupportedVersion.
+                                                     getLength()
+                              == 0 ?
+                          ERRCODE_UUI_WRONGJAVA :
+                          static_cast< ULONG >(
+                              *new StringErrorInfo(
+                                       ERRCODE_UUI_WRONGJAVA_MIN,
+                                       aWrongJavaVersionException.
+                                           LowestSupportedVersion)) :
+                      aWrongJavaVersionException.LowestSupportedVersion.
+                                                     getLength()
+                              == 0 ?
+                          static_cast< ULONG >(
+                              *new StringErrorInfo(
+                                       ERRCODE_UUI_WRONGJAVA_VERSION,
+                                       aWrongJavaVersionException.
+                                           DetectedVersion)) :
+                          static_cast< ULONG >(
+                              *new TwoStringErrorInfo(
+                                       ERRCODE_UUI_WRONGJAVA_VERSION_MIN,
+                                       aWrongJavaVersionException.
+                                           DetectedVersion,
+                                       aWrongJavaVersionException.
+                                           LowestSupportedVersion));
+        else if (aTheRequest >>= aBadPartnershipException)
+            nErrorID = aBadPartnershipException.Partnership.getLength() == 0 ?
+                           ERRCODE_UUI_BADPARTNERSHIP :
+                           *new StringErrorInfo(
+                                    ERRCODE_UUI_BADPARTNERSHIP_NAME,
+                                    aBadPartnershipException.Partnership);
     }
     catch (std::bad_alloc const &)
     {
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index fd5c004bb376..fa2448406e8d 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ids.hrc,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sb $ $Date: 2001-08-15 13:44:03 $
+ *  last change: $Author: sb $ $Date: 2001-08-16 13:41:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 //
 //  The UUI Resources
 //
-// $Author: sb $ $Date: 2001-08-15 13:44:03 $ $Revision: 1.6 $
+// $Author: sb $ $Date: 2001-08-16 13:41:57 $ $Revision: 1.7 $
 //============================================================================
 
 #ifndef UUI_IDS_HRC
@@ -139,6 +139,12 @@
 #define ERRCODE_UUI_IO_WRONGVERSION       (ERRCODE_AREA_UUI + 35)
 #define ERRCODE_UUI_IO_NOTEXISTS_VOLUME   (ERRCODE_AREA_UUI + 36)
 #define ERRCODE_UUI_IO_NOTEXISTS_FOLDER   (ERRCODE_AREA_UUI + 37)
+#define ERRCODE_UUI_WRONGJAVA             (ERRCODE_AREA_UUI + 38)
+#define ERRCODE_UUI_WRONGJAVA_VERSION     (ERRCODE_AREA_UUI + 39)
+#define ERRCODE_UUI_WRONGJAVA_MIN         (ERRCODE_AREA_UUI + 40)
+#define ERRCODE_UUI_WRONGJAVA_VERSION_MIN (ERRCODE_AREA_UUI + 41)
+#define ERRCODE_UUI_BADPARTNERSHIP        (ERRCODE_AREA_UUI + 42)
+#define ERRCODE_UUI_BADPARTNERSHIP_NAME   (ERRCODE_AREA_UUI + 43)
 
 //============================================================================
 #define HID_DLG_LOGIN (HID_UUI_START + 0)
diff --git a/uui/source/ids.src b/uui/source/ids.src
index c8020c6e7a14..eb5f6a432629 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ids.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2001-08-15 20:06:02 $
+ *  last change: $Author: sb $ $Date: 2001-08-16 13:41:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 //
 //  Miscellaneous Resources
 //
-// $Author: kz $ $Date: 2001-08-15 20:06:02 $ $Revision: 1.25 $
+// $Author: sb $ $Date: 2001-08-16 13:41:57 $ $Revision: 1.26 $
 //============================================================================
 
 #define __RSC
@@ -1170,8 +1170,39 @@ Resource RID_UUI_ERRHDL
         Text[ arabic ] = "Folder $(ARG1) does not exist";
         Text[ catalan ] = "Folder $(ARG1) does not exist";
     };
-};
 
+    String (ERRCODE_UUI_WRONGJAVA & ERRCODE_RES_MASK)
+    {
+        Text = "Die vorhandene Java-Version wird nicht unterst�tzt";
+        Text[english] = "The installed Java version is not supported";
+    };
 
+    String (ERRCODE_UUI_WRONGJAVA_VERSION & ERRCODE_RES_MASK)
+    {
+        Text = "Die vorhandene Java-Version $(ARG1) wird nicht unterst�tzt";
+        Text[english] = "The installed Java version $(ARG1) is not supported";
+    };
+    String (ERRCODE_UUI_WRONGJAVA_MIN & ERRCODE_RES_MASK)
+    {
+        Text = "Die vorhandene Java-Version wird nicht unterst�tzt, es wird mindestens Version $(ARG1) ben�tigt";
+        Text[english] = "The installed Java version is not supported, at least versin $(ARG1) is required";
+    };
 
+    String (ERRCODE_UUI_WRONGJAVA_VERSION_MIN & ERRCODE_RES_MASK)
+    {
+        Text = "Die vorhandene Java-Version $(ARG1) wird nicht unterst�tzt, es wird mindestens Version $(ARG2) ben�tigt";
+        Text[english] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required";
+    };
+
+    String (ERRCODE_UUI_BADPARTNERSHIP & ERRCODE_RES_MASK)
+    {
+        Text = "Die zu der Partnerschaft gespeicherten Daten sind defekt";
+        Text[english] = "The data associated with the partnership are corrupted";
+    };
 
+    String (ERRCODE_UUI_BADPARTNERSHIP_NAME & ERRCODE_RES_MASK)
+    {
+        Text = "Die zu der Partnerschaft $(ARG1) gespeicherten Daten sind defekt";
+        Text[english] = "The data associated with the partnership $(ARG1) are corrupted";
+    };
+};
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index 25575fdd9706..92e067b65764 100644
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
@@ -37,10 +37,12 @@
         com.sun.star.task.PasswordContainer
     </service-dependency>
     <type>com.sun.star.beans.PropertyValue</type>
+    <type>com.sun.star.java.WrongJavaVersionException</type>
     <type>com.sun.star.lang.XMultiServiceFactory</type>
     <type>com.sun.star.lang.XServiceInfo</type>
     <type>com.sun.star.lang.XTypeProvider</type>
     <type>com.sun.star.registry.XRegistryKey</type>
+    <type>com.sun.star.sync2.BadPartnershipException</type>
     <type>com.sun.star.task.ClassifiedInteractionRequest</type>
     <type>com.sun.star.task.NoMasterException</type>
     <type>com.sun.star.task.PasswordRequest</type>