Commit graph

22 commits

Author SHA1 Message Date
Steve Harris
7f90924706 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
9340618732 12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
2012-03-30 08:38:33 -05:00
Steve Harris
8850e44772 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
2012-03-29 10:03:05 -05:00
David Gillingham
65b8db12e8 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]]
Former-commit-id: 494fbe93db
Former-commit-id: e0987cc993 [formerly 29f03b0d2a] [formerly 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]]
Former-commit-id: c6da80d0d4984844822b65b3e0c4d22fd8ce459b [formerly ad8efe180e]
Former-commit-id: 678953ae76
2012-03-05 11:23:11 -06:00
David Gillingham
4ed8de501b Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]]
Former-commit-id: 0c0f659896
Former-commit-id: f670f3c950 [formerly bce9ad39ae] [formerly de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]]
Former-commit-id: 26f66133ee05397f66e892ce87225a06441ee4f2 [formerly 788007ff63]
Former-commit-id: 0b79b9ea21
2012-03-02 13:22:46 -06:00
Steve Harris
4ee0ec25ea Merge branch 'ss_sync' into sync_test
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]]
Former-commit-id: 787aed90f8
Former-commit-id: 6fdae68267 [formerly b3f831a7b4] [formerly 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]]
Former-commit-id: 840d838fc0fb5c246c5a324aa5695ebb80f9cd44 [formerly 376edad3c9]
Former-commit-id: cdc4d1cb44
2012-03-01 14:01:16 -06:00
David Gillingham
adb2cd9b62 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: d10c91b814 [formerly 6bca8d6353] [formerly 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada]]
Former-commit-id: 881794234bd8fda0f5c8288097c527c0e21e3ce0 [formerly 85c082f1e9]
Former-commit-id: 98bc9450d3
2012-02-23 14:40:25 -06:00
David Gillingham
406ee3779d Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]]
Former-commit-id: 85998bc654
Former-commit-id: d9def42052 [formerly 9ff631305a] [formerly fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d]]
Former-commit-id: 3d9fbb450c702f842828ace3e919005130e3d6e0 [formerly 8e123e3ae0]
Former-commit-id: ca09c3a75a
2012-02-23 13:23:59 -06:00
Steve Harris
587c928f4e Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]]
Former-commit-id: 86e586befe
Former-commit-id: fbb5de922a [formerly 4eb1ef5b0f] [formerly 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]]
Former-commit-id: a02575690595cf7dbca41fcc8e53a47ab455d3ac [formerly 2c958713b6]
Former-commit-id: 93d99ca49c
2012-02-23 12:38:55 -06:00
Steve Harris
43ff909553 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
2012-02-23 10:06:18 -06:00
Steve Harris
3a4af24369 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
f0c1c03fff Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 2e0f1d3ecc [formerly b12f5e5d75] [formerly a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]]
Former-commit-id: f7595a0be89f8ab41c20c0d16d038e5e650e4712 [formerly acd7845ebd]
Former-commit-id: bcccffbaa4
2012-02-20 13:03:39 -06:00
Steve Harris
2acea8b7d5 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]]
Former-commit-id: d02529fef4
Former-commit-id: 4ffbe4780e [formerly b41e5f2415] [formerly b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]]
Former-commit-id: 1d157738e844ae1be12f9b1669c8101f16df9737 [formerly d9c8a99210]
Former-commit-id: d3c80a1557
2012-02-20 12:54:25 -06:00
Steve Harris
33aafe9ce0 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]
Former-commit-id: cc66c8be24
Former-commit-id: c9a7ff42f4 [formerly dd911bed4d] [formerly 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef]]
Former-commit-id: 589ae505ef0a6ce52a577fd189d1c8eec012a6bd [formerly 09b81c6e00]
Former-commit-id: 60bf5aeced
2012-02-20 12:43:38 -06:00
Steve Harris
8c9e581f41 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
2012-02-17 10:55:02 -06:00
Steve Harris
9df09d3111 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 60b350f7f2 [formerly 695e2979c3] [formerly 1002555dbd] [formerly 60b350f7f2 [formerly 695e2979c3] [formerly 1002555dbd] [formerly f693b6d0a7 [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 5ee70f0f28 [formerly 93e856457b] [formerly ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958]]
Former-commit-id: c794a75c8d74844afb8888a761b9fa0f1da0eaac [formerly 3cbce90726]
Former-commit-id: 87ffdc4f01
2012-02-09 08:54:18 -06:00
Max Schenkelberg
53a9af140e Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: 83de7660b6 [formerly c410a4eb33] [formerly 5f8d30bb43] [formerly 83de7660b6 [formerly c410a4eb33] [formerly 5f8d30bb43] [formerly e422b13ded [formerly 5f8d30bb43 [formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]]]
Former-commit-id: e422b13ded
Former-commit-id: 2683c94927 [formerly 2185e1a31e] [formerly e58fc953c960af41fe0d16f529fdd017ca742ce6 [formerly 3a26b0cea5]]
Former-commit-id: 24fc32448fdd1698623b35041a064809142646d4 [formerly 1954b637a4]
Former-commit-id: 0f4a0c7948
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
4d9bd2fa9b Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 2c1110953c [formerly 138b4de82f] [formerly 0617773c79] [formerly 2c1110953c [formerly 138b4de82f] [formerly 0617773c79] [formerly 9b78596436 [formerly 0617773c79 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]]]
Former-commit-id: 9b78596436
Former-commit-id: 68e1a7c2f1 [formerly 5deb83a291] [formerly ed3367219c6c038731023f39d10bc892cdd2132f [formerly a714f57f78]]
Former-commit-id: 2e5faaafda0772397c471d118d97379815249b52 [formerly 82db9d2c0c]
Former-commit-id: 774f2614d0
2012-01-31 10:53:10 -06:00
Matt Nash
ff53dcd67f Issue #26 add tear off code to git baseline
Former-commit-id: ea6ef73802 [formerly 892cb9a7ae] [formerly cf4e1f764e] [formerly ea6ef73802 [formerly 892cb9a7ae] [formerly cf4e1f764e] [formerly 4286cb0342 [formerly cf4e1f764e [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]]]
Former-commit-id: 4286cb0342
Former-commit-id: e4fb11ce75 [formerly e8d239e963] [formerly 6e2a1045719c1a26e7628366b3ec9f4ceaa8912c [formerly 8e3d2af84e]]
Former-commit-id: 1e134f6cafd331aaf1b78e49c9aa7f8df38c2bf3 [formerly 240ac978f2]
Former-commit-id: 8997f82570
2012-01-25 12:50:31 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00