From dec69b85e6e2a6d89e7ff0ef9561178924ae4b5b Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Thu, 20 Apr 2017 15:10:26 +0300 Subject: [PATCH] Get rid of uses of gnu.trove2 refs #7156 Change-Id: Iea74017d93d7d5a1a7254d4b540369e52fbab879 --- bundles/org.simantics.acorn/META-INF/MANIFEST.MF | 1 - .../src/org/simantics/acorn/lru/ClusterLRU.java | 3 ++- bundles/org.simantics.threadlog/META-INF/MANIFEST.MF | 2 +- .../src/org/simantics/threadlog/ThreadLog.java | 10 +++++----- .../simantics/threadlog/ui/ThreadLogVisualizer.java | 6 +++--- features/org.simantics.browsing.ui.feature/feature.xml | 7 ------- features/org.simantics.scl.feature/feature.xml | 7 ------- 7 files changed, 11 insertions(+), 25 deletions(-) diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF index 28c851cb0..d0e7ced89 100644 --- a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF @@ -5,7 +5,6 @@ Bundle-SymbolicName: org.simantics.acorn Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Semantum Oy Require-Bundle: gnu.trove3;bundle-version="3.0.0", - gnu.trove2;bundle-version="2.0.4", org.simantics.db.impl;bundle-version="0.8.0", org.simantics.db.server;bundle-version="1.0.0", org.simantics.compressions;bundle-version="1.0.0", diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java index 6b5252161..ecc016723 100644 --- a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java +++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java @@ -16,7 +16,8 @@ import org.simantics.db.impl.ClusterBase; import org.simantics.db.impl.ClusterI; import org.simantics.db.service.ClusterUID; -import gnu.trove.TIntIntHashMap; +import gnu.trove.map.hash.TIntIntHashMap; + public class ClusterLRU extends LRU { diff --git a/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF b/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF index 79b038e46..d204d3be6 100644 --- a/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.simantics.threadlog Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.threadlog.internal.Activator Require-Bundle: org.eclipse.core.runtime, - gnu.trove2;bundle-version="2.0.0" + gnu.trove3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.simantics.threadlog diff --git a/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ThreadLog.java b/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ThreadLog.java index 16441c067..4eaf97a97 100644 --- a/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ThreadLog.java +++ b/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ThreadLog.java @@ -11,9 +11,6 @@ *******************************************************************************/ package org.simantics.threadlog; -import gnu.trove.TDoubleArrayList; -import gnu.trove.TLongArrayList; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.DataInput; @@ -27,6 +24,9 @@ import java.io.IOException; import java.io.StreamCorruptedException; import java.util.ArrayList; +import gnu.trove.list.array.TDoubleArrayList; +import gnu.trove.list.array.TLongArrayList; + public class ThreadLog { private static final transient String HDR = "TLOG"; @@ -39,7 +39,7 @@ public class ThreadLog { TLongArrayList threads = new TLongArrayList(); public double[] getTimes() { - return times.toNativeArray(); + return times.toArray(); } public String[] getTasks() { @@ -47,7 +47,7 @@ public class ThreadLog { } public long[] getThreads() { - return threads.toNativeArray(); + return threads.toArray(); } private class TaskImpl implements Task { diff --git a/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ui/ThreadLogVisualizer.java b/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ui/ThreadLogVisualizer.java index f0f5536d3..5f0987954 100644 --- a/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ui/ThreadLogVisualizer.java +++ b/bundles/org.simantics.threadlog/src/org/simantics/threadlog/ui/ThreadLogVisualizer.java @@ -11,9 +11,6 @@ *******************************************************************************/ package org.simantics.threadlog.ui; -import gnu.trove.TLongObjectHashMap; -import gnu.trove.TObjectProcedure; - import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -31,6 +28,9 @@ import javax.swing.filechooser.FileNameExtensionFilter; import org.simantics.threadlog.Task; import org.simantics.threadlog.ThreadLog; +import gnu.trove.map.hash.TLongObjectHashMap; +import gnu.trove.procedure.TObjectProcedure; + public class ThreadLogVisualizer extends JFrame { private static final long serialVersionUID = 6250996509358338304L; diff --git a/features/org.simantics.browsing.ui.feature/feature.xml b/features/org.simantics.browsing.ui.feature/feature.xml index 906eea20d..39291c7d6 100644 --- a/features/org.simantics.browsing.ui.feature/feature.xml +++ b/features/org.simantics.browsing.ui.feature/feature.xml @@ -167,11 +167,4 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0" unpack="false"/> - - diff --git a/features/org.simantics.scl.feature/feature.xml b/features/org.simantics.scl.feature/feature.xml index d1aaa13ff..1ddb06140 100644 --- a/features/org.simantics.scl.feature/feature.xml +++ b/features/org.simantics.scl.feature/feature.xml @@ -101,13 +101,6 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0" unpack="false"/> - -