diff options
Diffstat (limited to 'platform/util/src/com/intellij/util')
11 files changed, 71 insertions, 34 deletions
diff --git a/platform/util/src/com/intellij/util/ArrayUtil.java b/platform/util/src/com/intellij/util/ArrayUtil.java index 5de68c11799b..d0419de9e820 100644 --- a/platform/util/src/com/intellij/util/ArrayUtil.java +++ b/platform/util/src/com/intellij/util/ArrayUtil.java @@ -190,7 +190,7 @@ public class ArrayUtil extends ArrayUtilRt { } @NotNull - public static int[] toIntArray(@NotNull List<Integer> list) { + public static int[] toIntArray(@NotNull Collection<Integer> list) { int[] ret = newIntArray(list.size()); int i = 0; for (Integer e : list) { diff --git a/platform/util/src/com/intellij/util/EnvironmentUtil.java b/platform/util/src/com/intellij/util/EnvironmentUtil.java index 1d7016460f1e..19961bfc0b89 100644 --- a/platform/util/src/com/intellij/util/EnvironmentUtil.java +++ b/platform/util/src/com/intellij/util/EnvironmentUtil.java @@ -255,6 +255,24 @@ public class EnvironmentUtil { return getEnvironmentMap(); } + public static void inlineParentOccurrences(@NotNull Map<String, String> envs) { + Map<String, String> parentParams = new HashMap<String, String>(System.getenv()); + for (Map.Entry<String, String> entry : envs.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + if (value != null) { + String parentVal = parentParams.get(key); + if (parentVal != null && containsEnvKeySubstitution(key, value)) { + envs.put(key, value.replace("$" + key + "$", parentVal)); + } + } + } + } + + private static boolean containsEnvKeySubstitution(final String envKey, final String val) { + return ArrayUtil.find(val.split(File.pathSeparator), "$" + envKey + "$") != -1; + } + @TestOnly static Map<String, String> testLoader() { try { diff --git a/platform/util/src/com/intellij/util/concurrency/BoundedTaskExecutor.java b/platform/util/src/com/intellij/util/concurrency/BoundedTaskExecutor.java index 2ef9cfbedc61..cdc892071e01 100644 --- a/platform/util/src/com/intellij/util/concurrency/BoundedTaskExecutor.java +++ b/platform/util/src/com/intellij/util/concurrency/BoundedTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -46,8 +46,9 @@ public class BoundedTaskExecutor implements Executor { } }; - public BoundedTaskExecutor(Executor backendExecutor, int maxSimultaneousTasks) { + public BoundedTaskExecutor(@NotNull Executor backendExecutor, int maxSimultaneousTasks) { myBackendExecutor = backendExecutor; + assert maxSimultaneousTasks >= 1 : maxSimultaneousTasks; myMaxTasks = Math.max(maxSimultaneousTasks, 1); } @@ -56,7 +57,8 @@ public class BoundedTaskExecutor implements Executor { submit(task); } - public Future<?> submit(Runnable task) { + @NotNull + public Future<?> submit(@NotNull Runnable task) { final RunnableFuture<Void> future = queueTask(new FutureTask<Void>(task, null)); if (future == null) { throw new RuntimeException("Failed to queue task: " + task); @@ -64,7 +66,8 @@ public class BoundedTaskExecutor implements Executor { return future; } - public <T> Future<T> submit(Callable<T> task) { + @NotNull + public <T> Future<T> submit(@NotNull Callable<T> task) { final RunnableFuture<T> future = queueTask(new FutureTask<T>(task)); if (future == null) { throw new RuntimeException("Failed to queue task: " + task); @@ -73,7 +76,7 @@ public class BoundedTaskExecutor implements Executor { } @Nullable - private <T> RunnableFuture<T> queueTask(FutureTask<T> futureTask) { + private <T> RunnableFuture<T> queueTask(@NotNull FutureTask<T> futureTask) { if (myTaskQueue.offer(futureTask)) { processQueue(); return futureTask; diff --git a/platform/util/src/com/intellij/util/concurrency/SequentialTaskExecutor.java b/platform/util/src/com/intellij/util/concurrency/SequentialTaskExecutor.java index c05579c8f002..86fa72075e90 100644 --- a/platform/util/src/com/intellij/util/concurrency/SequentialTaskExecutor.java +++ b/platform/util/src/com/intellij/util/concurrency/SequentialTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -16,11 +16,12 @@ package com.intellij.util.concurrency; +import org.jetbrains.annotations.NotNull; + import java.util.concurrent.Executor; public class SequentialTaskExecutor extends BoundedTaskExecutor { - - public SequentialTaskExecutor(Executor executor) { + public SequentialTaskExecutor(@NotNull Executor executor) { super(executor, 1); } } diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java index e99db9d1d2c3..4c85f15a8c7c 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java @@ -29,10 +29,10 @@ public class ConcurrentInstanceMap<T> extends ConcurrentFactoryMap<Class<? exten return key.newInstance(); } catch (InstantiationException e) { - throw new RuntimeException(e); + throw new RuntimeException("Couldn't instantiate " + key, e); } catch (IllegalAccessException e) { - throw new RuntimeException(e); + throw new RuntimeException("Couldn't instantiate " + key, e); } } }
\ No newline at end of file diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index dca7a0e6b30d..40bd75a2eff8 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -1073,7 +1073,8 @@ public class ContainerUtil extends ContainerUtilRt { } public static <T, U extends T> U findInstance(@NotNull Iterator<T> iterator, @NotNull Class<U> aClass) { - @SuppressWarnings("unchecked") U u = (U)find(iterator, new FilteringIterator.InstanceOf<U>(aClass)); + //noinspection unchecked + U u = (U)find(iterator, FilteringIterator.instanceOf(aClass)); return u; } @@ -1429,6 +1430,16 @@ public class ContainerUtil extends ContainerUtilRt { return sorted; } + @NotNull + public static <T extends Comparable<T>> List<T> sorted(@NotNull Collection<T> list) { + return sorted(list, new Comparator<T>() { + @Override + public int compare(T o1, T o2) { + return o1.compareTo(o2); + } + }); + } + public static <T> void sort(@NotNull T[] a, @NotNull Comparator<T> comparator) { int size = a.length; @@ -1927,6 +1938,15 @@ public class ContainerUtil extends ContainerUtilRt { return -1; } + public static <T> int indexOf(@NotNull List<T> list, @NotNull final T object) { + return indexOf(list, new Condition<T>() { + @Override + public boolean value(T t) { + return t.equals(object); + } + }); + } + @NotNull public static <A,B> Map<B,A> reverseMap(@NotNull Map<A,B> map) { final Map<B,A> result = newHashMap(); diff --git a/platform/util/src/com/intellij/util/containers/FilteringIterator.java b/platform/util/src/com/intellij/util/containers/FilteringIterator.java index c6b7173b4db2..3e146441d6ab 100644 --- a/platform/util/src/com/intellij/util/containers/FilteringIterator.java +++ b/platform/util/src/com/intellij/util/containers/FilteringIterator.java @@ -17,7 +17,6 @@ package com.intellij.util.containers; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Conditions; -import com.intellij.util.ReflectionUtil; import org.jetbrains.annotations.NotNull; import java.util.Iterator; @@ -30,7 +29,7 @@ import java.util.NoSuchElementException; */ public class FilteringIterator<Dom, E extends Dom> implements Iterator<E> { private final Iterator<Dom> myBaseIterator; - private final Condition<Dom> myFilter; + private final Condition<? super Dom> myFilter; private boolean myNextObtained = false; private boolean myCurrentIsValid = false; private Dom myCurrent; @@ -42,7 +41,7 @@ public class FilteringIterator<Dom, E extends Dom> implements Iterator<E> { } }; - public FilteringIterator(@NotNull Iterator<Dom> baseIterator, @NotNull Condition<Dom> filter) { + public FilteringIterator(@NotNull Iterator<Dom> baseIterator, @NotNull Condition<? super Dom> filter) { myBaseIterator = baseIterator; myFilter = filter; } @@ -103,7 +102,7 @@ public class FilteringIterator<Dom, E extends Dom> implements Iterator<E> { return create(iterator, NOT_NULL); } - public static <Dom, T extends Dom> Iterator<T> create(Iterator<Dom> iterator, Condition<Dom> condition) { + public static <Dom, T extends Dom> Iterator<T> create(Iterator<Dom> iterator, Condition<? super Dom> condition) { return new FilteringIterator<Dom, T>(iterator, condition); } @@ -119,7 +118,7 @@ public class FilteringIterator<Dom, E extends Dom> implements Iterator<E> { return create((Iterator<T>)iterator, instanceOf(aClass)); } - public static class InstanceOf<T> implements Condition { + public static class InstanceOf<T> implements Condition<Object> { private final Class<T> myInstancesClass; public InstanceOf(Class<T> instancesClass) { @@ -130,13 +129,5 @@ public class FilteringIterator<Dom, E extends Dom> implements Iterator<E> { public boolean value(Object object) { return myInstancesClass.isInstance(object); } - - public boolean isClassAcceptable(Class hintClass) { - return ReflectionUtil.isAssignable(myInstancesClass, hintClass); - } - - public T cast(Object object) { - return (T)object; - } } } diff --git a/platform/util/src/com/intellij/util/containers/InternalIterator.java b/platform/util/src/com/intellij/util/containers/InternalIterator.java index 9b7d1da8f156..49c84ece6a48 100644 --- a/platform/util/src/com/intellij/util/containers/InternalIterator.java +++ b/platform/util/src/com/intellij/util/containers/InternalIterator.java @@ -70,10 +70,10 @@ public interface InternalIterator<T>{ } class Filtering<T> implements InternalIterator<T> { - private final Condition<T> myFilter; + private final Condition<? super T> myFilter; private final InternalIterator<T> myIterator; - public Filtering(InternalIterator<T> iterator, Condition<T> filter) { + public Filtering(InternalIterator<T> iterator, Condition<? super T> filter) { myIterator = iterator; myFilter = filter; } diff --git a/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java b/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java index 663cd215cfbe..0f14dcb8511b 100644 --- a/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java +++ b/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java @@ -20,7 +20,6 @@ package com.intellij.util.io.storage; import com.intellij.openapi.Disposable; -import com.intellij.openapi.util.Disposer; import com.intellij.util.EventDispatcher; import org.jetbrains.annotations.NotNull; @@ -56,10 +55,8 @@ public class HeavyProcessLatch { public void processFinished(); } - @NotNull - public Disposable addListener(@NotNull HeavyProcessListener listener) { - Disposable disposable = Disposer.newDisposable(); - myEventDispatcher.addListener(listener, disposable); - return disposable; + public void addListener(@NotNull Disposable parentDisposable, + @NotNull HeavyProcessListener listener) { + myEventDispatcher.addListener(listener, parentDisposable); } }
\ No newline at end of file diff --git a/platform/util/src/com/intellij/util/xmlb/MapBinding.java b/platform/util/src/com/intellij/util/xmlb/MapBinding.java index dbc3c0e082c3..354af5f93d7b 100644 --- a/platform/util/src/com/intellij/util/xmlb/MapBinding.java +++ b/platform/util/src/com/intellij/util/xmlb/MapBinding.java @@ -15,6 +15,7 @@ */ package com.intellij.util.xmlb; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.JDOMUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.xmlb.annotations.MapAnnotation; @@ -34,6 +35,8 @@ import java.util.Set; import static com.intellij.util.xmlb.Constants.*; class MapBinding implements Binding { + private static final Logger LOG = Logger.getInstance(MapBinding.class); + private static final Comparator<Object> KEY_COMPARATOR = new Comparator<Object>() { @SuppressWarnings("unchecked") @Override @@ -161,7 +164,10 @@ class MapBinding implements Binding { Object k = null; Object v = null; - assert entry.getName().equals(getEntryAttributeName()); + if (!entry.getName().equals(getEntryAttributeName())) { + LOG.warn("unexpected entry for serialized Map will be skipped: " + entry); + continue; + } Attribute keyAttr = entry.getAttribute(getKeyAttributeName()); if (keyAttr != null) { diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java index 86b7d111430f..73f216bc3749 100644 --- a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java +++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java @@ -45,6 +45,7 @@ public class XmlSerializer { return serialize(object, TRUE_FILTER); } + @NotNull public static Element serialize(@NotNull Object object, @Nullable SerializationFilter filter) throws XmlSerializationException { return new XmlSerializerImpl(filter == null ? TRUE_FILTER : filter).serialize(object); } |