Ron Anderson
9b5d743027
Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development
...
Former-commit-id: 77cf9b366c
[formerly 3806a1fd05
] [formerly 6b226db27c
] [formerly 66929690c7
[formerly 6b226db27c
[formerly de57933506ad588c8da38a49de6a2cd5530e2091]]]
Former-commit-id: 66929690c7
Former-commit-id: 8b68cd3c4868310fe8a550a72548e02fe12db72e [formerly cacff76564
]
Former-commit-id: 55f31328af
2014-04-17 13:13:03 -05:00
Ron Anderson
8de698fb5b
Issue #2664 Fix NullPointerException when no .prj file present
...
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d
Former-commit-id: f27f84e50f
[formerly ddf45d649c
] [formerly f4823976f3
] [formerly f30c29bfbd
[formerly f4823976f3
[formerly 66db062f94a5136902bac5cd5df8cbf30305a30a]]]
Former-commit-id: f30c29bfbd
Former-commit-id: 7eef58459f9ae3bb450f759c1b276249d81df227 [formerly ba88a0836d
]
Former-commit-id: 5a8d4be559
2014-04-17 11:38:40 -05:00
Nate Jensen
a48dd9ab1f
Merge "Issue #3025 - Fix incorrect sort algorithm." into development
...
Former-commit-id: b4717280de
[formerly adcc7ac6b5
] [formerly be79b04b59
] [formerly c36a5f7272
[formerly be79b04b59
[formerly 7ad033ab9c35ea2a169f5041ed2ed1dfae7c63b2]]]
Former-commit-id: c36a5f7272
Former-commit-id: db5c7deed79d8cc758597e151da3c968a990ad9a [formerly 7d8f18ef18
]
Former-commit-id: d237113d35
2014-04-17 09:56:54 -05:00
Mike Duff
a700a1a1dc
Issue #3025 - Fix incorrect sort algorithm.
...
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707
Former-commit-id: dd24e15b53
[formerly a17f187929
] [formerly 0b9f8ce7f1
] [formerly b1a4f69578
[formerly 0b9f8ce7f1
[formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]
Former-commit-id: b1a4f69578
Former-commit-id: 70adbb0b80aadc062137a471048c29cdebf395e7 [formerly 54e95e399b
]
Former-commit-id: 989fcfb42f
2014-04-17 09:55:45 -05:00
Nate Jensen
00766a599c
Merge "Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and CcfpRecord to that project. Updated feature and manifest references." into development
...
Former-commit-id: 2cbe701f82
[formerly df1b5183c1
] [formerly 6e49d78e0d
] [formerly d26c150aa9
[formerly 6e49d78e0d
[formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]
Former-commit-id: d26c150aa9
Former-commit-id: c7b3b9828876e046db7ef21c197c4bffcbc75692 [formerly 8bf12cc32a
]
Former-commit-id: 23082fd637
2014-04-17 09:04:52 -05:00
Roger Ferrel
c1a0504758
Issue #3023 Configurable available disk thresholds and unit test fixes
...
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: 84c10d3cd2
[formerly dc25ece75f
] [formerly 8ce590c31c
] [formerly 3af564a653
[formerly 8ce590c31c
[formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 927fe825a123966e78c6c609abe7894b1787733e [formerly 1214aac2a2
]
Former-commit-id: 56da257816
2014-04-17 08:57:15 -05:00
Brad Gonzales
d6ecf7a63e
Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and
...
CcfpRecord to that project. Updated feature and manifest references.
Amend: Updates from peer review.
Change-Id: I5606bbf3ba1dc3d5ad7bdcf3341c57436f9485b3
Former-commit-id: 09accb6fc3
[formerly fd0bb35109
] [formerly ab2488b2db
] [formerly 975a088945
[formerly ab2488b2db
[formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]
Former-commit-id: 975a088945
Former-commit-id: 7aa4e12f54f97b61e748a6950c8f532ae66df86b [formerly 72b4b07fb4
]
Former-commit-id: 4ad01be9e1
2014-04-16 17:07:49 -05:00
Nate Jensen
b225b05ab1
Merge "Issue #3037 - Add dispose check in runAsync call." into development
...
Former-commit-id: 89bb03eb12
[formerly 5ea27f270f
] [formerly 7b1f93fdfc27b35ff9a504cac0a005636fbd3df1 [formerly 8ad4b26151
]] [formerly 70d132c59a
[formerly 8ad4b26151
[formerly b44bb9043a002e0749f6bcda41158a56d047c5af]]]
Former-commit-id: 70d132c59a
Former-commit-id: 0b25ff12454689632fcd64e7d50c32163364f247 [formerly 82267f8b0b
]
Former-commit-id: 65ee834371
2014-04-16 16:31:18 -05:00
Nate Jensen
026bdba6d5
Merge "Issue #3020 fixed error message when attempting to create already accessible room" into development
...
Former-commit-id: b8403476ee
[formerly 27c9ee561e
] [formerly f313f2f20c
] [formerly 2ea1878403
[formerly f313f2f20c
[formerly fc8880c642201685feefbf3eb14cb4f1a7c962b1]]]
Former-commit-id: 2ea1878403
Former-commit-id: 84856846656ce3174e03d59de632d5d282fc7ab1 [formerly 05e1aa10a8
]
Former-commit-id: ecf9a4e671
2014-04-16 16:30:46 -05:00
Nate Jensen
f1152bca2f
Merge "Issue #3021 increased width of create session dialog to fit error msg" into development
...
Former-commit-id: 23fdfcf11f
[formerly 109051a061
] [formerly d96b75ca13
] [formerly 52b9060f7a
[formerly d96b75ca13
[formerly e59d579fc51125b7805c22dfea26b31f17d1be97]]]
Former-commit-id: 52b9060f7a
Former-commit-id: 2f1f0573a1ee55e7a82ce91d3141d8f88fd2a4b9 [formerly 78a240fded
]
Former-commit-id: d29f4091ca
2014-04-16 16:30:39 -05:00
Lee Venable
acd88d1d38
Issue #3037 - Add dispose check in runAsync call.
...
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f
Former-commit-id: 680f607c18
[formerly 6b0468f07e
] [formerly 33fc376f33
] [formerly 7386d4b318
[formerly 33fc376f33
[formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]]]
Former-commit-id: 7386d4b318
Former-commit-id: 414f3accd00b50fb116af44bd4097d3b89b5cb69 [formerly 98e9912a94
]
Former-commit-id: cc6380ba33
2014-04-16 15:40:46 -05:00
Richard Peter
d6359fa404
Merge "Issue #2947 Redo satellite derived parameters to use an inventory to determine availability." into development
...
Former-commit-id: 825757e217
[formerly 0b82df7ad0
] [formerly 852cb3cd46
] [formerly 8c190bd158
[formerly 852cb3cd46
[formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]
Former-commit-id: 8c190bd158
Former-commit-id: 7f1e29571c0c37d84320ad1a27dfc62471139ce5 [formerly f8c75819bb
]
Former-commit-id: bed7035a67
2014-04-16 15:11:07 -05:00
Ben Steffensmeier
858deeaef5
Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
...
Former-commit-id: 2d8106bc5b
[formerly bb51fb299a
] [formerly 709e3411c4
] [formerly a8bb2c0dfd
[formerly 709e3411c4
[formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01
]
Former-commit-id: a51b965c4f
2014-04-16 14:54:59 -05:00
Brian Clements
b8f40429ec
Issue #3021 increased width of create session dialog to fit error msg
...
Former-commit-id: 78c1b34cdf
[formerly ef791fe481
] [formerly 1112ca621e
] [formerly bb915796ad
[formerly 1112ca621e
[formerly f0bcc20987d814a716994f712c6132bb79963457]]]
Former-commit-id: bb915796ad
Former-commit-id: fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2
]
Former-commit-id: 549941882e
2014-04-16 14:33:02 -05:00
Brian Clements
89741a1e62
Issue #3020 fixed error message when attempting to create already accessible room
...
Former-commit-id: 0c203cfd07
[formerly 57d2f28d54
] [formerly bfafb0d055
] [formerly 4a8ee65cca
[formerly bfafb0d055
[formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 58b38675284b585270d0e5118c40f102fbfd1852 [formerly 8861489810
]
Former-commit-id: 4829ef25bc
2014-04-16 14:26:17 -05:00
Lee Venable
8380646a7a
Issue #3034 - added widget dispose checks in runAsync methods.
...
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
Former-commit-id: 27b5524848
[formerly f4fb7b24f6
] [formerly 7f068f164c
] [formerly ff3b42468f
[formerly 7f068f164c
[formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]
Former-commit-id: ff3b42468f
Former-commit-id: aa35106e2bcb598175d4b13f4c68868a8f657f1d [formerly 4cdbf301f3
]
Former-commit-id: 885e17788d
2014-04-16 13:15:31 -05:00
Brian Clements
3a6bb9f43c
Issue #2981 fixed NPE when cached shared group deleted on server
...
Former-commit-id: 9473f1f799
[formerly 8a4f212fdb
] [formerly 7afb1e66f5
] [formerly 7fd7817af4
[formerly 7afb1e66f5
[formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]
Former-commit-id: 7fd7817af4
Former-commit-id: bd2ff121fc86675239805e4cf8a2decb18f093b2 [formerly 007ba2ae4d
]
Former-commit-id: 1daf03844c
2014-04-16 09:23:26 -05:00
Nate Jensen
76f191192c
Merge "Issue #2956 safety checks for GLShadedShapeBase" into development
...
Former-commit-id: 0b85a99337
[formerly 2fba1f36ef
] [formerly 80434db98d
] [formerly 120d8429a7
[formerly 80434db98d
[formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]
Former-commit-id: 120d8429a7
Former-commit-id: ba3109c60afbaff247b963019ac0ea3cfd8248fb [formerly 62613ab33d
]
Former-commit-id: 2e23ae75f4
2014-04-16 08:41:43 -05:00
Nate Jensen
dc74920834
Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development
...
Former-commit-id: 9dc2c1187c
[formerly c723ec0bda
] [formerly 771885f9a5
] [formerly c16bbb52e4
[formerly 771885f9a5
[formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]
Former-commit-id: c16bbb52e4
Former-commit-id: 337b6a7e826170373ae4e133ca9ba41486c415c1 [formerly 550577806f
]
Former-commit-id: 79c3f5f3a8
2014-04-15 17:55:21 -05:00
Nate Jensen
e1b9c91df1
Issue #2956 safety checks for GLShadedShapeBase
...
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451
Former-commit-id: 796efabc3b
[formerly 66f4ce250a
] [formerly 726c122dc7
] [formerly 8b93dffb4f
[formerly 726c122dc7
[formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: da7df5c1cb8add048021783ebafe66b2d4afe16b [formerly 56f645bbc7
]
Former-commit-id: 2cf5941fe1
2014-04-15 17:38:17 -05:00
Lee Venable
1c0b3bf7f7
Merge "Issue #3031 - Added dispose check in the runAsync calls." into development
...
Former-commit-id: 30c5233ae4
[formerly 14f0dc298e
] [formerly cde3cdeed1
] [formerly 2a93e03117
[formerly cde3cdeed1
[formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]
Former-commit-id: 2a93e03117
Former-commit-id: 78f80c2eced18a183f677dcd92efee78aa09ec9c [formerly c9c845d5f2
]
Former-commit-id: a34e169792
2014-04-15 17:37:13 -05:00
Everett Kladstrup
2456ee3a86
Issue #2725 Move viirs derivparam python package to common_static
...
Former-commit-id: bc40caa959
[formerly 08dfcd9bd9
] [formerly 5dbedee47a
] [formerly 200f8f461d
[formerly 5dbedee47a
[formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]
Former-commit-id: 200f8f461d
Former-commit-id: 1eb42c2f057f83a9554ddd2f1f5814896fb645b5 [formerly fd2ddd24a7
]
Former-commit-id: 158e1fd086
2014-04-15 16:53:07 -05:00
Lee Venable
9e662e2a21
Issue #3031 - Added dispose check in the runAsync calls.
...
Change-Id: I7996f58995aa261a1a66acc755768c3489130d43
Former-commit-id: cdc1edef6b
[formerly 39b9d94dc1
] [formerly d4aafc69d9
] [formerly 2122b79416
[formerly d4aafc69d9
[formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]
Former-commit-id: 2122b79416
Former-commit-id: 171f7d971779860672bb25dbda78f2ce0c6f989b [formerly c3f4bccbf9
]
Former-commit-id: e30c910657
2014-04-15 16:49:42 -05:00
Everett Kladstrup
133dff106f
Issue #2725 Fix localization type for DerivParamLocalizationAdapter
...
Former-commit-id: 9f3f3f2b69
[formerly 4f1c7281d3
] [formerly 27885c8296
] [formerly 54db6ad9af
[formerly 27885c8296
[formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]
Former-commit-id: 54db6ad9af
Former-commit-id: 5eaecc4538d5563c1f6b15d1ab3f3819ede97fdb [formerly ca7b672b52
]
Former-commit-id: c2dfdf8cae
2014-04-15 15:18:09 -05:00
Brian Clements
602794b56d
Issue #2822 only allow transfer leader if participant is using shared display
...
Former-commit-id: dc1d2d39f8
[formerly db67c03382
] [formerly 5e13503b9abb63ac2a2c246e1d0e4eba40c2ad52 [formerly 5250f7a442
]] [formerly 6ccedc1182
[formerly 5250f7a442
[formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729
]
Former-commit-id: 6f9ef9a515
2014-04-15 15:15:11 -05:00
Brian Clements
5b5669e1e1
Issue #2903 made xmpp reconnect an explicit action by user
...
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect
Former-commit-id: 3d8bcb8701
[formerly 6f7851d8c4
] [formerly 8ab1bab974
] [formerly 6b22374046
[formerly 8ab1bab974
[formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a
]
Former-commit-id: ca5909e222
2014-04-15 15:12:33 -05:00
Mike Duff
dceb75c423
Issue #2785 - Fix loading of groups in sub request dialog
...
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722
Former-commit-id: c70da23f91
[formerly 3a6e718ff0
] [formerly 81e4c9b05d
] [formerly d2a80ca966
[formerly 81e4c9b05d
[formerly e72a852935dcb519604b37dc873645d4b419ee43]]]
Former-commit-id: d2a80ca966
Former-commit-id: 97976d43b384551d73f379695ead9b9d54c82cb5 [formerly 4773c3722c
]
Former-commit-id: 0bf14203ff
2014-04-15 10:10:18 -05:00
Nate Jensen
dacc1d5996
Issue #2984 remove unnecessary plugins from features
...
remove unnecessary uengine dependencies from manifests
Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d
Former-commit-id: c0df96e085
[formerly e24940ead6
] [formerly 56280c47faa8df4c130fc7ca68cdcf59c00e6094 [formerly 6e2d68e102
]] [formerly 57f2357f10
[formerly 6e2d68e102
[formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]
Former-commit-id: 57f2357f10
Former-commit-id: dad31d1699bb36bcaccd3d7e306c1af3e1f8b973 [formerly d435258fce
]
Former-commit-id: 97f09968b3
2014-04-14 16:50:54 -05:00
Nate Jensen
b9be7343bf
Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development
...
Former-commit-id: 7c58c1262a
[formerly d741f996c6
] [formerly c71205eb89
] [formerly 111b7f4283
[formerly c71205eb89
[formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]
Former-commit-id: 111b7f4283
Former-commit-id: c249e01da13dd43a2a49740d644cfa02fc5f32ca [formerly 9917a8ef62
]
Former-commit-id: 9593960e9f
2014-04-14 15:46:14 -05:00
Ron Anderson
9b2cd2d486
Merge changes Ic5c0dcaa,Iae10909e into development
...
* changes:
Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
Issue #2947 Make GridCoverage implement IGridGeometryProvider.
Former-commit-id: 6063cdd984
[formerly d5ebb5a800
] [formerly 46d5349940
] [formerly fd79bd354b
[formerly 46d5349940
[formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]
Former-commit-id: fd79bd354b
Former-commit-id: 5456b75aa7d4a323625c887f487c61c54177d524 [formerly 5ab1b1b95c
]
Former-commit-id: d2346699bb
2014-04-14 14:45:03 -05:00
Nate Jensen
134f34c4df
Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
...
plugin
Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a
Former-commit-id: 33fb2c2e0d
[formerly 40d1fda798
] [formerly f086bb0c9b
] [formerly ceec3d48f0
[formerly f086bb0c9b
[formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e
]
Former-commit-id: dfe50ee038
2014-04-14 14:28:11 -05:00
Lee Venable
70cc279e37
Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development
...
Former-commit-id: 09afdba1fe
[formerly 1a3738c8fd
] [formerly f6601d6bcc
] [formerly d4a6ce546d
[formerly f6601d6bcc
[formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]
Former-commit-id: d4a6ce546d
Former-commit-id: 3f0a4ef9f6a2a757d0bd3de95cef502c549c0dff [formerly caf31402d7
]
Former-commit-id: bf4f3c75ef
2014-04-14 14:09:03 -05:00
Richard Peter
4aad8cf61c
Merge "Issue #2862 Implements locks on case creation." into development
...
Former-commit-id: 50624b548a
[formerly 22a01edbb7
] [formerly 19755418f8
] [formerly 181ffee3db
[formerly 19755418f8
[formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: 94d21459e635974814c625195c69afdafdc4a867 [formerly 0abb97820b
]
Former-commit-id: c4853e7982
2014-04-14 13:28:26 -05:00
Richard Peter
b5fa843960
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 909571ebca
[formerly e4be1f24e7
] [formerly dbba727f3d
] [formerly 17196b5dcd
[formerly dbba727f3d
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1
]
Former-commit-id: ff87317bd4
2014-04-14 13:10:11 -05:00
Nate Jensen
28455b8d42
Merge "Issue #2241 fix tear off menus in practice mode" into development
...
Former-commit-id: 1882acee98
[formerly 2a0c73fb25
] [formerly 47eb9ecb0a
] [formerly 5fe4c08ab6
[formerly 47eb9ecb0a
[formerly 4fedbaacf54b5194afb9548101badc4619347638]]]
Former-commit-id: 5fe4c08ab6
Former-commit-id: d47a5b14445159c53f75e0aafca11164146f6133 [formerly f77b99b51c
]
Former-commit-id: 60ee75d3df
2014-04-14 09:28:34 -05:00
Richard Peter
d5149f4409
Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
...
Former-commit-id: 84bb4e5e32
[formerly 97fb03df02
] [formerly 91e941f60a
] [formerly 9ef8347f23
[formerly 91e941f60a
[formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: 0189c0a9c6497ecc36bfd9e74f6935af94b96c99 [formerly ffd74e6787
]
Former-commit-id: a4eba6e6df
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
a224105467
Issue #2947 Minor satellite and derived parameter improvements.
...
Former-commit-id: 4004fe2d18
[formerly 2d66e58671
] [formerly dd794a3c12
] [formerly 428f3a2d8b
[formerly dd794a3c12
[formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: 8166890980b160e863adea23a121042b57a2fc64 [formerly 6c92b645f0
]
Former-commit-id: b120feab6f
2014-04-11 17:37:59 -05:00
Ben Steffensmeier
48a6b0fdf8
Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
...
Former-commit-id: 3efa47aafd
[formerly ca78a04d95
] [formerly d5b91d8846
] [formerly 1ad8396366
[formerly d5b91d8846
[formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]]
Former-commit-id: 1ad8396366
Former-commit-id: 210e31e5660405a56e7296c949aac3ee05d190f4 [formerly fb85857ff5
]
Former-commit-id: b707e3b6db
2014-04-11 17:34:38 -05:00
Richard Peter
56089894f2
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf
[formerly cd51f3fa87
] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f
]] [formerly 21ae3b5fcd
[formerly 3575d6586f
[formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66
]
Former-commit-id: d65b11d404
2014-04-11 16:23:09 -05:00
Roger Ferrel
bd722b378a
Issue #2862 Implements locks on case creation.
...
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: 67399901a0
[formerly 16fab01b8b
] [formerly 5570261d74
] [formerly cfea0489d7
[formerly 5570261d74
[formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]
Former-commit-id: cfea0489d7
Former-commit-id: 9eb23d5c82b57af43b0527c290b725d2880e27a1 [formerly d66a346c65
]
Former-commit-id: c5de39c162
2014-04-11 16:07:58 -05:00
Richard Peter
ed571fbebd
Merge "Issue #2864 - Change how saved subset files are stored." into development
...
Former-commit-id: ce74b40f0b
[formerly 69c6217ae9
] [formerly 8a682a5e23
] [formerly 695878c6aa
[formerly 8a682a5e23
[formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b517923cac7561c9a58df72238f27a0df00b52df [formerly 0fa4180959
]
Former-commit-id: b4cc44faa0
2014-04-11 09:41:31 -05:00
Mike Duff
6e9e743fdc
Issue #2864 - Change how saved subset files are stored.
...
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c
Former-commit-id: 3404a4beb4
[formerly a58f279b54
] [formerly 82cf444d6f
] [formerly 890faf2d73
[formerly 82cf444d6f
[formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]
Former-commit-id: 890faf2d73
Former-commit-id: ddc580d7996e5dbb65fac9aa71fcaadccf9ac671 [formerly 6d8bead4a7
]
Former-commit-id: dc2a5b0c6f
2014-04-11 08:27:42 -05:00
Nate Jensen
1de04d9b2b
Merge "Issue #2937 Connect to the venue after the feed view is available." into development
...
Former-commit-id: 86acc1b95b
[formerly c7593d61c4
] [formerly 5fc6942fab
] [formerly b3b9dbff67
[formerly 5fc6942fab
[formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]]
Former-commit-id: b3b9dbff67
Former-commit-id: e0d198c9c923c84f5c7f01b7be3395913cd0db68 [formerly 4a395ff2bc
]
Former-commit-id: 7f32159599
2014-04-10 16:59:17 -05:00
Everett Kladstrup
1c2141ee39
Issue #2725 Moving derivparam plugins to the lowest applicable features
...
Former-commit-id: c22e8323d1
[formerly 7fd3d7ce3d
] [formerly b074c88957
] [formerly ed0c157e33
[formerly b074c88957
[formerly 4397d0c6018858ab967110884cfdb7771c08e199]]]
Former-commit-id: ed0c157e33
Former-commit-id: 46e6bb43ef503376f26cf3a43ffbac64653319d2 [formerly b9f67d3bae
]
Former-commit-id: 70a383f68d
2014-04-10 16:00:22 -05:00
Matt Nash
edd8c9185e
Issue #2241 fix tear off menus in practice mode
...
Change-Id: I52a2e9be64bff8a044b148666b7ad77670a6f64e
Former-commit-id: 4dc5f614b3
[formerly f5e333c154
] [formerly 35451bbd2178a902e5df41c477872fdb2f45f1a8 [formerly 81c4976c96
]] [formerly 0eed368ac4
[formerly 81c4976c96
[formerly 391655cd6a84c6cbf31e711ec5e1aa92833db896]]]
Former-commit-id: 0eed368ac4
Former-commit-id: 86544febdae736a9401f59264c6f5bfd1f622710 [formerly 46df69447b
]
Former-commit-id: d91e77641b
2014-04-10 14:50:06 -05:00
Everett Kladstrup
2bdc415769
Issue #2725 Put derivparam plugins in viz and edex separately
...
Former-commit-id: e543570a07
[formerly 90244ad7ec
] [formerly d76aaed2f0
] [formerly 1a8a05cd0e
[formerly d76aaed2f0
[formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: a7438ce6930c1b0cfa77ca4e1ab2e52ab9d87305 [formerly db413dc65f
]
Former-commit-id: fa9ee97662
2014-04-10 14:08:42 -05:00
Brad Gonzales
ccc4bc5a27
Issue #2937 Connect to the venue after the feed view is available.
...
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 0380e02c77
[formerly 5fcec27765
] [formerly cc0fd1e9af
] [formerly ea03096031
[formerly cc0fd1e9af
[formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: 4877a895772c022be238b72f3f06a1ed801f3390 [formerly 3b25edad9a
]
Former-commit-id: e41f9defa4
2014-04-10 14:01:53 -05:00
Nate Jensen
b36e4b7b65
Merge "Issue #1803 fix redbook sharing in collaboration" into development
...
Former-commit-id: 30dbefd6c3
[formerly 74a7189143
] [formerly e88519c5e3
] [formerly 666b271528
[formerly e88519c5e3
[formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: e4c7b26770ed84f07c5a54f42347655f7d948564 [formerly 573981b0d5
]
Former-commit-id: 5d17f07d25
2014-04-10 13:50:55 -05:00
Mike Duff
29b9ea212f
Issue #2892 - Fix problems loading saved configs for data browser dialog.
...
Change-Id: I73b98714642f5852f7209fd8533d49aa473412f9
Former-commit-id: 578aa18528
[formerly 635684bb4e
] [formerly 33a2259cf4
] [formerly da65756e3b
[formerly 33a2259cf4
[formerly 323badf58cf12a35b3a4d93ff0188b638e60969b]]]
Former-commit-id: da65756e3b
Former-commit-id: b538cf660c9cfb4fa877799b800a871c591269c0 [formerly 67ff4371b3
]
Former-commit-id: a23608ec59
2014-04-10 13:31:42 -05:00
David Gillingham
969dccd366
Issue #3004 : Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
...
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a1
[formerly 1c7e650e6a
] [formerly c8a6dc8769
] [formerly da31ab2042
[formerly c8a6dc8769
[formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94
]
Former-commit-id: 0385a4395e
2014-04-10 11:24:40 -05:00