From 82a2aa79d0f271d0b1e9d575f7a7128df2cd323b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 6 Feb 2012 19:58:19 +0100 Subject: [PATCH] More detailed 'cannot set l&f' message --- .../src/com/intellij/ide/ui/LafManagerImpl.java | 10 +++++----- .../src/messages/IdeBundle.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java index 1f4fd6388ea8..1b451d63bee9 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -308,9 +308,9 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo try { UIManager.setLookAndFeel(laf); } - catch (Exception exc) { + catch (Exception e) { Messages.showMessageDialog( - IdeBundle.message("error.cannot.set.look.and.feel", lookAndFeelInfo.getName()), + IdeBundle.message("error.cannot.set.look.and.feel", lookAndFeelInfo.getName(), e.getMessage()), CommonBundle.getErrorTitle(), Messages.getErrorIcon() ); @@ -325,9 +325,9 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo } UIManager.setLookAndFeel(laf); } - catch (Exception exc) { + catch (Exception e) { Messages.showMessageDialog( - IdeBundle.message("error.cannot.set.look.and.feel", lookAndFeelInfo.getName()), + IdeBundle.message("error.cannot.set.look.and.feel", lookAndFeelInfo.getName(), e.getMessage()), CommonBundle.getErrorTitle(), Messages.getErrorIcon() ); diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index e7945d13d573..82b6261c6940 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -633,7 +633,7 @@ checkbox.use.antialiased.font.in.editor=Use anti-aliased font # this string must start with "IDEA" idea.default.look.and.feel=IDEA (4.5 default) confirm.set.look.and.feel=&Set look and feel -error.cannot.set.look.and.feel=Cannot set {0} look and feel +error.cannot.set.look.and.feel=Cannot set {0} look and feel:
{1} warning.problem.laf.1=GTK+ look and feel is known to be problematic on a JDK prior to 1.6 b12.
Please choose another look and feel, or upgrade your JDK. More info... error.adding.action.without.icon.to.toolbar=You are adding an action without icon to the toolbar. The default icon will be added to this action. title.unable.to.add.action.without.icon.to.toolbar=Unable to add action without icon to the toolbar