Removed use of gnu.trove2 entirely from release/1.28.1

Just to be sure the old trove version doesn't break things.

refs #7156
gitlab #22

Change-Id: I10031c00776d3ccb31478228bc067b73d4c0da76

diff --git a/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF b/bundles/org.simantics.threadlog/META-INF/MANIFEST.MF
index 79b038e46c42a9977d72cff17b235d0fde6c434f..bdfb704628d2ea0f8deff932f08b171d1b694659 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-version="3.0.0"
 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"