xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3280 commits 31 branches 40 tags 3.8 GiB
Commit graph

3280 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ron Anderson
9e8a94ae4f Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development 
Former-commit-id: d569641f3e [formerly ca94d4ffac] [formerly d569641f3e [formerly ca94d4ffac] [formerly 43b5d2193b [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]
Former-commit-id: 43b5d2193b
Former-commit-id: 129040ce9b [formerly 8b1eb58de9]
Former-commit-id: 201d9542fe
 2013-07-30 08:35:06 -05:00
Richard Peter
31101963ff Merge "Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade." into development 
Former-commit-id: 2a413e902e [formerly 6ac17c924d] [formerly 2a413e902e [formerly 6ac17c924d] [formerly ac59471b45 [formerly 1982de77f9dc752a442e4e82e84a958fef79d19d]]]
Former-commit-id: ac59471b45
Former-commit-id: 0505da7b4f [formerly 8cbdb50b77]
Former-commit-id: 1e8a9dbfe8
 2013-07-29 22:12:50 -05:00
Ron Anderson
1c1340fe37 Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay. 
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: a5da46c360 [formerly ebdfbebcfc] [formerly a5da46c360 [formerly ebdfbebcfc] [formerly 4aceedceb5 [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]
Former-commit-id: 4aceedceb5
Former-commit-id: ddecdbf0b8 [formerly b4de3f23a6]
Former-commit-id: 493d497091
 2013-07-29 18:12:24 -05:00
Ron Anderson
c4b1d81365 Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development 
Former-commit-id: 9574e1237e [formerly 35f5b04522] [formerly 9574e1237e [formerly 35f5b04522] [formerly fd43f74212 [formerly 5188a208a6b66eb024db64efeb8a6409c57d4a64]]]
Former-commit-id: fd43f74212
Former-commit-id: 972f1b02fc [formerly 890bb4d832]
Former-commit-id: 247372ad8f
 2013-07-29 18:11:30 -05:00
Ron Anderson
c4829c0c4c Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped 
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b

Former-commit-id: 19d38c48c5 [formerly f028f111b0] [formerly 19d38c48c5 [formerly f028f111b0] [formerly f3a8ccf158 [formerly 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7]]]
Former-commit-id: f3a8ccf158
Former-commit-id: 1de5b051e2 [formerly 3841c55a28]
Former-commit-id: c5ad5b1143
 2013-07-29 17:19:07 -05:00
Bryan Kowal
03e6faba0f Issue #2164 - remove unnecessary junit dependency 
Former-commit-id: 204fa65c8f [formerly a0f1944796] [formerly 204fa65c8f [formerly a0f1944796] [formerly 77473d75b5 [formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]]
Former-commit-id: 77473d75b5
Former-commit-id: 02bba2ae9c [formerly 686affce01]
Former-commit-id: 892b3e6126
 2013-07-29 16:31:15 -05:00
Lee Venable
a7a15945df Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development 
Former-commit-id: c59237a292 [formerly f246c961a2] [formerly c59237a292 [formerly f246c961a2] [formerly 80a147990e [formerly 1f7a3d63a890934875a59a454e910bac94cdc671]]]
Former-commit-id: 80a147990e
Former-commit-id: 8dcbc5d137 [formerly c78a13d744]
Former-commit-id: 5aaece8f93
 2013-07-29 15:06:42 -05:00
Matt Nash
644f958dc1 Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical 
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d

Former-commit-id: 8e75837289 [formerly 74ccbf163d] [formerly 8e75837289 [formerly 74ccbf163d] [formerly 0c98b5e9de [formerly 06fe93289dd6832fe7b2b78e6d15f15f229c2532]]]
Former-commit-id: 0c98b5e9de
Former-commit-id: 65c3bb4ba4 [formerly e7fddc8df0]
Former-commit-id: 96f9eb70e2
 2013-07-29 14:47:19 -05:00
Bryan Kowal
2936104283 Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade. 
- Amend: fix data types in GridDataRequestMessage

Change-Id: I7f7abd36b3c3f94c24ee0381115c5643aae39f22

Former-commit-id: 8ac250ca02 [formerly c5c9f4d30b] [formerly 8ac250ca02 [formerly c5c9f4d30b] [formerly a44a5d16e7 [formerly e317a0d7101182ad351f604cfc04ad0292773161]]]
Former-commit-id: a44a5d16e7
Former-commit-id: 3c1a1d7d9d [formerly 3fadaf976c]
Former-commit-id: b355324172
 2013-07-29 13:50:33 -05:00
Lee Venable
7fe76ccf80 Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development 
Former-commit-id: 5d32fd30df [formerly a42d4bb0cc] [formerly 5d32fd30df [formerly a42d4bb0cc] [formerly 30baa25afa [formerly d49617f4acec37ddbaa0ec1d91306687a35531b0]]]
Former-commit-id: 30baa25afa
Former-commit-id: 8f3b40e732 [formerly 2af73d09f9]
Former-commit-id: d4c75a38fd
 2013-07-29 11:52:16 -05:00
Lee Venable
83193a51e7 Merge "Issue #2217 - Added better error handling" into development 
Former-commit-id: d97698519d [formerly f3c4306987] [formerly d97698519d [formerly f3c4306987] [formerly ccf6962224 [formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]]
Former-commit-id: ccf6962224
Former-commit-id: 824b855490 [formerly e2002c1d7e]
Former-commit-id: 68b0385add
 2013-07-29 11:44:59 -05:00
Richard Peter
278e17b0de Merge "Issue #1051 Discard bufrmos data with invalid location." into development 
Former-commit-id: a75ada03f9 [formerly ff13fdaf20] [formerly a75ada03f9 [formerly ff13fdaf20] [formerly 450af19c9c [formerly 15e7809ca7503415ba0603cc39e7f0543d1e5af1]]]
Former-commit-id: 450af19c9c
Former-commit-id: d924e6e0c4 [formerly d76d407ca5]
Former-commit-id: cbc50f4d83
 2013-07-29 11:12:19 -05:00
Richard Peter
e4f10f0968 Merge "Issue #2231 Make edex startup more configurable" into development 
Former-commit-id: 49b9422554 [formerly cd8535f182] [formerly 49b9422554 [formerly cd8535f182] [formerly 736c88ae6c [formerly da8f06eeb0bb2b68047896547d0181bdb0e82928]]]
Former-commit-id: 736c88ae6c
Former-commit-id: 78ed556f82 [formerly 635a54caf9]
Former-commit-id: 61e3d26c20
 2013-07-29 10:14:58 -05:00
Mike Duff
e01702f842 Issue #2232 - Fix index out of bounds exception in Sub Manager Table 
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0

Former-commit-id: 83c79750af [formerly 974d5a05b2] [formerly 83c79750af [formerly 974d5a05b2] [formerly 3ab275aea4 [formerly baa8d402efb4aeff839e06fd180a73a857fd0766]]]
Former-commit-id: 3ab275aea4
Former-commit-id: df83cf2ffe [formerly 579daeaebb]
Former-commit-id: 6683a5c949
 2013-07-29 09:55:51 -05:00
Ben Steffensmeier
7b67f05f01 Issue #1051 Discard bufrmos data with invalid location. 
Former-commit-id: 239033f268 [formerly 7ee9aee40a] [formerly 239033f268 [formerly 7ee9aee40a] [formerly a5112b6e19 [formerly 17c5060c2cb1101d93550904fec3f59704838ff1]]]
Former-commit-id: a5112b6e19
Former-commit-id: 661fa14886 [formerly cfcdc38fe7]
Former-commit-id: f14be3c12b
 2013-07-26 17:42:06 -05:00
Richard Peter
5665e7eb9e Issue #2170: Initial plugin rename for notification framework 
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: bf99d8fd4d [formerly 359ee5d1af] [formerly bf99d8fd4d [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 43453bcbff [formerly 16e182d70b]
Former-commit-id: 51773c757e
 2013-07-26 14:36:46 -05:00
Richard Peter
f16bec4faf Merge "Issue #2189 Set size properly on GLFont" into development 
Former-commit-id: 951484545a [formerly 30c92f3fc7] [formerly 951484545a [formerly 30c92f3fc7] [formerly 196f5f4a5d [formerly 7f7762b889e7b86231f22abb89dd94d630c0d291]]]
Former-commit-id: 196f5f4a5d
Former-commit-id: 44bcd7145d [formerly 8ba5944134]
Former-commit-id: f7c537d79d
 2013-07-26 14:34:46 -05:00
Max Schenkelberg
ba19a58428 Issue #2189 Set size properly on GLFont 
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

Former-commit-id: 1e4fe87002 [formerly 970f2c1373] [formerly 1e4fe87002 [formerly 970f2c1373] [formerly 564d6ee664 [formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]]
Former-commit-id: 564d6ee664
Former-commit-id: e1c5959762 [formerly ef01f6db81]
Former-commit-id: 9101a9e190
 2013-07-26 13:14:48 -05:00
Richard Peter
a81eb7c908 Merge "Issue #2112 Fix volume browser sounding errors." into development 
Former-commit-id: 008f2f98ad [formerly 8a4506e794] [formerly 008f2f98ad [formerly 8a4506e794] [formerly c57aa39ddd [formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]]
Former-commit-id: c57aa39ddd
Former-commit-id: 5c59b1257c [formerly 5d53ab253d]
Former-commit-id: 33129350c8
 2013-07-26 10:23:08 -05:00
Greg Armendariz
f71f32684f Issue #2207 - fix build issues with ncep unit-test directories 
Former-commit-id: 777fe464d0 [formerly db65f0c206] [formerly 777fe464d0 [formerly db65f0c206] [formerly 17b8376a72 [formerly 766c2983afc0aac22143f86afa0c5eca500d1941]]]
Former-commit-id: 17b8376a72
Former-commit-id: 2ba99579ca [formerly dc0e4e4728]
Former-commit-id: ade6454234
 2013-07-26 09:48:44 -05:00
Greg Armendariz
89a582f766 Issue #2207 - Additional test fixes 
Former-commit-id: 0f4595d842 [formerly afe9191fea] [formerly 0f4595d842 [formerly afe9191fea] [formerly b5d509fc4a [formerly 38531ca3d8336801663d7d664d0578497dff8911]]]
Former-commit-id: b5d509fc4a
Former-commit-id: 599458dbb5 [formerly 56881355ed]
Former-commit-id: 06f3e23394
 2013-07-26 09:24:43 -05:00
Greg Armendariz
4336f1b889 Merge "Issue #2207 - Remove reference to missing tests directory" into development 
Former-commit-id: d83157b9d1 [formerly 69b346a195] [formerly d83157b9d1 [formerly 69b346a195] [formerly 66caca12a4 [formerly 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724]]]
Former-commit-id: 66caca12a4
Former-commit-id: c232be59ff [formerly 8a5d9e4c70]
Former-commit-id: f9a5b107d4
 2013-07-26 09:05:53 -05:00
Greg Armendariz
004ffdc505 Issue #2207 - Remove reference to missing tests directory 
Former-commit-id: 7861a026b2 [formerly 8be27acdf2] [formerly 7861a026b2 [formerly 8be27acdf2] [formerly f3d82d8e82 [formerly 2f7e8e5d498fd96f60ddf3ae192cadc705abaf5c]]]
Former-commit-id: f3d82d8e82
Former-commit-id: a8ed77b11a [formerly fedae5495f]
Former-commit-id: 482275acb7
 2013-07-26 08:59:41 -05:00
Lee Venable
4443ca3a7e Merge "Issue #2218 - improve error handling and performance in SCANMonitor" into development 
Former-commit-id: 877730ad19 [formerly 48a1404221] [formerly 877730ad19 [formerly 48a1404221] [formerly 4635a88d54 [formerly bfbe879b22697ca7c8558ee94c49137a7787cfc9]]]
Former-commit-id: 4635a88d54
Former-commit-id: 995175c247 [formerly 2357c7725a]
Former-commit-id: 3069158dcc
 2013-07-26 08:48:56 -05:00
Greg Armendariz
fe79423966 Issue #2207 - Fix build 
Former-commit-id: 5185e13a33 [formerly 818a8a35d3] [formerly 5185e13a33 [formerly 818a8a35d3] [formerly 578c307d40 [formerly 86ca9354e8800acd2f15633e0f44980627a0359f]]]
Former-commit-id: 578c307d40
Former-commit-id: b6d33739cf [formerly 2411fbf362]
Former-commit-id: 3994063cd6
 2013-07-26 08:44:52 -05:00
Ron Anderson
9a2bcc145c Merge "Issue #2044 Fix topo retrieval in ifpnetCDF" into development 
Former-commit-id: f0b278ad16 [formerly f3138d7bd9] [formerly f0b278ad16 [formerly f3138d7bd9] [formerly 668cbd0c87 [formerly 50129c57d6cc798da0dcf6b5f9b84811af5f6fa1]]]
Former-commit-id: 668cbd0c87
Former-commit-id: 3221f96696 [formerly 28863afe77]
Former-commit-id: 26a029cb5f
 2013-07-25 18:17:08 -05:00
Ron Anderson
26e98bdc0b Issue #2044 Fix topo retrieval in ifpnetCDF 
Change-Id: I3e15f9ed8a5e7577332fade9cfabeb9734fd1d20

Former-commit-id: d850a79cbd [formerly 807b4ee431] [formerly d850a79cbd [formerly 807b4ee431] [formerly f6f19065e6 [formerly 9bacbf50094476cfb01be5b9ae1f535ca4afd1c9]]]
Former-commit-id: f6f19065e6
Former-commit-id: 754e521085 [formerly e5551d529a]
Former-commit-id: 59924c01b5
 2013-07-25 18:14:38 -05:00
Ben Steffensmeier
2d716a2266 Issue #2112 Fix volume browser sounding errors. 
Former-commit-id: 08f6b60d23 [formerly 74f854634f] [formerly 08f6b60d23 [formerly 74f854634f] [formerly 2680d6ddbc [formerly f2999e84c430e98a4f1a4a1808b61d6810dac463]]]
Former-commit-id: 2680d6ddbc
Former-commit-id: 7db3d4722c [formerly 5e39fce827]
Former-commit-id: abe7ac623e
 2013-07-25 17:58:49 -05:00
Nate Jensen
ed3a464cdf Issue #2207 removing custom org.junit 
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: fd14405886 [formerly 185296c67d] [formerly fd14405886 [formerly 185296c67d] [formerly 4ccfc5be82 [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 93976753df [formerly a3fd5fa3ee]
Former-commit-id: 2e5b04450e
 2013-07-25 16:48:18 -05:00
Nate Jensen
db3456c04d Merge "Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing" into development 
Former-commit-id: 3958edbdae [formerly b7c4087765] [formerly 3958edbdae [formerly b7c4087765] [formerly 88c0b989ef [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]]
Former-commit-id: 88c0b989ef
Former-commit-id: 38501a83d5 [formerly a7cadf0388]
Former-commit-id: 1cc5422213
 2013-07-25 16:04:22 -05:00
Nate Jensen
63ac241687 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing 
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 25b78917ff [formerly cf656dddc6] [formerly 25b78917ff [formerly cf656dddc6] [formerly d364cfe32e [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: f110fe5f6f [formerly dc7c2fd063]
Former-commit-id: 070fa38093
 2013-07-25 14:59:01 -05:00
Ron Anderson
584e4946f9 Merge "Issue #2044 Refactor of GFE Server code" into development 
Former-commit-id: b3619c1ba4 [formerly 604cfd2070] [formerly b3619c1ba4 [formerly 604cfd2070] [formerly 0428b8fb7b [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: 9e10143fb2 [formerly b084626454]
Former-commit-id: 68de87a472
 2013-07-25 13:59:17 -05:00
Richard Peter
b49ba6b44b Merge "Issue #2176 Implemented emergency warning products." into development 
Former-commit-id: f031871351 [formerly 5d192e263f] [formerly f031871351 [formerly 5d192e263f] [formerly 89823b3681 [formerly 717a1f81ecc323e4e1cc10e923956befb99e3e04]]]
Former-commit-id: 89823b3681
Former-commit-id: ac030d4e71 [formerly d98c33cfbc]
Former-commit-id: 5f54d104a2
 2013-07-25 13:54:48 -05:00
Jonathan Sanchez
bef870b822 Issue #2176 Implemented emergency warning products. 
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: c62de0d75f [formerly 7d74ba5ee1] [formerly c62de0d75f [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]
Former-commit-id: 67ce90c14a
Former-commit-id: a9fccb3e9d [formerly 4b38e3786d]
Former-commit-id: 869fbdc7fc
 2013-07-25 13:47:44 -05:00
Nate Jensen
c3d455ef2f Merge "Issue #2208 moving ncep unit tests to tests project" into development 
Former-commit-id: 5590514a50 [formerly 825dd73eb4] [formerly 5590514a50 [formerly 825dd73eb4] [formerly 21261b1d2f [formerly a7a6e14f62c7f17808330ea464129dabbe6d1afb]]]
Former-commit-id: 21261b1d2f
Former-commit-id: 6db7d44964 [formerly 8f168b281b]
Former-commit-id: d9f210f390
 2013-07-25 13:46:39 -05:00
Nate Jensen
cabd53c511 Issue #2208 moving ncep unit tests to tests project 
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507

Former-commit-id: 38fa2ca855 [formerly 838554cf98] [formerly 38fa2ca855 [formerly 838554cf98] [formerly d7be59a97e [formerly b027914534dc808a616e2b5b2ee55ed3dd304b2e]]]
Former-commit-id: d7be59a97e
Former-commit-id: 891484b533 [formerly 43f8386f7c]
Former-commit-id: 8c5980fe73
 2013-07-25 13:28:27 -05:00
Nate Jensen
a31a515ede Merge "Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint" into development 
Former-commit-id: 1c564eeaad [formerly d5158a3fd5] [formerly 1c564eeaad [formerly d5158a3fd5] [formerly 4f8cf1230f [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]]
Former-commit-id: 4f8cf1230f
Former-commit-id: a8b2d95ba0 [formerly 65dc8671f7]
Former-commit-id: 17d5768f7b
 2013-07-25 13:22:37 -05:00
Max Schenkelberg
f79466a524 Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint 
Amend: Added comments

Change-Id: Ieb045b1a8f8271adba804cacd6f47996ffae4cf5

Former-commit-id: 439c8040c9 [formerly d3df3e97c8] [formerly 439c8040c9 [formerly d3df3e97c8] [formerly 3506c5d38d [formerly 2cc61515015e125816b76c560900744258dbd2f1]]]
Former-commit-id: 3506c5d38d
Former-commit-id: b4807c9831 [formerly dafbad884d]
Former-commit-id: b557b5d141
 2013-07-25 13:18:46 -05:00
Ron Anderson
13e808b34d Issue #2044 Refactor of GFE Server code 
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: d32f777957 [formerly cfa2d38a32] [formerly d32f777957 [formerly cfa2d38a32] [formerly a915cdab25 [formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]]]
Former-commit-id: a915cdab25
Former-commit-id: a40cde69de [formerly 46d47d61e7]
Former-commit-id: 7c0b176b9d
 2013-07-25 13:05:56 -05:00
Nate Jensen
820150deb3 Issue #2208 moving edex unit tests to tests project 
Change-Id: I9189ebd225df930d021855c19d338e74af800702

Former-commit-id: 2103294b75 [formerly 8d1e19f2df] [formerly 2103294b75 [formerly 8d1e19f2df] [formerly 15fae243c9 [formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]]]
Former-commit-id: 15fae243c9
Former-commit-id: be35d04928 [formerly fd38b63609]
Former-commit-id: 52dfbc9f9f
 2013-07-25 12:29:46 -05:00
Everett Kladstrup
33693f1903 Issue #2231 Make edex startup more configurable 
* Allow for skipping the RPM check
* Allow for using system java in wrapper instead of hard-coded /awips2/java
* Allow for configuring wrapper process actions with system variables
  e.g. RESTART vs. SHUTDOWN on crash

Change-Id: Icaa3b3e388013a8106db6e29fd999aa5824c72bc

Former-commit-id: 3bb1b03cb7 [formerly e056592ba9] [formerly 3bb1b03cb7 [formerly e056592ba9] [formerly 9515d45e9d [formerly 7834360e8c56ac74b29a585eeda8c0387067250b]]]
Former-commit-id: 9515d45e9d
Former-commit-id: 37ce990b54 [formerly b9dda179a0]
Former-commit-id: eec23b6971
 2013-07-25 12:22:32 -05:00
Richard Peter
b784aadcff Merge "Issue #2216 Removetime stamp filer when copying to a hdf5 file." into development 
Former-commit-id: edd3f92a2e [formerly 766dc280e6] [formerly edd3f92a2e [formerly 766dc280e6] [formerly 37b87b0a6f [formerly d69fb813113fbaf92400e90bfd63e7de2a65b639]]]
Former-commit-id: 37b87b0a6f
Former-commit-id: fcb150ef7d [formerly 7a5327af97]
Former-commit-id: 7dfd04ed1e
 2013-07-25 10:55:39 -05:00
Nate Jensen
ba33284648 Merge "Issue #2203 synchronize init and dispose of frames" into development 
Former-commit-id: 989ce29e03 [formerly 9ad16f084a] [formerly 989ce29e03 [formerly 9ad16f084a] [formerly 1bb0208372 [formerly dff57efeb2c54cffc5caf61a50bf954cc39bdc37]]]
Former-commit-id: 1bb0208372
Former-commit-id: f84d36038c [formerly 294a8d0d38]
Former-commit-id: cf26f59d5f
 2013-07-25 10:02:42 -05:00
Mike Duff
e174f07f79 Issue #2218 - improve error handling and performance in SCANMonitor 
Change-Id: I0b65dcb372c69ad736b3a550392299507dbcedeb

Former-commit-id: 7afce29a35 [formerly e23aaedada] [formerly 7afce29a35 [formerly e23aaedada] [formerly 4034146e23 [formerly cff253a5eb779a2f5e156d5802dc9bb8afc2e7e0]]]
Former-commit-id: 4034146e23
Former-commit-id: 6537c9c20d [formerly 075cd28b9c]
Former-commit-id: 1eb1718b19
 2013-07-25 08:35:30 -05:00
Nate Jensen
a229db50f0 Merge "Issue #2189 Added a FontType option when initializing a font from a file." into development 
Former-commit-id: ca729f1c49 [formerly c8d7c9cdf9] [formerly ca729f1c49 [formerly c8d7c9cdf9] [formerly 7b1d8cb576 [formerly a17330cc596961b4b3630579631de438f971c884]]]
Former-commit-id: 7b1d8cb576
Former-commit-id: 94cb066d8c [formerly 29e7454a4f]
Former-commit-id: 90866d6c06
 2013-07-24 17:01:06 -05:00
Max Schenkelberg
fddc9ce779 Issue #2189 Added a FontType option when initializing a font from a file. 
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Change-Id: Ia5608cb7ffd0b760b3922e65107e66c971fa3e63

Former-commit-id: 52110961b4 [formerly c386533867] [formerly 52110961b4 [formerly c386533867] [formerly 3381c0016e [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]
Former-commit-id: 3381c0016e
Former-commit-id: 473c2f2659 [formerly a8972da606]
Former-commit-id: 2efabffe80
 2013-07-24 16:35:50 -05:00
Nate Jensen
027acec4ab Issue #2203 synchronize init and dispose of frames 
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

Former-commit-id: f556c7191b [formerly b053fea59b] [formerly f556c7191b [formerly b053fea59b] [formerly 162a1ba48f [formerly ed75a28d871dc1e97717fa44636df635eed8b4fc]]]
Former-commit-id: 162a1ba48f
Former-commit-id: 52e1262094 [formerly ac310f7bbf]
Former-commit-id: a6943514a7
 2013-07-24 16:17:43 -05:00
Roger Ferrel
52ad86b071 Issue #2216 Removetime stamp filer when copying to a hdf5 file. 
Change-Id: Ib3ff230e410a73ea63c5d5f5dc2a27efa663921f

Former-commit-id: ded6102f7d [formerly 47632854c3] [formerly ded6102f7d [formerly 47632854c3] [formerly e90ec9184c [formerly ec1c371beb034e8ea256c18b7da074cabebe56f4]]]
Former-commit-id: e90ec9184c
Former-commit-id: d6e54addf1 [formerly b9bcc23b96]
Former-commit-id: bf6acd3414
 2013-07-24 15:21:18 -05:00
Mike Duff
e3b763b990 Issue #2217 - Added better error handling 
Change-Id: Ia15b57fbee9e3cecb93ac711ca3d99529df3ac00

Former-commit-id: 45b0119059 [formerly 8ac8e405ec] [formerly 45b0119059 [formerly 8ac8e405ec] [formerly e584ddbf45 [formerly b7a602066d1c01a9b6399d2dade3ed3dd487103e]]]
Former-commit-id: e584ddbf45
Former-commit-id: b808324f11 [formerly f98a232c8b]
Former-commit-id: 31ec8c5118
 2013-07-24 13:54:33 -05:00
Richard Peter
192cf864af Merge "Issue #1655 - Delta Scripts for adding ddsystemstatus table." into development 
Former-commit-id: bfc288965c [formerly d0fb138b5e] [formerly bfc288965c [formerly d0fb138b5e] [formerly 56c16fc15b [formerly 6d4b225142a86cbffb50af02127a96edddef3d96]]]
Former-commit-id: 56c16fc15b
Former-commit-id: 3ada8d3a05 [formerly 9c4070b8d5]
Former-commit-id: 243dcc2621
 2013-07-24 13:47:17 -05:00