Steve Harris
64492a05dc
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts (these moved to ufcore):
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.auth/build.properties
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: 6a80bc29717f3a19cd1f5a3c6a11c26a80bc29717f3a19cd1f5a3c6a11c23380a1dba05a3c6a11c23380a1dba0103318357b6ad5b5a9d7f168d3dddb98b93e364ed214c3174d
2014-04-30 11:22:22 -05:00
Steve Harris
66ee7213aa
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
...
Conflicts (these are now in ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
Former-commit-id: 243988d3447e24fd79a1396daac383243988d3447e24fd79a1396daac383af7fb01f53396daac383af7fb01f53bb335fd6759b65077ad9225da706b704f12dbaca8860d8e6e7
2014-04-29 16:09:07 -05:00
Richard Peter
e748b7c1e5
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a17711067683dd89144b17824618b1a17711067683dd89144b178246132957285fc44b178246132957285fc0dfa8cc4c66966b7924680d415387824a3fe1466938e39a0fc
2014-04-28 16:27:40 -05:00
Steve Harris
a0d412c9d1
Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
...
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2
Former-commit-id: 1033e0fde72be0e7730f7b56fb23a81033e0fde72be0e7730f7b56fb23a8c4597ec58b7b56fb23a8c4597ec58b1266b9438f9ef44d2a4c7c44a9506c983efa8dd3567730e595
2014-04-28 16:25:21 -05:00
Lee Venable
b011f13fb1
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50a8ab7f3946573465f316761101dd50a8ab7f3946573465f316e054a7ab98573465f316e054a7ab98090ea0fa5aeda26e607643fdbe9ab6ede8740acc3a133f6626
2014-04-28 15:24:26 -05:00
Steve Harris
47be791233
Omaha #3085 - Removed ufcore and ufcore-foss plugins
...
Former-commit-id: 8fae55b40403e7d5d06fa89621797d8fae55b40403e7d5d06fa89621797d491b768204a89621797d491b7682041e989b1639558686f2fd23e542e36bb19a9c9aa8dd3da741ef
2014-04-28 09:59:23 -05:00
Nate Jensen
5ad4b4430f
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: 99612f1324d145961f4c48cab0ae7199612f1324d145961f4c48cab0ae71dc3ba942a948cab0ae71dc3ba942a98830b4dc7174e77d307a11a3ae5054195db736e8d2bfcfa53b
2014-04-25 15:05:07 -05:00
Nate Jensen
c720e2aae7
Issue #2972 fix thin client startup
...
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: f007819a3b7811040f3ed47a09530af007819a3b7811040f3ed47a09530a86e9502341d47a09530a86e9502341c7a6389dc5c802e6a05c27ed7e5dabce3c2c13414b6db92b9f
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
d6eadfc34c
Issue #2874 Allow RTOFS nowcast to be identified by process type.
...
Former-commit-id: 214311cc6e9478f8adc92d96d9d2df214311cc6e9478f8adc92d96d9d2dffa3d4bb6182d96d9d2dffa3d4bb6185b61473bd6080c2a48f37499987f5286174019b51bb8ce2cbe
2014-04-25 14:38:36 -05:00
Brian Clements
52e575f833
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 1dc13cc1515f746c9c5617ab4f61841dc13cc1515f746c9c5617ab4f6184f1213c1bda17ab4f6184f1213c1bda922d56617fed2d66a6fafe6af8c315edaaa9a426eb318a9a0d
2014-04-25 13:41:17 -05:00
David Gillingham
b68680eb65
Issue #2897 : Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
...
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: 777456404bc14497b1b72426e463f7777456404bc14497b1b72426e463f76ca193b8e92426e463f76ca193b8e98db5524b3f48bc49fd4b2e8b8c6e86c0fd32360d83674f8444
2014-04-25 10:56:43 -05:00
Brian.Dyke
19b4bb7dcc
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40f0b8ea5822fb1f5aa593362d882b40f0b8ea5822fb1f5aa5933524838f9ffb1f5aa5933524838f9f14a63a19e1bf3758efa3029f5753adc6d3fe6952f31d8cc8cf
2014-04-25 11:06:11 -04:00
Richard Peter
a32345d1cb
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb5b14b22ee137342cba87ee59a298eb5b14b22ee137342cba879a7e1aa9b037342cba879a7e1aa9b0d8950196fa2d1262e41fcaccf6ca52b234142252dcd2468bee
2014-04-24 19:11:50 -05:00
Lee Venable
25612cea42
Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
...
Former-commit-id: 4583301be415c9311c97a511f8d4e74583301be415c9311c97a511f8d4e7e7acb04432a511f8d4e7e7acb04432ae2a0c44dfae333a34dc20d563cd1540e1bbc5f19bbc3844f9
2014-04-24 17:53:05 -05:00
Lee Venable
022d1ff834
Merge "Issue #3045 Change column label to "Data Set"." into development
...
Former-commit-id: e35e76282ffd7a86e187e45c999d47e35e76282ffd7a86e187e45c999d479642dac1f1e45c999d479642dac1f1cd5d582898059a2f59b5e776e8c3d0890891c1b570465fb1bd
2014-04-24 17:42:12 -05:00
Roger Ferrel
541ee5a81d
Issue #3045 Change column label to "Data Set".
...
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c79788eb4c91ab33a2a6afaf1dd679c79788eb4c91ab33a2a6afaf1cf6d1c8ca13a2a6afaf1cf6d1c8ca1f88302b94d555c8cf6170490023b2c3d744452af0ece281810
2014-04-24 16:25:01 -05:00
Brian Clements
d3813b0f96
Issue #3070 fixed contact request handling
...
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 345fe6f866334ad3ca8102f08d75c6345fe6f866334ad3ca8102f08d75c694aa761e1902f08d75c694aa761e1932b8ddd64c84f75ca30a12304655e8c27f2d9e53670c4e1611
2014-04-24 16:10:27 -05:00
Roger Ferrel
457ae58495
Issue #3045 - Change to prevent race conditions while getting table labels.
...
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686e2b03eb1909dad4c959bdd86b04686e2b03eb1909dad4c959b2a0a9b53349dad4c959b2a0a9b5334b511341dc4ef81949dd1d73f61c7e7ca30aa6b8a5fda70501e
2014-04-24 14:48:15 -05:00
Slav Korolev
d5438ccac5
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
...
Former-commit-id: f39c9c151d150a132320689930c484f39c9c151d150a132320689930c484f458f75ecf689930c484f458f75ecf4dca79628327095ecca8e78c6edb8c1bf6d72572cd38f3636d
2014-04-24 15:40:52 -04:00
Brian Clements
88c8e3be8e
Issue #2955 ignore duplicate session invites
...
Former-commit-id: 9f18c5d54ce81ee94171f8888196469f18c5d54ce81ee94171f8888196464fa9afc9aef8888196464fa9afc9ae363632479a39c2a1ac3775465b69ed3b96c4c6289e2497714b
2014-04-24 09:25:54 -05:00
Lee Venable
cb2d378302
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: e17fa9f609eed8c6cbbadf05a79d63e17fa9f609eed8c6cbbadf05a79d63f13ac7e1b9df05a79d63f13ac7e1b90c67eecb00421a4e4677222154d094e81836e3716c54817117
2014-04-23 18:24:25 -05:00
Nate Jensen
c0af16b39a
Issue #2623 remove ecf plugins from being included in cave
...
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18
Former-commit-id: 692e3de7d0baa671456607fec6a69c692e3de7d0baa671456607fec6a69cecb6b4d0ce07fec6a69cecb6b4d0ce168283b32c9bac89c7763671e1803691b8d9b72be0b54d7b7a
2014-04-23 17:29:00 -05:00
Richard Peter
6555ec63cd
Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
...
Former-commit-id: 14cbe67add99036341f3026575b20214cbe67add99036341f3026575b202e10434a727026575b202e10434a727d4c155e6934d2ee42fc9b4226666bebf8b5049424a7642c44e
2014-04-23 17:25:25 -05:00
Ben Steffensmeier
12f86412e1
Issue #2947 Fixes for derived products with multiple records per frame.
...
Former-commit-id: 313cb63228c6fc0fd4b1c19d52db72313cb63228c6fc0fd4b1c19d52db7201fc21b6f2c19d52db7201fc21b6f27fc6f021f7e3e78283dd0cde4689fabae8296507fbb4703fe3
2014-04-23 17:14:02 -05:00
Ron Anderson
997390456d
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
...
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: bf6d35aa0f2f68fb8f2c221a06e467bf6d35aa0f2f68fb8f2c221a06e467f3185dd206221a06e467f3185dd206569608769f00f2f374cd3e37419dc678ef1d5c4cdd5c3bf2fd
2014-04-23 17:04:16 -05:00
Nate Jensen
bfc78fc68f
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 68e3650305827112349aad6e4712d668e3650305827112349aad6e4712d62b20cf5440ad6e4712d62b20cf544073a3cde77b418741ce55a0423843b31abd65120e61eca0980f
2014-04-23 15:30:44 -05:00
Nate Jensen
e61fea7af1
Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
...
Former-commit-id: 4232c6b1b2547bcafdb6c193eac6e84232c6b1b2547bcafdb6c193eac6e81067e4b09cc193eac6e81067e4b09ce44fd81dbaa2df4a7ec5d1c581aed6c1aa647d6dba32067353
2014-04-23 14:24:33 -05:00
Brian Clements
9c6a004507
Issue #2822 shared display invitations always go to cave
...
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients
Former-commit-id: 148d158380117eeca83af3ee7b453a148d158380117eeca83af3ee7b453a6969321db0f3ee7b453a6969321db000ebd60fad50acaac1495d2ec9b909d9a1bba4c88cdeb571f3
2014-04-23 14:16:42 -05:00
Lee Venable
7f99fecc75
Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
...
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986
Former-commit-id: 456ef5b18a41cd3242f5331dc3397f456ef5b18a41cd3242f5331dc3397f765d2e80bc331dc3397f765d2e80bce7b038f996029de4a1b126e8c1ecf6906340fb07711d471f3e
2014-04-23 14:07:29 -05:00
Brian.Dyke
83dce492e5
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 493830467488d44a31292a4fe3dbae493830467488d44a31292a4fe3dbaea7c9ddc05e2a4fe3dbaea7c9ddc05e05c0e1ad1c953236aad8911c0c6c1726cb172a042161c569ea
2014-04-23 14:05:50 -04:00
Nate Jensen
52cf9e0b37
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: 37371486bafbecf66f79426f103e7b37371486bafbecf66f79426f103e7b38d493ff1b426f103e7b38d493ff1b342c851b042b68a49a4320f3f8ffa2ff9101c0577c349e268e
2014-04-23 12:26:27 -05:00
Nate Jensen
96a50b7460
Merge "Issue #2903 added connection tests to session close methods" into development
...
Former-commit-id: a24262b3a9c88597b6c29ec6169646a24262b3a9c88597b6c29ec61696464a046629729ec61696464a04662972439e345f98d60701a264e9456b4ab7455f4385aaf4cefbc459
2014-04-22 12:53:08 -05:00
Nate Jensen
c93aa94cde
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: bf06389b9ecc1da5fb88fe3ff669a7bf06389b9ecc1da5fb88fe3ff669a78df505325cfe3ff669a78df505325c9ca82ebdd7484b197a56be6818e96bad96f9d1282b71b60b2e
2014-04-22 12:50:27 -05:00
Nate Jensen
3f35f90072
Merge "Issue #3038 added initialized flag to session feed view" into development
...
Former-commit-id: a9f0d3f6ee963a848f9042d0d7681da9f0d3f6ee963a848f9042d0d7681dfc2be9521a42d0d7681dfc2be9521a7434d299fa7f777e6fb9ca8eab399f5f35eedfb1a3036cee45
2014-04-22 12:49:02 -05:00
Brian Clements
797a972930
Issue #2903 added connection tests to session close methods
...
fixes illegal state exception problem when booted from xmpp server
Former-commit-id: 053136ccbbf9ab4f9cfe50f3f420eb053136ccbbf9ab4f9cfe50f3f420eb49f86e415350f3f420eb49f86e415315279b35c99ef018dbe8c9453a24409ea5430774d2b2106f4c
2014-04-22 12:36:40 -05:00
Nate Jensen
7dd0078ead
Issue #2984 remove unnecessary dependencies
...
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877
Former-commit-id: 3e583eaa7a48d4759371d03afcdcba3e583eaa7a48d4759371d03afcdcbabe21c41512d03afcdcbabe21c415126f504176ea8eb74232df8f893545f157e5bbfe8475cc9ecbfc
2014-04-22 12:03:44 -05:00
Brian Clements
e750a1e5a5
Issue #3056 made venue participant equals method case insensitive
...
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server
Former-commit-id: a5730ca7bdbfd88f3e141adbf6253aa5730ca7bdbfd88f3e141adbf6253a2a9d3419101adbf6253a2a9d34191038fbf8048e19c2695dca8677a9f35997c5fe6d4ad74f192819
2014-04-22 11:55:36 -05:00
Nate Jensen
5e88e2e8bf
Merge "Issue #2060 dropping grid dataURI column" into development
...
Former-commit-id: 17945fcbef96268f1d35c161a2ba5017945fcbef96268f1d35c161a2ba50ffaa7d8f58c161a2ba50ffaa7d8f58a0095992e1c65e827d4e0b25aebbb18a7e16be50f93a81d2f6
2014-04-22 10:42:11 -05:00
Brian Clements
95e4effdc3
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: 1665175d35cdf3aa90e9717cdf42801665175d35cdf3aa90e9717cdf4280ef61a7c281717cdf4280ef61a7c281001e0b030be7005953eb295ff106b6fb24e315bffb74637aa8
2014-04-22 10:01:27 -05:00
Ron Anderson
260706f1cc
Merge "Issue #2998 Fix regression made in earlier check in." into development
...
Former-commit-id: b9f41e3108447ff809a38026973c95b9f41e3108447ff809a38026973c95a6b59976638026973c95a6b59976632afa2d0cdab389398c955f8ac71e1104e617706cabfc0c3ba3
2014-04-21 17:55:22 -05:00
Nate Jensen
43bb667c30
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 03451ab6b2263611f905a37a2afe1803451ab6b2263611f905a37a2afe185dfb652775a37a2afe185dfb652775c4819a4e953eddbf452dcdb932cc4d9ef0154104403f4c3195
2014-04-21 17:34:39 -05:00
Ron Anderson
db4b6b617d
Issue #2998 Fix regression made in earlier check in.
...
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71
Former-commit-id: 5570193f212a819003c5ed99abbb9d5570193f212a819003c5ed99abbb9d04467d51dded99abbb9d04467d51ddb1b0dcf75f243c929fc104a7c2d8cdd6990dd0b862056f6eff
2014-04-21 17:26:29 -05:00
Nate Jensen
db8d725d94
Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
...
Former-commit-id: f0cdb9e8ad1651a791871a617796cbf0cdb9e8ad1651a791871a617796cbec82e51d281a617796cbec82e51d289c7e88211fefc5dba9970d7ae042d52cf79494bc0972f4e3f1
2014-04-21 17:08:17 -05:00
Nate Jensen
a444f97aa8
Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
...
Former-commit-id: 7530137f38535a5f836de401fca6617530137f38535a5f836de401fca661cb7d485004e401fca661cb7d4850049e6ca096e7f75fc8da0c87457f26fc252fb2a3a7f685ade735
2014-04-21 15:13:53 -05:00
Ron Anderson
ec78a52086
Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
...
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c
Former-commit-id: 0097799e2c8aac4d32b1665246d72e0097799e2c8aac4d32b1665246d72ec4a0a4ef6e665246d72ec4a0a4ef6ed851b549efb5dc730feae515f42b94d728020a700cbbc279f0
2014-04-21 14:25:53 -05:00
Lee Venable
69a239a78a
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ed407b11c6ac914e72e73c45a24efbed407b11c6ac914e72e73c45a24efbdcb7e697e83c45a24efbdcb7e697e8e5d73f64ac91d37d783c20764b1d97294d8ff917d6e34a221f
2014-04-21 13:47:31 -05:00
Ron Anderson
93600c3a1e
Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development
...
Former-commit-id: 0bf7593ccdefdd37b012750c054ab00bf7593ccdefdd37b012750c054ab05f82bb7cc8750c054ab05f82bb7cc82c67fd60b4020045fee31df03eb2dc83062cb3d5d52b56aa2a
2014-04-21 13:25:11 -05:00
Brian Clements
d63adaa204
Issue #2822 fixed check for topic subscription before leader transfer
...
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles
Former-commit-id: 833d693098c4a38d1f686c47c78038833d693098c4a38d1f686c47c78038aed25eeb616c47c78038aed25eeb6179c5884e4556e0dad5ff474255ed29a0871fad9a24b594529a
2014-04-21 13:07:14 -05:00
Ron Anderson
73abf67139
Issue #2998 Fixed null pointer in AttributeViewer.
...
Improved sizing of displayAttributes.
Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93
Former-commit-id: a506479e56a3a8a1ebb4811f05f164a506479e56a3a8a1ebb4811f05f164541a908a41811f05f164541a908a410a9cfdea1ad4fcdb0851a5cea97c6f899785875f841a48b86e
2014-04-21 13:03:50 -05:00
Lee Venable
dfcfc497ac
Merge "Issue #2891 - Fix refresh of Utilization Graph" into development
...
Former-commit-id: 13c46b95a7b01eac4cc3dd7f0a82f913c46b95a7b01eac4cc3dd7f0a82f9370ff09548dd7f0a82f9370ff09548e70c07c29da8cb00e2c674df7202b03d17b7eddb369246903f
2014-04-21 12:59:00 -05:00
