X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fjalview%2Fbin%2FMemoryPercent.java;h=3288e66c12854aa4c1aa08f199a6676c25aabddb;hb=38120f6e0031a59b21cd4ae9c94c9e83f1ebc6cd;hp=90257d1a442c14e5c3d73babf09d6f1867a28fc3;hpb=390934f61c1d821fadb030f5541b1a061d1952dc;p=jalview.git diff --git a/getdown/src/getdown/core/src/main/java/jalview/bin/MemoryPercent.java b/getdown/src/getdown/core/src/main/java/jalview/bin/MemoryPercent.java index 90257d1..3288e66 100644 --- a/getdown/src/getdown/core/src/main/java/jalview/bin/MemoryPercent.java +++ b/getdown/src/getdown/core/src/main/java/jalview/bin/MemoryPercent.java @@ -29,39 +29,4 @@ public class MemoryPercent return -1; } - public static long memPercentAmount(int percent) - { - return memPercentAmount((float)percent); - } - public static long memPercentAmount(float percent) - { - long memPercentAmount = -1; - - long physicalMem = getPhysicalMemory(); - if (physicalMem > MemorySetting.applicationMinMemory) - { - // try and set at least applicationMinMemory and thereafter ensure - // leaveFreeMinMemory is left for the OS - - memPercentAmount = (long) ((physicalMem * percent) / 100F); - - // check for memory left for OS - if (physicalMem - memPercentAmount < MemorySetting.leaveFreeMinMemory) - { - memPercentAmount = physicalMem - MemorySetting.leaveFreeMinMemory; - } - - // check for minimum application memsize - if (memPercentAmount < MemorySetting.applicationMinMemory) - { - memPercentAmount = MemorySetting.applicationMinMemory; - } - } else { - // not enough memory for application, just try and grab what we can! - memPercentAmount = physicalMem; - } - - return memPercentAmount; - } - }