CWS-TOOLING: integrate CWS jl131

2009-09-02 16:42:40 +0200 jl  r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl  r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl  r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl  r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl  r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl  r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl  r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl  r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl  r274242 : #i98873# minimum java version is 1.5 since OOo 3.0

6 files changed, 56 insertions, 23 deletions

diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index da349b81848b..e29d1229bd18 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -72,7 +72,8 @@
 #define RID_STR_UNOPKG_ACCEPT_LIC_Y          (RID_DEPLOYMENT_UNOPKG_START+6)
 #define RID_STR_UNOPKG_ACCEPT_LIC_NO         (RID_DEPLOYMENT_UNOPKG_START+7)
 #define RID_STR_UNOPKG_ACCEPT_LIC_N          (RID_DEPLOYMENT_UNOPKG_START+8)
-#define RID_STR_CONCURRENTINSTANCE           (RID_DEPLOYMENT_UNOPKG_START+9)
+#define RID_STR_UNOPKG_ERROR                 (RID_DEPLOYMENT_UNOPKG_START+9)
+#define RID_STR_CONCURRENTINSTANCE           (RID_DEPLOYMENT_UNOPKG_START+10)
 
 #define RID_DEPLOYMENT_DEPENDENCIES_START    (RID_DEPLOYMENT_START + 4400)
 #define RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN  RID_DEPLOYMENT_DEPENDENCIES_START
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 319d953b1430..49d3c1c0cf8e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -236,7 +236,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "No descriptions available for this extension.";
     };
     String RID_DLG_UPDATE_NOINSTALL {
-        Text[en-US] = "The extension cannot be installed because:";
+        Text[en-US] = "The extension cannot be updated because:";
     };
     String RID_DLG_UPDATE_NODEPENDENCY {
         Text[en-US] = "Required OpenOffice.org version doesn't match:";
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index afd44f83cff6..05e514305415 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -660,10 +660,15 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
 {
     check();
     if (m_readOnly)
+    {
+        OUString message;
+        if (m_context == OUSTR("shared"))
+            message = OUSTR("You need write permissions to install a shared extension!");
+        else
+            message = OUSTR("You need write permissions to install this extension!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
-
+            message, static_cast<OWeakObject *>(this), Any() );
+    }
     Reference<XCommandEnvironment> xCmdEnv;
     if (m_xLogFile.is())
         xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) );
@@ -893,9 +898,15 @@ void PackageManagerImpl::removePackage(
 {
     check();
     if (m_readOnly)
+    {
+        OUString message;
+        if (m_context == OUSTR("shared"))
+            message = OUSTR("You need write permissions in order to remove a shared extension!");
+        else
+            message = OUSTR("You need write permissions in order to remove this extension!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
+            message, static_cast<OWeakObject *>(this), Any() );
+    }
 
     Reference<XCommandEnvironment> xCmdEnv;
     if (m_xLogFile.is())
@@ -1117,9 +1128,15 @@ void PackageManagerImpl::reinstallDeployedPackages(
 {
     check();
     if (m_readOnly)
+    {
+        OUString message;
+        if (m_context == OUSTR("shared"))
+            message = OUSTR("You need write permissions in order to install shared extensions!");
+        else
+            message = OUSTR("You need write permissions in order to install extensions!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
+            message, static_cast<OWeakObject *>(this), Any() );
+    }
 
     if (office_is_running())
         throw RuntimeException(
diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
index a3b2bac56cc5..bb5be7e8bbd6 100644
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.src
@@ -81,5 +81,12 @@ String RID_STR_UNOPKG_ACCEPT_LIC_N
 
 String RID_STR_CONCURRENTINSTANCE
 {
-    Text [ en-US ] = "You need to close the already opened Extension Manager to continue.";
+    Text [ en-US ] = "unopkg cannot be started. The lock file indicates it as already running. "
+        "If this does not apply, delete the lock file at:";
 };
+
+String RID_STR_UNOPKG_ERROR
+{
+    Text [ en-US ] = "ERROR: ";
+};
+
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index a5d1fd2f746e..5fc4136a9501 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -470,14 +470,23 @@ extern "C" int unopkg_main()
     }
     catch (deployment::DeploymentException & exc)
     {
+        OUString cause;
+        if (option_verbose)
+        {
+            cause = ::comphelper::anyToString(exc.Cause);
+        }
+        else
+        {
+            css::uno::Exception e;
+            if (exc.Cause >>= e)
+                cause = e.Message;
+        }
+
         dp_misc::writeConsoleError(
-            OUSTR("\nERROR: ") +
-            exc.Message + OUSTR("\n") +
-            OUSTR("       Cause: ") +
-            OUString(option_verbose ? ::comphelper::anyToString(exc.Cause):
-                reinterpret_cast< css::uno::Exception const *>(
-                         exc.Cause.getValue())->Message) +
-            OUSTR("\n"));
+            OUSTR("\nERROR: ") + exc.Message + OUSTR("\n"));
+        if (cause.getLength())
+            dp_misc::writeConsoleError(
+                OUSTR("       Cause: ") + cause + OUSTR("\n"));
     }
     catch (LockFileException & e)
     {
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index de8fedae2bdb..70b469fa58fa 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -471,10 +471,10 @@ Reference<XComponentContext> getUNO(
     {
         if (! s_lockfile.check( 0 ))
         {
-            //String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
-            OUString sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                              "unopkg cannot be started. The lock file indicates it as already running. "
-                              "If this does not apply, delete the lock file at:"));
+            String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
+            //Create this string before we call DeInitVCL, because this will kill
+            //the ResMgr
+            String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get()));
 
             sMsg = sMsg + OUSTR("\n") + getLockFilePath();
 
@@ -497,9 +497,8 @@ Reference<XComponentContext> getUNO(
                 DeInitVCL();
             }
 
-//            String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get()));
             throw LockFileException(
-                OUSTR("\n") + OUSTR("ERROR: ") + sMsg + OUSTR("\n"));
+                OUSTR("\n") + sError + sMsg + OUSTR("\n"));
         }
     }