From 2986a63e1a9c2530edc3693fa09a377af4bfd5e5 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 11 Jun 2012 16:47:18 +0200 Subject: [PATCH] less brain-dead way of calculating array size when reallocating (IDEA-73303) --- .../openapi/editor/ex/util/SegmentArray.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java b/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java index 5d27e366e4f6..1a254ff25812 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 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. @@ -72,8 +72,11 @@ public class SegmentArray { if (newArraySize == 0) { newArraySize = 16; } - while (newArraySize <= index) { - newArraySize = newArraySize * 120 / 100; + else { + newArraySize = newArraySize * 12 / 10; + } + if (index >= newArraySize) { + newArraySize = index * 12 / 10; } int[] newArray = new int[newArraySize]; System.arraycopy(array, 0, newArray, 0, array.length); @@ -89,8 +92,11 @@ public class SegmentArray { if (newArraySize == 0) { newArraySize = 16; } - while (newArraySize <= index) { - newArraySize = newArraySize * 120 / 100; + else { + newArraySize = newArraySize * 12 / 10; + } + if (index >= newArraySize) { + newArraySize = index * 12 / 10; } T[] newArray = (T[])Array.newInstance(array.getClass().getComponentType(), newArraySize); @@ -107,9 +113,12 @@ public class SegmentArray { if (newArraySize == 0) { newArraySize = 16; } - while (newArraySize <= index) { + else { newArraySize = newArraySize * 12 / 10; } + if (index >= newArraySize) { + newArraySize = index * 12 / 10; + } short[] newArray = new short[newArraySize]; System.arraycopy(array, 0, newArray, 0, array.length); return newArray;