Commit graph

1770 commits

Author SHA1 Message Date
Richard Peter
c0bafd75dd Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
Former-commit-id: 4abe0f2e59 [formerly 03b2db312e] [formerly 82341a9fc1] [formerly 3be654e028 [formerly 82341a9fc1 [formerly aa178f96c90b1c13ade6eb7db297583e5241601c]]]
Former-commit-id: 3be654e028
Former-commit-id: 3368bc1fea10a6726f85b628d6d9cf0561a1b183 [formerly a765656f1d]
Former-commit-id: 9ef5384cd3
2013-06-04 14:57:10 -05:00
Richard Peter
a8780f26b5 Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.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/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]
Former-commit-id: 9c3fe01efa
2013-06-04 14:06:53 -05:00
Nate Jensen
e4158f9ece Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF

Former-commit-id: f4d0188254 [formerly 537b731f6e] [formerly 329d9d1c6a] [formerly 5d1ecb3a5d [formerly 329d9d1c6a [formerly 6742f7dbcac39261d8bee4e055bb9e4eda66520d]]]
Former-commit-id: 5d1ecb3a5d
Former-commit-id: 3ae61c25e5597f9a6be694c5608f437a8ff26eec [formerly 2d1405b9c4]
Former-commit-id: 412c21f516
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
01e46140cb Issue #2043 switch capeFunc to java.
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659

Former-commit-id: 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 492b435626 [formerly 098d209d5c [formerly 5eaac7266a0f8d3b083703076a255c41d8bd1039]]]
Former-commit-id: 492b435626
Former-commit-id: 7651785a1e4de8202e12adb600233a932a8ec2e8 [formerly 6f9ea3f195]
Former-commit-id: 3fd810e0bf
2013-06-04 10:16:53 -05:00
Max Schenkelberg
084f8cbc05 Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75

Former-commit-id: 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 7f76bd3d98 [formerly 3379b100cb [formerly 483247738be16ae76bc2f9891f557960e7ade60e]]]
Former-commit-id: 7f76bd3d98
Former-commit-id: 7f3bd173b51d3949c4a9f8672975f6254b9635b7 [formerly 86d8f1b294]
Former-commit-id: e4d27d5d99
2013-06-03 17:19:18 -05:00
Matt Nash
efdb42ab54 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7895dfa2e4 [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]
Former-commit-id: cb59b82add
Former-commit-id: e32c05019af2175b9cb52b0d115b6de5640bce6f [formerly 5d492a4b10]
Former-commit-id: c61b9d95e5
2013-06-03 09:58:43 -05:00
Ben Steffensmeier
b748dd3393 Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626

Former-commit-id: a5611b16d9 [formerly 36cd455621] [formerly da73b0fd4e] [formerly 7ae82832d1 [formerly da73b0fd4e [formerly fba34b77a870a2fc1d6b4301dc3a4d61ce424f67]]]
Former-commit-id: 7ae82832d1
Former-commit-id: 3baf5472d719747b03982686857a8604a64ebb27 [formerly d720c0fa3f]
Former-commit-id: 66cc26f78b
2013-05-31 11:39:50 -05:00
Roger Ferrel
9ef53f18b9 Issue #1966 Changes to make manger stateless and updates for Case Creation.
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387

Former-commit-id: cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly 3c875a6f44 [formerly c6cddc605d [formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]]
Former-commit-id: 3c875a6f44
Former-commit-id: bf07997d68cd2a97eb874705475caf9100eded09 [formerly eaca117b9c]
Former-commit-id: 36b8cbcd5d
2013-05-30 16:35:11 -05:00
Nate Jensen
30ec58305f Merge "Issue #2055 Remove modelName from sounding pointName. Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b" into omaha_13.4.1
Former-commit-id: c3e9110e32 [formerly 7a73bd79d6] [formerly 1ea89c8f0f] [formerly 35a2a44ccd [formerly 1ea89c8f0f [formerly b5657bb2156ade929296f5d748616afd246d8321]]]
Former-commit-id: 35a2a44ccd
Former-commit-id: 10bf06df2f137cce0d469dd182de21c0a623dd02 [formerly 21d261d8be]
Former-commit-id: 7e05836290
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
c634d7e694 Issue #2055 Remove modelName from sounding pointName.
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b

Former-commit-id: 65c7bd3c89 [formerly 965705049b] [formerly 2ee4b85d74] [formerly 51f6906c88 [formerly 2ee4b85d74 [formerly 15a4af789dcad3507cb6778ceea5f00df8425502]]]
Former-commit-id: 51f6906c88
Former-commit-id: 952278d9cbb4bd6c733e6c8bb6d2cf637e6cd114 [formerly f7353cc092]
Former-commit-id: e9b92d330d
2013-05-30 16:05:53 -05:00
Ron Anderson
f9eeac331e Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: ff6fe9e225 [formerly 165bc6c409] [formerly 6557515f64] [formerly 08e09382db [formerly 6557515f64 [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]
Former-commit-id: 08e09382db
Former-commit-id: 844223fb2342ed488da4564f04128cde03cba0ca [formerly c3363d43fa]
Former-commit-id: 3f9cb35feb
2013-05-30 11:01:07 -05:00
Dustin Johnson
ac8c2784ae Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]
Former-commit-id: 74d985af51
2013-05-30 09:49:09 -05:00
Steve Harris
7af97e645a Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 80896a4e31 [formerly 07bc6c83e9] [formerly 9d4577079d] [formerly 0a276d4954 [formerly 9d4577079d [formerly f50ef3c44d1386dd4ec800fd65db7b0f2b4fe03f]]]
Former-commit-id: 0a276d4954
Former-commit-id: 3214e33affd1877bbc79da62569334af050c73c9 [formerly f4d1b7c86c]
Former-commit-id: f72ba834dc
2013-05-30 07:26:30 -05:00
Nate Jensen
70eca967a3 Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
Former-commit-id: 07009bf650 [formerly df5945a8e2] [formerly 4f3ea80cd9] [formerly 532d3ee899 [formerly 4f3ea80cd9 [formerly 534a1d6d9cb2366d875f5361c2a30fce54b7f786]]]
Former-commit-id: 532d3ee899
Former-commit-id: c5cdb4c1995968d035037728d9402432a84f1606 [formerly f95037a9bf]
Former-commit-id: 545fe43c1e
2013-05-29 16:20:17 -05:00
Steve Harris
70ecafa237 13.4.1-13 baseline
Former-commit-id: 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf]
Former-commit-id: 418f8aef56
2013-05-29 16:30:09 -04:00
Ben Steffensmeier
4555ef990c Issue #1869 fix plot updates, broken by earlier commit.
Former-commit-id: a3b2efc2b4 [formerly b32a5b1c00] [formerly d2e01ee1f2] [formerly cbc3b0a9a4 [formerly d2e01ee1f2 [formerly a9240b60e4643b43880d2be76580dc85999eb897]]]
Former-commit-id: cbc3b0a9a4
Former-commit-id: 060cda1b75778126734603e80699b9f5cae37ac8 [formerly d90ca1696e]
Former-commit-id: 6b7958c834
2013-05-29 15:00:04 -05:00
Nate Jensen
3a41ae85b4 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
2013-05-29 14:49:43 -05:00
Dustin Johnson
6567c1b6ef Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]
Former-commit-id: b6c87f42b1
2013-05-29 09:27:30 -05:00
Mike Duff
d292cfcca0 Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87]
Former-commit-id: d9fd9d297b
2013-05-29 09:15:46 -05:00
Dustin Johnson
fb15a3e115 Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]
Former-commit-id: fff0172786
2013-05-29 09:02:47 -05:00
Nate Jensen
8c756705c5 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 729de173162ed2d04e927cd7b463d674c8aac59e [formerly 2fe1960ebb]
Former-commit-id: ac838f62dd
2013-05-28 15:43:31 -05:00
Nate Jensen
74bce32a88 Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]
Former-commit-id: e846e539fb
Former-commit-id: 00638cbac9800172a1c3e7bb571d3fdb66dc2446 [formerly 5c60582df2]
Former-commit-id: 607e980d45
2013-05-28 15:43:23 -05:00
Max Schenkelberg
b2a9cba9c7 Issue #1638 Fixed text box drawn to be correct size with padding around text
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

Former-commit-id: 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 3175563336 [formerly 13ff44fdee [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e [formerly 9932114218]
Former-commit-id: 4e8d25b317
2013-05-28 15:00:59 -05:00
Nate Jensen
e94a5b5494 Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47]
Former-commit-id: f7817d7c41
2013-05-28 14:30:26 -05:00
Roger Ferrel
618feeda6d Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]
Former-commit-id: 9263b54845
Former-commit-id: e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e]
Former-commit-id: 838eacc802
2013-05-28 13:21:08 -05:00
Nate Jensen
4cb8b766b5 Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: e3caafe7ad [formerly 84444b6ba9] [formerly f77f350eb3] [formerly 68eba61c28 [formerly f77f350eb3 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]
Former-commit-id: 68eba61c28
Former-commit-id: 6b1d9083d66d59225023a96ec8b6bbd68b7d1d44 [formerly af7fcf7e8e]
Former-commit-id: 50d981285d
2013-05-28 09:21:57 -05:00
Dustin Johnson
d8cdc3c8c5 Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]
Former-commit-id: 197a5cef1b
Former-commit-id: 5e3e07d672821d4ad14f8aa22c072b6f5438ab36 [formerly a8fc7295ef]
Former-commit-id: 8d00ba1978
2013-05-28 06:43:35 -05:00
Mike Duff
e7790088ac Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: e3804d48ec [formerly 80b1f95f0c] [formerly 9cee487b71f7329909bd95a36c355637b4bb4978 [formerly 192ce891d0]] [formerly b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]
Former-commit-id: b6b01c3e81
Former-commit-id: bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7]
Former-commit-id: 6ee0ef55ff
2013-05-24 09:20:55 -05:00
Nate Jensen
7fa0ba3069 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 29b3e508e2 [formerly 631567ced9] [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly 7d1fc954f6 [formerly ef313253ec669167b9e1deb2562170c117123937]]]
Former-commit-id: 7d233ff590
Former-commit-id: 6b94d7fe2342db507b4bed04b7cd4e98b8e66316 [formerly 9e37d21dc6]
Former-commit-id: e976a4c94e
2013-05-24 09:13:10 -05:00
Bryan Kowal
1f0ad9a4a0 Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline
Amend: do not run the clean task after building any wa features

Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a

Former-commit-id: 45c9e4d203 [formerly b3d40951ba] [formerly 8145305580] [formerly a2148650b4 [formerly 8145305580 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]
Former-commit-id: a2148650b4
Former-commit-id: ee8cf990b046e62c310f31e4215068b2761e859e [formerly 66cf28ab84]
Former-commit-id: c658131c84
2013-05-23 23:52:35 -05:00
Lee Venable
dea017445b Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: 082df6ccd5 [formerly 4ecb65e4a2] [formerly ae020d3960] [formerly c3328077c8 [formerly ae020d3960 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]
Former-commit-id: c3328077c8
Former-commit-id: b12a8641a04e64e274355ad4f613a4d32ce96f80 [formerly 9a72abf083]
Former-commit-id: 041d612ea2
2013-05-23 17:16:31 -05:00
Roger Ferrel
2e54bc5af6 Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: ff1dac4143 [formerly 75a2fc4723] [formerly 9533bb686d] [formerly e5867cbb79 [formerly 9533bb686d [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]
Former-commit-id: e5867cbb79
Former-commit-id: 3c4155b82503781781c7dbf83bdca26072bfdbec [formerly bdecc2f309]
Former-commit-id: ef14a57411
2013-05-23 13:43:53 -05:00
Richard Peter
d4eb77b248 Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c

Former-commit-id: cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]
Former-commit-id: 7349808131
Former-commit-id: 58c6245c0b25ac72406612c59ba4ec5f003980c0 [formerly f3e0966966]
Former-commit-id: 53190601f6
2013-05-23 11:50:34 -05:00
Nate Jensen
3b56918970 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
2013-05-23 11:20:40 -05:00
Mike Duff
f603c80988 Issue #1902 - fix to forced guidance
Peer review comments

Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e

Former-commit-id: 44ef119c41 [formerly b331a68a08] [formerly 11423a7465] [formerly 2a733fa5f8 [formerly 11423a7465 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: 3698ac621952b956b533e97d2a14a12f002e3478 [formerly 7d177607bf]
Former-commit-id: 2878cde676
2013-05-23 09:52:07 -05:00
Greg Armendariz
806a417f0f Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]
Former-commit-id: a4457f8c83
Former-commit-id: 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c]
Former-commit-id: 7c97422501
2013-05-23 09:10:11 -05:00
Roger Ferrel
3aa439216d Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]
Former-commit-id: d35424df4f
Former-commit-id: 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]
Former-commit-id: 760b0f3366
2013-05-23 07:36:15 -05:00
Bryan Kowal
0f23a3a390 Issue #1927 - patch ant includegen task
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]
Former-commit-id: e6cfad1759
2013-05-22 18:00:43 -05:00
Steve Harris
d477564678 Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]
Former-commit-id: 389eefd1f9
2013-05-22 16:13:08 -05:00
Steve Harris
a6bb8b38dd Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]
Former-commit-id: 026674d0b2
2013-05-22 16:10:04 -05:00
Steve Harris
fb41995981 13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]
Former-commit-id: b745b332ae
2013-05-22 16:42:39 -04:00
Richard Peter
b3c32889b1 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]
Former-commit-id: 1bbddf8fdf
2013-05-21 13:07:51 -05:00
Richard Peter
ffe0b35085 Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]
Former-commit-id: 76f11f00ae
2013-05-21 12:11:21 -05:00
Richard Peter
8e252f89f0 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]
Former-commit-id: 21b87e9ea7
2013-05-21 10:35:00 -05:00
Nate Jensen
22d9440b6a Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: c70110d442b8e122c8572c0d2850cbac6c42bc1a [formerly e575c19ab6]
Former-commit-id: a06bb176ba
2013-05-21 10:26:18 -05:00
Dustin Johnson
bf3f162fc9 Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]
Former-commit-id: bd65447c9f
2013-05-21 08:19:34 -05:00
Steve Harris
5db95cce55 13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]
Former-commit-id: 4d88863515
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
bd89419f5e Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]
Former-commit-id: 30eb486e45
2013-05-20 18:00:32 -05:00
Richard Peter
5efe58df0b Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]
Former-commit-id: 72206676ee
2013-05-20 17:49:22 -05:00
Roger Ferrel
0db7741ce5 Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe]
Former-commit-id: 4a5073902f
2013-05-20 17:43:47 -05:00