Updated MSFTBX, RTree, Guava dependencies

chhh · Jul 6, 2017 · 1504092 · 1504092
1 parent ed960af
commit 1504092
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 40 deletions.
diff --git 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
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=64c99fd5
+build.xml.data.CRC32=864162db
 build.xml.script.CRC32=7c68088a
 build.xml.stylesheet.CRC32=[email protected]
 # 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=[email protected]
diff --git a/DataCore/nbproject/project.xml b/DataCore/nbproject/project.xml
@@ -32,11 +32,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>umich.ms.batmass.libs.guava180</code-name-base>
+                    <code-name-base>umich.ms.batmass.libs.guava</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>18.0</specification-version>
+                        <specification-version>22.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -60,23 +60,23 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.7.9991</specification-version>
+                        <specification-version>0.8.0.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>umich.ms.batmass.libs.rxjava</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.1.7</specification-version>
+                        <specification-version>1.2.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>umich.ms.batmass.libs.rxjavaextras</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.7.9.10</specification-version>
+                        <specification-version>0.8.0.7</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -92,7 +92,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>1.3</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

diff --git 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
@@ -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=[email protected]
diff --git a/FileSupport/nbproject/project.xml b/FileSupport/nbproject/project.xml
@@ -242,11 +242,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>umich.ms.batmass.libs.guava180</code-name-base>
+                    <code-name-base>umich.ms.batmass.libs.guava</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>18.0</specification-version>
+                        <specification-version>22.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -270,23 +270,21 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.7.9991</specification-version>
+                        <specification-version>0.8.0.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>umich.ms.batmass.libs.rxjava</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.1.7</specification-version>
+                        <specification-version>1.2.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>umich.ms.batmass.libs.rxjavaextras</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.7.9.10</specification-version>
+                        <specification-version>0.8.0.7</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git 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
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5b69ce85
+build.xml.data.CRC32=e448aae1
 build.xml.script.CRC32=561f1472
 build.xml.stylesheet.CRC32=[email protected]
 # 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=[email protected]
diff --git a/GUI/nbproject/project.xml b/GUI/nbproject/project.xml
@@ -243,11 +243,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>umich.ms.batmass.libs.guava180</code-name-base>
+                    <code-name-base>umich.ms.batmass.libs.guava</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>18.0</specification-version>
+                        <specification-version>22.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -287,23 +287,21 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.7.9991</specification-version>
+                        <specification-version>0.8.0.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>umich.ms.batmass.libs.rxjava</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.1.7</specification-version>
+                        <specification-version>1.2.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>umich.ms.batmass.libs.rxjavaextras</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.7.9.10</specification-version>
+                        <specification-version>0.8.0.7</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

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
@@ -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,25 +36,20 @@
 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;
 import javax.swing.ToolTipManager;
 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
@@ -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
@@ -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=[email protected]
diff --git a/NbpUtils/nbproject/project.xml b/NbpUtils/nbproject/project.xml
@@ -120,11 +120,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>umich.ms.batmass.libs.guava180</code-name-base>
+                    <code-name-base>umich.ms.batmass.libs.guava</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>18.0</specification-version>
+                        <specification-version>22.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>