diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java index 5c74040b9650..189b8b655409 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java @@ -43,8 +43,13 @@ public class MemoryUsagePanel extends JButton implements CustomStatusBarWidget { // todo: drop unless J. will insist to keep old style look private static final boolean FRAMED_STYLE = SystemInfo.isMac || !SystemProperties.getBooleanProperty("idea.ui.old.mem.use", false); - @NonNls private static final String SAMPLE_STRING = "0000M"; private static final int MEGABYTE = 1024 * 1024; + @NonNls private static final String SAMPLE_STRING; + + static { + long maxMemory = Math.min(Runtime.getRuntime().maxMemory() / MEGABYTE, 9999); + SAMPLE_STRING = maxMemory + " of " + maxMemory + "M "; + } private static final int HEIGHT = 16; private static final Color USED_COLOR_1 = new JBColor(Gray._185, Gray._150); private static final Color USED_COLOR_2 = new JBColor(Gray._145, Gray._120); @@ -172,7 +177,9 @@ public class MemoryUsagePanel extends JButton implements CustomStatusBarWidget { // label g2.setFont(getFont()); - final String info = (usedMem / MEGABYTE) + "M"; + final long used = usedMem / MEGABYTE; + final long total = maxMem / MEGABYTE; + final String info = UIBundle.message("memory.usage.panel.message.text", used, total); final FontMetrics fontMetrics = g.getFontMetrics(); final int infoWidth = fontMetrics.charsWidth(info.toCharArray(), 0, info.length()); final int infoHeight = fontMetrics.getAscent(); diff --git a/platform/platform-resources-en/src/messages/UIBundle.properties b/platform/platform-resources-en/src/messages/UIBundle.properties index 50325c22369d..14c735122f46 100644 --- a/platform/platform-resources-en/src/messages/UIBundle.properties +++ b/platform/platform-resources-en/src/messages/UIBundle.properties @@ -65,6 +65,7 @@ tool.window.hideSide.action.name=Hide Side #0 - total, 1 - used memory.usage.panel.statistics.message=Allocated heap size: {0}M Used: {1}M #0 - used, 1 - total +memory.usage.panel.message.text={0,number,####} of {1,number,####}M go.to.line.command.name=Go to Line go.to.line.command.double.click=Click to go to line popup.hints.panel.click.to.configure.highlighting.tooltip.text=Click to configure highlighting for this file