diff --git a/DataCore/manifest.mf b/DataCore/manifest.mf
index 697bd74..a6c9f93 100644
--- a/DataCore/manifest.mf
+++ b/DataCore/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: umich.ms.batmass.data.core
OpenIDE-Module-Localizing-Bundle: umich/ms/batmass/data/core/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1.2
+OpenIDE-Module-Specification-Version: 1.1.3
diff --git a/DataCore/nbproject/genfiles.properties b/DataCore/nbproject/genfiles.properties
index eb3b229..f699e38 100644
--- a/DataCore/nbproject/genfiles.properties
+++ b/DataCore/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=64c99fd5
+build.xml.data.CRC32=864162db
build.xml.script.CRC32=7c68088a
build.xml.stylesheet.CRC32=a56c6a5b@2.71.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=64c99fd5
+nbproject/build-impl.xml.data.CRC32=864162db
nbproject/build-impl.xml.script.CRC32=f439f271
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
diff --git a/DataCore/nbproject/project.xml b/DataCore/nbproject/project.xml
index 442eef5..af1c6af 100644
--- a/DataCore/nbproject/project.xml
+++ b/DataCore/nbproject/project.xml
@@ -32,11 +32,11 @@
- umich.ms.batmass.libs.guava180
+ umich.ms.batmass.libs.guava
- 18.0
+ 22.0
@@ -60,7 +60,7 @@
- 0.7.9991
+ 0.8.0.1
@@ -68,7 +68,7 @@
- 1.1.7
+ 1.2.10
@@ -76,7 +76,7 @@
- 0.7.9.10
+ 0.8.0.7
@@ -92,7 +92,7 @@
- 1.0
+ 1.3
diff --git a/FileSupport/manifest.mf b/FileSupport/manifest.mf
index 0567ec5..f3a59b0 100644
--- a/FileSupport/manifest.mf
+++ b/FileSupport/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: umich.ms.batmass.filesupport
OpenIDE-Module-Install: umich/ms/batmass/filesupport/Installer.class
OpenIDE-Module-Layer: umich/ms/batmass/filesupport/layer.xml
OpenIDE-Module-Localizing-Bundle: umich/ms/batmass/filesupport/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1.1.3
+OpenIDE-Module-Specification-Version: 1.1.1.4
diff --git a/FileSupport/nbproject/genfiles.properties b/FileSupport/nbproject/genfiles.properties
index 9642305..a94d458 100644
--- a/FileSupport/nbproject/genfiles.properties
+++ b/FileSupport/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=8c54ef2d
+nbproject/build-impl.xml.data.CRC32=3b37b87d
nbproject/build-impl.xml.script.CRC32=7789e09b
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
diff --git a/FileSupport/nbproject/project.xml b/FileSupport/nbproject/project.xml
index ca294e5..f718699 100644
--- a/FileSupport/nbproject/project.xml
+++ b/FileSupport/nbproject/project.xml
@@ -242,11 +242,11 @@
- umich.ms.batmass.libs.guava180
+ umich.ms.batmass.libs.guava
- 18.0
+ 22.0
@@ -270,15 +270,13 @@
- 0.7.9991
+ 0.8.0.1
umich.ms.batmass.libs.rxjava
-
-
- 1.1.7
+ 1.2.10
@@ -286,7 +284,7 @@
- 0.7.9.10
+ 0.8.0.7
diff --git a/GUI/manifest.mf b/GUI/manifest.mf
index 4aa3d1c..b87c672 100644
--- a/GUI/manifest.mf
+++ b/GUI/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: true
OpenIDE-Module: umich.ms.batmass.gui
OpenIDE-Module-Layer: umich/ms/batmass/gui/layer.xml
OpenIDE-Module-Localizing-Bundle: umich/ms/batmass/gui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1.8.5
+OpenIDE-Module-Specification-Version: 1.1.8.6
diff --git a/GUI/nbproject/genfiles.properties b/GUI/nbproject/genfiles.properties
index a7db94e..31148bf 100644
--- a/GUI/nbproject/genfiles.properties
+++ b/GUI/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5b69ce85
+build.xml.data.CRC32=e448aae1
build.xml.script.CRC32=561f1472
build.xml.stylesheet.CRC32=a56c6a5b@2.71.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=5b69ce85
+nbproject/build-impl.xml.data.CRC32=e448aae1
nbproject/build-impl.xml.script.CRC32=c12ad135
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
diff --git a/GUI/nbproject/project.xml b/GUI/nbproject/project.xml
index fea3c46..f3f8813 100644
--- a/GUI/nbproject/project.xml
+++ b/GUI/nbproject/project.xml
@@ -243,11 +243,11 @@
- umich.ms.batmass.libs.guava180
+ umich.ms.batmass.libs.guava
- 18.0
+ 22.0
@@ -287,15 +287,13 @@
- 0.7.9991
+ 0.8.0.1
umich.ms.batmass.libs.rxjava
-
-
- 1.1.7
+ 1.2.10
@@ -303,7 +301,7 @@
- 0.7.9.10
+ 0.8.0.7
diff --git a/GUI/src/umich/ms/batmass/gui/viewers/map2d/components/Map2DPanel.java b/GUI/src/umich/ms/batmass/gui/viewers/map2d/components/Map2DPanel.java
index 600dbb7..f5fb676 100644
--- a/GUI/src/umich/ms/batmass/gui/viewers/map2d/components/Map2DPanel.java
+++ b/GUI/src/umich/ms/batmass/gui/viewers/map2d/components/Map2DPanel.java
@@ -18,8 +18,6 @@
import umich.ms.batmass.gui.viewers.map2d.norm.RangeNormalizer;
import com.github.davidmoten.rtree.Entry;
import com.github.davidmoten.rtree.RTree;
-import com.github.davidmoten.rtree.geometry.Geometries;
-import com.github.davidmoten.rtree.geometry.Geometry;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Container;
@@ -38,13 +36,11 @@
import java.awt.event.MouseWheelEvent;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.JPanel;
import javax.swing.JToolTip;
import javax.swing.SwingUtilities;
@@ -52,11 +48,8 @@
import javax.swing.event.EventListenerList;
import net.engio.mbassy.bus.MBassador;
import net.engio.mbassy.listener.Handler;
-import rx.Observable;
-import rx.functions.Action1;
import umich.ms.batmass.data.core.lcms.features.Features;
import umich.ms.batmass.data.core.lcms.features.ILCMSFeature2D;
-import umich.ms.batmass.data.core.lcms.features.api.FeatureUtils;
import umich.ms.batmass.gui.core.api.comm.eventbus.AbstractBusPubSub;
import umich.ms.batmass.gui.core.api.data.MzRtPoint;
import umich.ms.batmass.gui.core.api.data.MzRtRegion;
@@ -69,7 +62,6 @@
import umich.ms.batmass.gui.viewers.map2d.messages.MsgZoom1D;
import umich.ms.batmass.gui.viewers.map2d.messages.MsgZoom2D;
import umich.ms.batmass.nbputils.OutputWndPrinter;
-import umich.ms.datatypes.LCMSDataSubset;
import umich.ms.datatypes.scan.IScan;
import umich.ms.datatypes.scan.props.PrecursorInfo;
import umich.ms.datatypes.scancollection.IScanCollection;
diff --git a/NbpUtils/manifest.mf b/NbpUtils/manifest.mf
index 1e2df20..d5e24b6 100644
--- a/NbpUtils/manifest.mf
+++ b/NbpUtils/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: umich.ms.batmass.nbputils
OpenIDE-Module-Localizing-Bundle: umich/ms/batmass/nbputils/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1.1
+OpenIDE-Module-Specification-Version: 1.1.2
diff --git a/NbpUtils/nbproject/genfiles.properties b/NbpUtils/nbproject/genfiles.properties
index 6d47905..b990b59 100644
--- a/NbpUtils/nbproject/genfiles.properties
+++ b/NbpUtils/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b70e695d
+nbproject/build-impl.xml.data.CRC32=47d76819
nbproject/build-impl.xml.script.CRC32=87917fb0
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
diff --git a/NbpUtils/nbproject/project.xml b/NbpUtils/nbproject/project.xml
index ae333dc..8080908 100644
--- a/NbpUtils/nbproject/project.xml
+++ b/NbpUtils/nbproject/project.xml
@@ -120,11 +120,11 @@
- umich.ms.batmass.libs.guava180
+ umich.ms.batmass.libs.guava
- 18.0
+ 22.0