Commit graph

3135 commits

Author SHA1 Message Date
Nate Jensen
b8b288fe6d Merge "Issue #2177 Updated logic." into omaha_13.5.2
Former-commit-id: f0a1a88300 [formerly ff925217e7] [formerly f0a1a88300 [formerly ff925217e7] [formerly b1a830dbf0 [formerly 23da6901f5d002d727f406beeada4008dacb77f0]]]
Former-commit-id: b1a830dbf0
Former-commit-id: ff01e86c2c [formerly 0557bb9ce8]
Former-commit-id: cbe1ef0849
2013-09-23 13:29:07 -05:00
Steve Harris
2fdf959174 Merge branch 'master_13.5.2' into omaha_13.5.2
Former-commit-id: a10bee00ae [formerly 739b04fffd] [formerly a10bee00ae [formerly 739b04fffd] [formerly 6a803c0d62 [formerly 45d3f23423b8e335de508a6a0a791274ce6ba77a]]]
Former-commit-id: 6a803c0d62
Former-commit-id: 969e0bb52f [formerly cbc396a12c]
Former-commit-id: 7c781e9e88
2013-09-23 12:02:31 -05:00
Jonathan Sanchez
ff8a4faa2d Issue #2177 Updated logic.
Change-Id: I8299798020ce1c421ffd13abfb330a9da5a3964d

Former-commit-id: a1e2b02713 [formerly dc76da8825] [formerly a1e2b02713 [formerly dc76da8825] [formerly b553e5de15 [formerly 7c01e646001b97e3f8982252a37ac806d96b9314]]]
Former-commit-id: b553e5de15
Former-commit-id: d8bc0d8ac6 [formerly 345e67fba6]
Former-commit-id: 40c32e1255
2013-09-23 11:38:35 -05:00
Steve Harris
b7b8d4a0b7 13.5.2-6 baseline
Former-commit-id: 059549438a [formerly 3821475d4e] [formerly 059549438a [formerly 3821475d4e] [formerly 3837fbe670 [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]
Former-commit-id: 3837fbe670
Former-commit-id: 557a7c87d5 [formerly 22cb9b98cd]
Former-commit-id: f91cf37d43
2013-09-23 10:03:15 -04:00
Steve Harris
0b00f06e20 Merge branch 'master_13.5.2' (13.5.2-5) into omaha_13.5.2
Former-commit-id: ae10695a27 [formerly 4bd09261ee] [formerly ae10695a27 [formerly 4bd09261ee] [formerly 3aa91aa5c7 [formerly 7da2eecc2d0143bb46b91ef3f9c38070044db99b]]]
Former-commit-id: 3aa91aa5c7
Former-commit-id: a33e660c6b [formerly 017b5388d0]
Former-commit-id: c25e81351d
2013-09-16 09:27:00 -05:00
Steve Harris
fb70a4b4b0 13.5.2-5 baseline
Former-commit-id: 31111f4f52 [formerly 0745317d53] [formerly 31111f4f52 [formerly 0745317d53] [formerly 67cceefe5d [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]]
Former-commit-id: 67cceefe5d
Former-commit-id: c8ead44672 [formerly 6202bacae1]
Former-commit-id: c79546c83a
2013-09-16 10:14:25 -04:00
Steve Harris
0d1324bc8b Merge branch 'master_13.5.2' (13.5.2-4) into omaha_13.5.2
Former-commit-id: 71ab437e3a [formerly 348928da7f] [formerly 71ab437e3a [formerly 348928da7f] [formerly 322a69b3fa [formerly a3762af49357106fd308d1a495e64fa2d6389a1e]]]
Former-commit-id: 322a69b3fa
Former-commit-id: 1288d9de57 [formerly 10afb1fbaf]
Former-commit-id: f8ebc33909
2013-09-12 10:55:44 -05:00
Steve Harris
609926f1f4 13.5.2-4 baseline
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b] [formerly 595e7bc0d9 [formerly e3c935d48b] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 4c6790f10f [formerly abed443b59]
Former-commit-id: e2398f74e5
2013-09-12 11:13:59 -04:00
Jonathan Sanchez
3666e926a5 Issue #2176 Increased line width of emergency polygon and changed font for regular warning products.
Change-Id: Icb5456d038a8a2fadbe10f70a2ef32c8ba1f7816

Former-commit-id: 3f0c709b3f [formerly ce051787a7] [formerly 3f0c709b3f [formerly ce051787a7] [formerly a57cec0ed8 [formerly 61dd32d0244c9a6af8e63ed2b789cfa15d7c9539]]]
Former-commit-id: a57cec0ed8
Former-commit-id: 18e48b4ab5 [formerly ff9bac0d3b]
Former-commit-id: 8a0ae16a5d
2013-09-05 11:24:16 -05:00
Steve Harris
a7d2504923 Merge branch 'master_13.5.2' into omaha_13.5.2
Former-commit-id: d002ceea4d [formerly f53ac4645b] [formerly d002ceea4d [formerly f53ac4645b] [formerly cdc4971010 [formerly 5d8e754f6958fe35dc99df47f8d5a89f133773c8]]]
Former-commit-id: cdc4971010
Former-commit-id: 57db023bfd [formerly b51dd7824a]
Former-commit-id: ca0b90a631
2013-09-04 13:23:53 -05:00
Steve Harris
41a6eebf23 13.5.2-3 baseline
Former-commit-id: 91fb128c17 [formerly 9fdd0e51a0] [formerly 91fb128c17 [formerly 9fdd0e51a0] [formerly bae0a20b8e [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]]
Former-commit-id: bae0a20b8e
Former-commit-id: 8ac02ce922 [formerly c666ac7283]
Former-commit-id: ccc5095251
2013-09-04 14:13:29 -04:00
Ron Anderson
c5b23e9f11 Issue #2321 Fixed smartInits for D2D accumulative parameters
Change-Id: I2cb802f6d0f2d5cc8364d5030a497528b5a3999e

Former-commit-id: 06258f91e6 [formerly d14abbec74] [formerly 06258f91e6 [formerly d14abbec74] [formerly f056b3e02c [formerly 5e168359f93663dc160e42495bbe93647c4f4fb8]]]
Former-commit-id: f056b3e02c
Former-commit-id: 5aed04b3c1 [formerly 4314a3c499]
Former-commit-id: 1d6e5ccc99
2013-09-04 08:49:13 -05:00
Ron Anderson
ccef143aec Merge "Issue #2287 Fix yet another NullPointer in GFEColorBarResource" into omaha_13.5.2
Former-commit-id: 9094139a56 [formerly 4eb49628fd] [formerly 9094139a56 [formerly 4eb49628fd] [formerly 1de723239f [formerly 3034c7f8e4b61547abbb79134fb7fd1c059aab28]]]
Former-commit-id: 1de723239f
Former-commit-id: cfcd83bfa6 [formerly d3ea39d1c2]
Former-commit-id: c79d7d2346
2013-08-29 17:45:37 -05:00
Ron Anderson
8b6d77e18a Issue #2287 Fix yet another NullPointer in GFEColorBarResource
Change-Id: I96ff6cdff49d444f4cb90fb219531901c19460ae

Former-commit-id: 5835b2d4fd [formerly 37d94d921b] [formerly 5835b2d4fd [formerly 37d94d921b] [formerly 2e24094983 [formerly dabdce1482cc80b794e8f82ac55d6867a43f0c89]]]
Former-commit-id: 2e24094983
Former-commit-id: a1a58c2d35 [formerly dc1323010c]
Former-commit-id: 28d7012eda
2013-08-29 17:38:01 -05:00
Richard Peter
f693ba6e8d Merge "Issue #2279 - updated python qpid library" into omaha_13.5.2
Former-commit-id: dc76e6acfd [formerly 7ce8d46784] [formerly dc76e6acfd [formerly 7ce8d46784] [formerly 97517f0108 [formerly 423c06087708989914ee57eaea17e538ad5e4d17]]]
Former-commit-id: 97517f0108
Former-commit-id: aa77191711 [formerly 8c9e3bfbb9]
Former-commit-id: 27f1a3cf53
2013-08-29 17:21:33 -05:00
Ron Anderson
8349930763 Issue #2287 Fix null pointer in GFEColorBarResource
Change-Id: I477a7d5cc58e61b9d521337a94801114cecde62a

Former-commit-id: 59c8dc4fae [formerly 4e768e812d] [formerly 59c8dc4fae [formerly 4e768e812d] [formerly 8f8e041802 [formerly add48ba3bbf77e6e7cbfa756e6da75c78aab6f0f]]]
Former-commit-id: 8f8e041802
Former-commit-id: 4cbdeefa33 [formerly 316ba03c10]
Former-commit-id: d782787ec6
2013-08-29 16:53:55 -05:00
Bryan Kowal
94b4a54523 Issue #2279 - updated python qpid library
- python qpid is no longer compiled; so, the rpm is now noarch


Former-commit-id: d77dd5a22c [formerly 818c69fb39] [formerly d77dd5a22c [formerly 818c69fb39] [formerly f2dd3ab85a [formerly 8487a7abdc967f39f853919b5c274b354a674b2c]]]
Former-commit-id: f2dd3ab85a
Former-commit-id: 572e1c0b33 [formerly 981562faac]
Former-commit-id: b1aed4e6fd
2013-08-29 16:00:45 -05:00
Ron Anderson
7fd0fe6ba7 Merge "Issue #2287 Fixed fitToDataColorTable for Single Grids" into omaha_13.5.2
Former-commit-id: 6a42802aba [formerly ef10d1aa13] [formerly 6a42802aba [formerly ef10d1aa13] [formerly 183d3944e4 [formerly 72e14b106419a137075642c77a051fa82ddb91e1]]]
Former-commit-id: 183d3944e4
Former-commit-id: 8b688aa10f [formerly e366726d06]
Former-commit-id: 9fa57c63a6
2013-08-29 14:25:45 -05:00
Steve Harris
db663043c7 Merge branch 'master_13.5.2' (13.5.2-2) into omaha_13.5.2
Conflicts:
	msi/VizLauncher/VizLauncher.suo
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
	msi/build/A2Staging/VisualStudio/VizLauncher.exe

Former-commit-id: 4a0604f28c [formerly 866885e3eb] [formerly 4a0604f28c [formerly 866885e3eb] [formerly 347d1eaef4 [formerly c3a0913f289df802c65015686f877ca9c5e42bf5]]]
Former-commit-id: 347d1eaef4
Former-commit-id: 539b51afc9 [formerly 9a6a2561fc]
Former-commit-id: 29e2e0a01c
2013-08-29 14:19:17 -05:00
Steve Harris
db64b2e2d9 13.5.2-2 baseline
Former-commit-id: 8cde3b2b54 [formerly 4a47fb97c5] [formerly 8cde3b2b54 [formerly 4a47fb97c5] [formerly 9e4bf0cf2e [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 12b0ab91fd [formerly 5de6d566f0]
Former-commit-id: 180e042b5d
2013-08-29 15:01:29 -04:00
Ron Anderson
05224fd829 Issue #2287 Fixed fitToDataColorTable for Single Grids
Change-Id: I00325b40af3803bd0cfed601371904e5e24c1abe

Former-commit-id: 344db44bc7 [formerly 37795f1407] [formerly 344db44bc7 [formerly 37795f1407] [formerly 0b6ec808f2 [formerly 1cffae67f0150e1a2b1509e560383aa506e4284f]]]
Former-commit-id: 0b6ec808f2
Former-commit-id: 078a619cf8 [formerly 561d4cce0b]
Former-commit-id: a70032a961
2013-08-29 13:36:04 -05:00
Max Schenkelberg
e2fa55d75a Issue #2300 Fixed NPE in TileSetRenderable with ConcurrentHashMap
Change-Id: I9d92e330c66364b2eb904d5858eb6d8a4a75a542

Former-commit-id: 02cc4abf19 [formerly dc6ed0a61e] [formerly 02cc4abf19 [formerly dc6ed0a61e] [formerly 6eedb5e26d [formerly 34f9fdb02b82dd27d8f266bcd78291ebd9586bb5]]]
Former-commit-id: 6eedb5e26d
Former-commit-id: d1d134697d [formerly 7175092cb9]
Former-commit-id: e7406a6b07
2013-08-28 14:03:13 -05:00
Ron Anderson
f157906d33 Merge "Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave." into omaha_13.5.2
Former-commit-id: de2507a851 [formerly 89c1f24ff8] [formerly de2507a851 [formerly 89c1f24ff8] [formerly a78ebffdb5 [formerly 475d289ae5a3a024d5f52f7a2c8263533ada6e3f]]]
Former-commit-id: a78ebffdb5
Former-commit-id: 0264f3dee8 [formerly a7a4f9d60e]
Former-commit-id: 0473feab57
2013-08-28 11:18:34 -05:00
Steve Harris
821a722a72 Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 34e085ff97 [formerly 0791be2b77] [formerly 34e085ff97 [formerly 0791be2b77] [formerly cfe2ba88ad [formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 5abb143d01 [formerly 116daf48ff]
Former-commit-id: 41b7f325bb
2013-08-28 09:03:09 -05:00
Steve Harris
1900cef156 13.5.2-1 baseline
Former-commit-id: 894d2425b2 [formerly 73dd0f166c] [formerly 894d2425b2 [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]
Former-commit-id: 542b2c3d18
Former-commit-id: 43af1b227a [formerly 4ecb349ed8]
Former-commit-id: 4a9a91ce2e
2013-08-28 09:43:48 -04:00
Ron Anderson
5ff2d27371 Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave.
Change-Id: I3d9b8b2441a0b79d393ab4591450b084d24dafc3

Former-commit-id: 66032fcfd7 [formerly f75dc91293] [formerly 66032fcfd7 [formerly f75dc91293] [formerly ab4c1ebe5d [formerly 29e2ea5d61af71a366d3a81908b16b4c6a6850f6]]]
Former-commit-id: ab4c1ebe5d
Former-commit-id: 877f9b9bc3 [formerly 2670db83fd]
Former-commit-id: c71a74ef01
2013-08-27 18:54:14 -05:00
Ron Anderson
24f43305b3 Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
Change-Id: Id12823256fc3c383005098b83e72249284a36f33

Former-commit-id: df357588a0 [formerly 77db16933e] [formerly df357588a0 [formerly 77db16933e] [formerly 803515f4ff [formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]
Former-commit-id: 803515f4ff
Former-commit-id: a1952b7c75 [formerly 518e32206e]
Former-commit-id: d4a2df4eb5
2013-08-27 13:51:17 -05:00
Bryan Kowal
1ae985d556 Issue #2198 - completely override the Path and PythonPath in the environment.
- PythonPath is specific to CAVE and will not normally be set
- What is currently set in Path is not relevant because we are running ported code


Former-commit-id: 6b9ca89bbc [formerly f5c3b89dd2] [formerly 6b9ca89bbc [formerly f5c3b89dd2] [formerly e1415e3689 [formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]]
Former-commit-id: e1415e3689
Former-commit-id: 5b58abe854 [formerly 5458f6956b]
Former-commit-id: 029369f3d5
2013-08-26 12:43:43 -05:00
Lee Venable
ee53cc88fa Issue #2283 - cleaned up some synchronizrd code.
Former-commit-id: b8f94691c1 [formerly 027dae1e9b] [formerly b8f94691c1 [formerly 027dae1e9b] [formerly ea4df9cb2d [formerly f162222be931d03c3a0401205869d48854703c36]]]
Former-commit-id: ea4df9cb2d
Former-commit-id: b03ec5a6fe [formerly d3268de97a]
Former-commit-id: fc562788fd
2013-08-26 09:41:21 -05:00
Steve Harris
daa4470372 Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	nativeLib/edexBridge/edexBridge.cpp

Former-commit-id: decc9e4c36 [formerly e361386eab] [formerly decc9e4c36 [formerly e361386eab] [formerly 119af8a466 [formerly a3671ea2935178a28dce6d075dc2067a609e6725]]]
Former-commit-id: 119af8a466
Former-commit-id: f56b906997 [formerly 5b11d137df]
Former-commit-id: 7a5e176937
2013-08-23 11:36:43 -05:00
Jonathan Sanchez
9a0132231a Issue #2176 Implemented emergency warning products.
Cherry picked from 13.6.1 e6bb79e45c989e4292b8485307ae239e491cb630 [formerly 67ce90c14a] [formerly c62de0d75f [formerly 7d74ba5ee1] [formerly c62de0d75f [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]] to 13.5.2

Change-Id: I80623a63abd495baf3e0004625732f26453a30d9

Former-commit-id: 051cdc28c2 [formerly e0bd81c0ae] [formerly 051cdc28c2 [formerly e0bd81c0ae] [formerly cf51ba9e9c [formerly be486757ed36916c1c3a1e56ddf98754b900b693]]]
Former-commit-id: cf51ba9e9c
Former-commit-id: c9026b5709 [formerly 051c8103c7]
Former-commit-id: 9280f2920f
2013-08-22 12:25:42 -05:00
Lee Venable
490df21887 Merge "Issue #2177 Improve county portion descriptions." into omaha_13.5.2
Former-commit-id: a0437634dc [formerly 07f087013f] [formerly a0437634dc [formerly 07f087013f] [formerly 321ddebdde [formerly 1b7f1d8dce2cc1161ce06ca0c4a8df68803a12e1]]]
Former-commit-id: 321ddebdde
Former-commit-id: f5f1525809 [formerly 0af2308491]
Former-commit-id: 2e26b28a40
2013-08-22 11:53:18 -05:00
Jonathan Sanchez
119e5fd91d Issue #2177 Improve county portion descriptions.
Change-Id: I9b2326e0b57b2bba7223032e3f08846f0d2f121d

Former-commit-id: 67602003cd [formerly 0c06112925] [formerly 67602003cd [formerly 0c06112925] [formerly 321799e07b [formerly a8e74ba813cc841c6cc6ff06df73080d1ce1fd8c]]]
Former-commit-id: 321799e07b
Former-commit-id: e1663e7f8d [formerly edbc238355]
Former-commit-id: 4d8a18180b
2013-08-22 10:49:09 -05:00
Steve Harris
6c258a0b7c 13.5.1-18 baseline
Former-commit-id: d931b80e70 [formerly afb34814dd] [formerly d931b80e70 [formerly afb34814dd] [formerly 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 261b1da9d6 [formerly 2f9aa87a9f]
Former-commit-id: cde7f2a59c
2013-08-22 09:12:43 -04:00
Steve Harris
dd7caa0780 Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into omaha_13.5.2
Former-commit-id: e6b0fcf6c9 [formerly cb1b7ecc55] [formerly e6b0fcf6c9 [formerly cb1b7ecc55] [formerly a1b6f8c50c [formerly 37c80d08633e4ab0f7ba6ead07e4cb6fa54e1194]]]
Former-commit-id: a1b6f8c50c
Former-commit-id: 617c51d5f6 [formerly a2f17e7af1]
Former-commit-id: 572e76e384
2013-08-21 10:37:52 -05:00
Ben Steffensmeier
48ac0e726d Issue #2194 Fix site override.
Former-commit-id: de00b302b3 [formerly 791c6a9890] [formerly de00b302b3 [formerly 791c6a9890] [formerly dac718634c [formerly faba58780d497f8db564c0fa325c07b35326e010]]]
Former-commit-id: dac718634c
Former-commit-id: e757a184e1 [formerly 4e218e9e56]
Former-commit-id: 7bf35bdac6
2013-08-20 14:47:32 -05:00
Bryan Kowal
8503422d36 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 013ba62af1 [formerly a1fccaa598] [formerly 013ba62af1 [formerly a1fccaa598] [formerly 21cfeb1b83 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: eec811c3b1 [formerly 6cf776926c]
Former-commit-id: 433efe1982
2013-08-20 13:56:07 -05:00
Bryan Kowal
cafb0da888 Issue #2213 - create the primary and backup exportgrids directories for GFESuite
- Amend: no longer create the exportgrids tmp directory

Change-Id: Id8aba47244c21d2d7e114ac1af6a29b9a8cd7059

Former-commit-id: 684c350d12 [formerly 72a841bcd5] [formerly 684c350d12 [formerly 72a841bcd5] [formerly d58a720e38 [formerly d3736e2b8d83616f0a7c35475c5a552fdae79674]]]
Former-commit-id: d58a720e38
Former-commit-id: 525ec05c44 [formerly e3b8567548]
Former-commit-id: 90be457e49
2013-08-20 11:43:18 -05:00
Ben Steffensmeier
02d3f28c06 Issue #2275 Add dataURI column back into bufrmos types.
Former-commit-id: d6ab7d08be [formerly 4cb853ac39] [formerly d6ab7d08be [formerly 4cb853ac39] [formerly 9219db0069 [formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]
Former-commit-id: 9219db0069
Former-commit-id: 3a8893846f [formerly 8b9031719a]
Former-commit-id: 7668fdbde7
2013-08-19 16:00:01 -05:00
Steve Harris
4bcb06cd63 13.5.1-17 baseline
Former-commit-id: 2d882ccb54 [formerly 9dd7dc5d20] [formerly 2d882ccb54 [formerly 9dd7dc5d20] [formerly b210c90245 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: 7c0cf13ea8 [formerly a192a3ebb1]
Former-commit-id: 815bfe575c
2013-08-19 16:34:24 -04:00
Steve Harris
f93fdf5fc2 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: 9d07ebdab6 [formerly bc8af6e701] [formerly 9d07ebdab6 [formerly bc8af6e701] [formerly dc44ca76fb [formerly ab28f86a23e1c8b83204f57da9b8e7bd15cafe98]]]
Former-commit-id: dc44ca76fb
Former-commit-id: 703a110473 [formerly e03750d5f9]
Former-commit-id: 3c03bff519
2013-08-16 12:45:01 -05:00
Max Schenkelberg
16232ee8c7 Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611

Former-commit-id: a6a44754c9 [formerly 57a0df81a6] [formerly a6a44754c9 [formerly 57a0df81a6] [formerly 9e213438f4 [formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]
Former-commit-id: 9e213438f4
Former-commit-id: 0703b5c772 [formerly b67a3033f9]
Former-commit-id: f720f78f4c
2013-08-15 17:36:36 -05:00
Max Schenkelberg
6709242e36 Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7

Former-commit-id: 5a4d880498 [formerly e85d66f4e5] [formerly 5a4d880498 [formerly e85d66f4e5] [formerly 3800aec9e6 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 352e21ffd3 [formerly d89d13d029]
Former-commit-id: ee68615786
2013-08-15 15:50:40 -05:00
Bryan Kowal
e359fa1588 Issue #2257 - edexBridge now uses qpid 0.18 (64-bit)
- Amend: updated for 32-bit
- Amend: close sender, session, and connection independently

Change-Id: I9b8cafbc10d81782a812e9d2d57930e859fa29a5

Former-commit-id: 14fc0aba77 [formerly da29ff63f4] [formerly 14fc0aba77 [formerly da29ff63f4] [formerly 431dbaeaac [formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]]
Former-commit-id: 431dbaeaac
Former-commit-id: 00c47b4f24 [formerly 7c3c19f794]
Former-commit-id: 36c1e6cff3
2013-08-15 14:30:55 -05:00
Max Schenkelberg
b75d942133 Issue #2189 Added a FontType option when initializing a font from a file.
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Former-commit-id: b07ed474e3 [formerly eab65aab5a] [formerly b07ed474e3 [formerly eab65aab5a] [formerly 570266eb7b [formerly 473421a32f7c53453db1c5331714204a89bad4da]]]
Former-commit-id: 570266eb7b
Former-commit-id: 72fbe0208e [formerly 5840d99a95]
Former-commit-id: 4191582186
2013-08-15 13:51:07 -05:00
Steve Harris
7d10f18ae8 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: dfee8ca5d9 [formerly 67f7a8db62] [formerly dfee8ca5d9 [formerly 67f7a8db62] [formerly 282577d168 [formerly cfd93a48150e8c559622e806e98362a51f19aee0]]]
Former-commit-id: 282577d168
Former-commit-id: 1b31d1d62f [formerly 877d672852]
Former-commit-id: 850d0d54c6
2013-08-15 12:55:24 -05:00
Steve Harris
f8442ee983 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 08b105a492 [formerly 727eba03b9] [formerly 08b105a492 [formerly 727eba03b9] [formerly a687da6075 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: e5c50ad0b6 [formerly 522867f068]
Former-commit-id: 08a7c0831f
2013-08-15 12:46:48 -05:00
Steve Harris
ff03caef3d 13.5.1-16 baseline
Former-commit-id: 6818d80085 [formerly cd3b63d961] [formerly 6818d80085 [formerly cd3b63d961] [formerly 7ce0234d76 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: e881ff6271 [formerly d7b1ed4900]
Former-commit-id: af2b4495bb
2013-08-15 13:40:37 -04:00
Jonathan Sanchez
a1dc6ac50b Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 78b655fd1f [formerly 2b849d7003] [formerly 78b655fd1f [formerly 2b849d7003] [formerly bc30396b63 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]
Former-commit-id: bc30396b63
Former-commit-id: 19853a4b57 [formerly fca67fb4ca]
Former-commit-id: dbb60f2c13
2013-08-15 10:56:37 -05:00
David Gillingham
7729c52e6d Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: 8faf78d220 [formerly 2d6c6cdd39] [formerly 8faf78d220 [formerly 2d6c6cdd39] [formerly 17a45cafe5 [formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]]
Former-commit-id: 17a45cafe5
Former-commit-id: 64d4ecca53 [formerly db0d0374b0]
Former-commit-id: 6277627e7e
2013-08-14 17:13:58 -05:00