Get rid of uses of gnu.trove2

refs #7156

Change-Id: Iea74017d93d7d5a1a7254d4b540369e52fbab879

diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
index 28c851cb0cb291105ea0a5541922695b5db7ba76..d0e7ced89c39179a18c7dbc5a16c2a3b3a9de2c4 100644 (file)
--- 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 6b5252161a814668411ae8a60d2bc5d5d0a0a643..ecc016723a6000f12bfec0e1dad9697d633c625d 100644 (file)
--- 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<ClusterUID, ClusterInfo> {
 

diff --git a/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF b/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF
index 79b038e46c42a9977d72cff17b235d0fde6c434f..d204d3be66bf190a0703b5f3849c502619761230 100644 (file)
--- 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 16441c06765ca9ac483bce85c3dea304d401aabe..4eaf97a972cc6921cf51cfa546aa86346be08f0d 100644 (file)
--- 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 f0f5536d30fd90722b8f9cd60f6dc6aa0f1c6b1f..5f098795458a55ec52fbc2fb856196e408e59659 100644 (file)
--- 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 906eea20d6a2b76c31772557a721b9b956648b6c..39291c7d6a2ee2361412190f8a988d7524b201b8 100644 (file)
--- 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"/>
 
-   <plugin
-         id="gnu.trove2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

diff --git a/features/org.simantics.scl.feature/feature.xml b/features/org.simantics.scl.feature/feature.xml
index d1aaa13ff21798f1a1334c08451810de6674618f..1ddb061405163c96262a047cefb98a335290adce 100644 (file)
--- 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"/>
 
-   <plugin
-         id="gnu.trove2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gnu.trove3"
          download-size="0"