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

346 commits

Author SHA1 Message Date
Steven Harris
db663faca9 12.11.1-1 baseline 
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
 2012-09-27 15:57:45 -05:00
Ron Anderson
477b4d0ba4 Issue #436 Fix problem with Hazard Type and ETN/Seg not being correctly picked up when modifying a hazard grid. 
Change-Id: I58aef667f4f465c8550a51d20bb750b400d4f781

Former-commit-id: 00ec098d05 [formerly bfb241c335] [formerly d376c07465] [formerly 00ec098d05 [formerly bfb241c335] [formerly d376c07465] [formerly ca74b829d1 [formerly d376c07465 [formerly 909e1e815a2665d415a151d7641876b9eee004bb]]]]
Former-commit-id: ca74b829d1
Former-commit-id: ac47481534 [formerly fc7ee6aa6e] [formerly 5da8c29b508a0b41bcb2db60f4d19919a77a4157 [formerly 9746609849]]
Former-commit-id: 256662e44f6fca6e57b8ef2ab7a6a7e27ce6afe6 [formerly 4a8b9b6f0d]
Former-commit-id: 93464b8a98
 2012-09-26 13:20:48 -05:00
Ron Anderson
f571089cb8 Issue #1091 Code cleanup and update of online help files. 
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 1eebe679a0 [formerly f1fb73e815] [formerly 4373858ac6] [formerly 1eebe679a0 [formerly f1fb73e815] [formerly 4373858ac6] [formerly 34382eb228 [formerly 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]]]
Former-commit-id: 34382eb228
Former-commit-id: c63f5b5a0c [formerly 1612c8d2c8] [formerly e5cdaf5d466bae7f7e1bccf0bf9aee3d7b754797 [formerly a609aab630]]
Former-commit-id: 26805c89600afbc5826fad5d1080d192a573c7bf [formerly 6f00c3b872]
Former-commit-id: 763b5aa86b
 2012-09-25 16:07:05 -05:00
Steve Harris
c340962852 Merge branch 'ss_builds' (12.10.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 01f5a0b21a [formerly 8edfe17e7d] [formerly 194b5d78ca44a987232c43b536b8a7d0f46623ae [formerly f5f59b6aa5]]
Former-commit-id: abfb2e968285e9270187ca573daba380b3340361 [formerly a20533b551]
Former-commit-id: 94cb625e91
 2012-09-25 10:31:57 -05:00
Steve Harris
6fc7ef7034 12.10.1-8 baseline 
Former-commit-id: e6f952f0ea [formerly b062e4de8f] [formerly dbd73151ca] [formerly e6f952f0ea [formerly b062e4de8f] [formerly dbd73151ca] [formerly 73d29311d0 [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]]
Former-commit-id: 73d29311d0
Former-commit-id: 326954a0b8 [formerly f4e218c4dd] [formerly 28e9acf68c2e0b1a4c89ad83acb71825adbd9965 [formerly 94137c6ba1]]
Former-commit-id: ea5cc2020fb2f65e6c2d7d6317de0dadba16d2db [formerly 57d4eacbb5]
Former-commit-id: 659a009c00
 2012-09-25 10:26:58 -05:00
Steve Harris
60ef7d29e0 12.10.1-6 baseline 
Former-commit-id: dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]]
Former-commit-id: ba648f8e72
Former-commit-id: d5ec4edea1 [formerly 0e77eb2fe2] [formerly e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75]]
Former-commit-id: ca8586dbe32865ad7ca07ad5a47da5d57ccd01ad [formerly e39023bb85]
Former-commit-id: 20732fcbd5
 2012-09-25 10:14:23 -05:00
Max Schenkelberg
ae84e87fc0 Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly 
Change-Id: I3080a03fcbed0de39908945d899e0c8200c2dc9a

Former-commit-id: 96d8ddcf51 [formerly 7a53736cf3] [formerly 22be9bee2e] [formerly 96d8ddcf51 [formerly 7a53736cf3] [formerly 22be9bee2e] [formerly adbeffbb25 [formerly 22be9bee2e [formerly 5397776e07902b1deb68259128ae536fafa1d844]]]]
Former-commit-id: adbeffbb25
Former-commit-id: 64d3ed2723 [formerly 03146b0a16] [formerly 8e6f528a102b2a018db31f4d1dddc50e51d23e89 [formerly ab58fcb601]]
Former-commit-id: 1807808e57851b0545ae309aff64b99242e04a59 [formerly 4b2023b359]
Former-commit-id: 8a68ac417e
 2012-09-24 11:33:03 -05:00
David Gillingham
b0606e6d25 Issue #1190: Replace all calls to WsId.getNetworkId().getHostName() with calls to WsId.getHostName() 
which uses new host name cache.

Change-Id: I7e6cab90d449732df807fb273b117da63de0a611

Former-commit-id: 5ec52e8a92 [formerly 414bb05da6] [formerly eca0d00313] [formerly 5ec52e8a92 [formerly 414bb05da6] [formerly eca0d00313] [formerly 8f532d2900 [formerly eca0d00313 [formerly bd8cd6a08b1a2db61d75cc822ec3541279416e0d]]]]
Former-commit-id: 8f532d2900
Former-commit-id: c3dd54de22 [formerly ca6c1bdeec] [formerly 00a220480415d7e00b76aa595a61ec10d341b9f2 [formerly 03d5b9e7f9]]
Former-commit-id: 52187b7006016b6ea26c3d4698d4854bce59880a [formerly 1a4d07ad87]
Former-commit-id: c7085ff04c
 2012-09-20 10:52:00 -05:00
Nate Jensen
a6ffce9c83 Merge "Issue #1091 Added localMaps.py capability" into development 
Former-commit-id: 0dec8c75c9 [formerly d0fa730f08] [formerly 998b7fc209] [formerly 0dec8c75c9 [formerly d0fa730f08] [formerly 998b7fc209] [formerly c1defed68e [formerly 998b7fc209 [formerly 05bf20edb5d43f2a78af0ce8a7c595226ca4cd43]]]]
Former-commit-id: c1defed68e
Former-commit-id: 8b8b2bc6d8 [formerly 2939da32d7] [formerly b61329311a0efe06e0e2d95f90a69604713c611d [formerly c9269ed3d0]]
Former-commit-id: 39adcee6ac150422d0b0c5536cebc8626a0903d1 [formerly 7bac64faf6]
Former-commit-id: 6c01684d8e
 2012-09-19 17:45:26 -05:00
Ron Anderson
fb457a2274 Issue #1091 Added localMaps.py capability 
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: 28efe7e4d6 [formerly dbe4f8f9b8] [formerly 6e2130a790] [formerly 28efe7e4d6 [formerly dbe4f8f9b8] [formerly 6e2130a790] [formerly 776214bf24 [formerly 6e2130a790 [formerly 21db6a603d237716744d7cac93482c9a51952403]]]]
Former-commit-id: 776214bf24
Former-commit-id: 5d6911f931 [formerly f5463c2e83] [formerly ce627290c20dc07d9b98e24e92ec594b3262f299 [formerly e917b45f38]]
Former-commit-id: 8bb619723c08949aabd1cee2270fe47f033fb0ea [formerly af7cac638e]
Former-commit-id: 43f30abdf3
 2012-09-19 17:41:48 -05:00
Bryan Kowal
dafa1ef660 Issue #1148 - the resources used by the gfesuite component in CAVE are now configurable. 
Change-Id: Id0d2ae388ddd7c4a27c4fbae19de9c53ae8b718d

Former-commit-id: 5884124ad4 [formerly fef603df01] [formerly e0eeb865a1] [formerly 5884124ad4 [formerly fef603df01] [formerly e0eeb865a1] [formerly 59dba27c24 [formerly e0eeb865a1 [formerly 73e4cd41a465984eeba2dbf8d52be3682624a27d]]]]
Former-commit-id: 59dba27c24
Former-commit-id: 123ab64bf5 [formerly 6068e5ee89] [formerly 2de8c75e4cf5ddd357f8007d65b16a0865a1ccfb [formerly 66db0593fe]]
Former-commit-id: 38bfb8565753da26fc548b3879e0e8a56763cb5e [formerly 8310e9ebc9]
Former-commit-id: 5379fa670d
 2012-09-19 10:55:59 -05:00
David Gillingham
9ed30526c3 Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections. 
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30

Former-commit-id: 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly a6d5f67f7a [formerly cd1acff953 [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: b3f97a70b7 [formerly c7f3c50a35] [formerly 9eca90d25acea37355c1a256a17e5cbef460f23d [formerly 4a2ebe8218]]
Former-commit-id: abc42c9ef3b1e6c10c78648481828dac6e643d55 [formerly 9c0d31db01]
Former-commit-id: d8e181911e
 2012-09-14 10:50:44 -05:00
David Gillingham
d10b8b964d Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo 
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.

Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5

Former-commit-id: 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 99ab0a124b [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]]
Former-commit-id: 99ab0a124b
Former-commit-id: a048dee4b3 [formerly 28ade875c5] [formerly cfc850e4fc58538a74d0f8c0490660cc9d30f0f8 [formerly 964927b19d]]
Former-commit-id: da7d3be134a3c74fcdb1e41cda076543ccedbfc9 [formerly 527a457e55]
Former-commit-id: dcc5c7789d
 2012-09-13 15:39:58 -05:00
Steve Harris
12c59e82df Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837]
Former-commit-id: 30b0700044
 2012-09-13 13:26:13 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline 
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
 2012-09-13 12:08:11 -05:00
Steve Harris
e78abbb503 Merge branch 'ss_builds' (12.10.1-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]]
Former-commit-id: 012c526816
Former-commit-id: 047003d8c0 [formerly b14d30591b] [formerly bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7]]
Former-commit-id: 585e00c89332757d4df66cf4a92879c20bf9d63b [formerly bba73380ca]
Former-commit-id: 3bec22460f
 2012-09-11 16:57:03 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline 
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
 2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158 12.10.1-2 baseline 
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee]
Former-commit-id: 5684a84a46
 2012-09-11 15:50:57 -05:00
Ron Anderson
a457539c80 Issue #1144 Fixed sizing of Local Effects Area dropdown. 
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 88ba04e791 [formerly 8ca431ab8b] [formerly ee7985bd57] [formerly 88ba04e791 [formerly 8ca431ab8b] [formerly ee7985bd57] [formerly 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]]
Former-commit-id: 16260530e9
Former-commit-id: 064d7a2afc [formerly e0e3e4a044] [formerly 22524cf34987f12d7db2178a5437262655f63666 [formerly 309196b6e1]]
Former-commit-id: b63148319d11f61113329e47c01d50715af7ae2f [formerly 86455f1e6a]
Former-commit-id: 8f85204091
 2012-09-06 17:44:00 -05:00
Steve Harris
46d05b60a1 Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789]
Former-commit-id: f8e7459dfb
 2012-09-04 12:11:03 -05:00
Steve Harris
bc97cf788a 12.10.1-1 baseline 
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
 2012-09-04 12:07:27 -05:00
Steve Harris
e38cbf019b 12.9.1-12 baseline 
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d [formerly 782941ccc1] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545]
Former-commit-id: c1e601dc30
 2012-09-04 11:47:38 -05:00
Steve Harris
e4a69a14b7 Merge branch 'ss_builds' (12.9.1-11) into development 
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]]
Former-commit-id: 34cbde4124
Former-commit-id: a3a1864f56 [formerly ffe253196a] [formerly b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]]
Former-commit-id: 0a6beb81edff0c6c84ef952189b7118ada94cdbd [formerly 5b4ee818b7]
Former-commit-id: b63855f152
 2012-08-30 14:40:34 -05:00
Steve Harris
cba4faf995 12.9.1-10 baseline 
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c]
Former-commit-id: ede38c4b3f
 2012-08-30 14:28:27 -05:00
Matt Nash
1071ff2049 Issue #1101 fix gfe keybindings for frame change in collaboration 
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: d35027f45e [formerly cac1c2bb2e] [formerly 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50]]
Former-commit-id: c580f22bd8cf1f202bf9fa6adf36dc991f847cf9 [formerly 5c568beda7]
Former-commit-id: 1b9d645810
 2012-08-27 12:16:38 -05:00
Steve Harris
7f13d82b95 Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development 
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d]
Former-commit-id: 3f44e46a6f
 2012-08-27 09:53:55 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline 
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
 2012-08-21 15:27:03 -05:00
Ron Anderson
fd53117c14 Issue #436 Made hazardDict an OrderedDict so order of entries is preserved. 
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]]
Former-commit-id: 7662d249ab
Former-commit-id: 21b48541c3 [formerly 6e3674f9fc] [formerly eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1]]
Former-commit-id: cc064445b1277a5893829a9d2679defa8d74bab9 [formerly 1b655b0826]
Former-commit-id: f69d7b9c64
 2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01 Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 0a32c7c683 [formerly e5952c1c99] [formerly 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705]]
Former-commit-id: e27e7df534ee0ecbb93248c7bad66447e0b16b5e [formerly f7b9190b51]
Former-commit-id: b78c280ac8
 2012-08-17 12:20:08 -05:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
 2012-08-15 22:15:20 +00:00
Steve Harris
867586657b 12.9.1-4 baseline 
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501]
Former-commit-id: 7e1d1f6e08
 2012-08-15 15:19:10 -05:00
Steve Harris
31353e2296 12.9.1-1 baseline 
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
 2012-08-15 13:59:00 -05:00
Steve Harris
fe4f531ab4 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds 
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 4f1a7eb689 [formerly 52e0da2293] [formerly ee22b108589d0c82dcd1216d6f772ca807503da2 [formerly b2432e096f]]
Former-commit-id: 0f6649139bcd0bcc13452f409ebf934272d58b9b [formerly dcc56b8a23]
Former-commit-id: 9fd142b98e
 2012-08-06 09:38:26 -05:00
Steve Harris
5b36559525 12.8.1-10 baseline 
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]]
Former-commit-id: ca25d508ec
Former-commit-id: 330df3323f [formerly 78d34d65d2] [formerly ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]]
Former-commit-id: ec8b3d9f8a4ff2a546518a3c5769751ec3bf2a2f [formerly 46daa48f1c]
Former-commit-id: 78d66ba6df
 2012-08-06 09:34:26 -05:00
Steve Harris
5d5bcddfd2 Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c [formerly d2291ba23f] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628]
Former-commit-id: 078b4fff3c
 2012-08-01 12:43:12 -05:00
Steve Harris
1098368e19 12.8.1-5 baseline 
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
 2012-08-01 10:45:37 -05:00
Ron Anderson
ffa704b341 Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks. 
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: c2937d7303 [formerly e9f24e8660] [formerly 7c6686f2f4] [formerly c2937d7303 [formerly e9f24e8660] [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 7c6686f2f4 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]]
Former-commit-id: b1650b6143
Former-commit-id: 701d77f90a [formerly 4efd9149f7] [formerly 7e61eb27b9b666aa966565378d537d64b5825d69 [formerly 6a3e6f599f]]
Former-commit-id: f069830b986452675473f871e65551da025da1f1 [formerly e328b61d87]
Former-commit-id: d4a29dace5
 2012-07-31 08:36:27 -05:00
Ron Anderson
178c38c07f Issue #851 removed obsolete GFE code. 
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02

Former-commit-id: b1a633e121 [formerly 74478728de] [formerly 35d140f0fb] [formerly b1a633e121 [formerly 74478728de] [formerly 35d140f0fb] [formerly d87c0b6c4b [formerly 35d140f0fb [formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]]]
Former-commit-id: d87c0b6c4b
Former-commit-id: 5a58fc89bf [formerly 4459afa40c] [formerly 6f790834b05690824c16344926fd96fe4133d97f [formerly 6b7f1b3611]]
Former-commit-id: 7b388ba1db3d1ca217963cfd739fa1143fd98195 [formerly 251494458f]
Former-commit-id: 12a02df51c
 2012-07-30 15:34:16 -05:00
Steve Harris
a302427d08 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: e6f4b3f257 [formerly 302aa05586] [formerly de9034c96c] [formerly e6f4b3f257 [formerly 302aa05586] [formerly de9034c96c] [formerly 4688ac304f [formerly de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]]
Former-commit-id: 4688ac304f
Former-commit-id: e9f4d5b474 [formerly f2ab9cfe1a] [formerly 1e9f1a509a3a3df6aa114b32afd9c50a0af22853 [formerly b82d6772c3]]
Former-commit-id: ff305413af3ce4f661aa49a1d08c099b45e855fc [formerly acfc6eff55]
Former-commit-id: 05082b1d3a
 2012-07-27 14:50:45 -05:00
Steve Harris
2e4db7ecaf Merge branch 'master' (OB12.7.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26 [formerly 9e4df42326] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f]
Former-commit-id: 84d0f1fbb6
 2012-07-27 14:44:44 -05:00
Ben Steffensmeier
96a8764ecf Issue #921 register GFEColorbarResource as a listener when recycling. 
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: 23fa86c332 [formerly 7514bfd6cd] [formerly e3cfa52237] [formerly 23fa86c332 [formerly 7514bfd6cd] [formerly e3cfa52237] [formerly 044836cd2c [formerly e3cfa52237 [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]]]
Former-commit-id: 044836cd2c
Former-commit-id: 3b989242c3 [formerly 97776790cb] [formerly 861eca1c82baae5dd8124c5f8fb397c9bd50877e [formerly 6f9ec1af50]]
Former-commit-id: 78f94b2986294769e3110668512f7752e84b7615 [formerly 37f4498d8c]
Former-commit-id: c5b450e517
 2012-07-24 11:29:51 -05:00
Ron Anderson
6c3d52e802 Issue #851 Fixed issues with DatabaseID.dateFormat 
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 8b897c2bb0 [formerly 21431b2693] [formerly 1f2e581534] [formerly 8b897c2bb0 [formerly 21431b2693] [formerly 1f2e581534] [formerly b52f1400ef [formerly 1f2e581534 [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]]]
Former-commit-id: b52f1400ef
Former-commit-id: 2c8ea61c9e [formerly e184dceb91] [formerly 5d6702b36fde41c8818de2db46efd10773b829e1 [formerly bc034e1863]]
Former-commit-id: 1b1be3aa099270bdd102801560dcbb12663bbe96 [formerly bc519a7ce2]
Former-commit-id: fceddcbedc
 2012-07-23 16:49:21 -05:00
Steve Harris
23dc8deeb0 12.7.1-8 baseline 
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
 2012-07-19 16:20:40 -05:00
Steve Harris
461e720c3e Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10 
These files have existing camel-cased equivalents and may not be needed.


Former-commit-id: a456af38fa [formerly 8fff0d7e53] [formerly 479ccdbed2] [formerly a456af38fa [formerly 8fff0d7e53] [formerly 479ccdbed2] [formerly 9454393d13 [formerly 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]]
Former-commit-id: 9454393d13
Former-commit-id: 1e747f0a42 [formerly 45ac1d4d51] [formerly 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174]]
Former-commit-id: fd07c26e5ac59302fff491238a67bd3c1240158d [formerly 19475ea67b]
Former-commit-id: 1d367f861a
 2012-07-10 09:29:33 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline 
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
 2012-07-10 07:53:49 -05:00
Max Schenkelberg
aa709bc1ce Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function 
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 58abd127b7 [formerly c6d324aaeb] [formerly 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962]]
Former-commit-id: 6353460f49cb2fb59cc8a8385f88fe8159290a8a [formerly d876190d68]
Former-commit-id: 3325ed5deb
 2012-07-06 16:01:47 -05:00
Ron Anderson
81ca8eb20b Issue #851 Cleaned up dead code and unused dependencies in GFE. 
Amend: Issue #851 resubmitting after accepting ticket

Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e

Former-commit-id: b4c02fd246 [formerly 936b2cabca] [formerly ff5c7b7498] [formerly b4c02fd246 [formerly 936b2cabca] [formerly ff5c7b7498] [formerly 59a3ebe8ba [formerly ff5c7b7498 [formerly af1332170e28aed53ff91997ce089b20423203d5]]]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: 68ddc7056d [formerly 5186dcf321] [formerly deb40e1efbb342a3a1a406a5b1b9de83925bea87 [formerly 0c5199ba03]]
Former-commit-id: a1b6ce3f8769ead1b0af5fa0032511ac178d5176 [formerly b109c320ae]
Former-commit-id: 147b2737f8
 2012-07-05 15:39:05 -05:00
Bryan Kowal
57311c0029 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties 
Former-commit-id: 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: ae096aef72 [formerly 3010c15a2a] [formerly ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad71]]
Former-commit-id: 07f687a4c072b6aeddb13cb0971a782861e30540 [formerly f3409d507f]
Former-commit-id: 8da12f2c0d
 2012-06-27 18:38:19 -05:00
Bryan Kowal
e05b247e3b Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
 2012-06-27 17:21:48 -05:00
Bryan Kowal
f21e18aaa1 12.6.1-10 baseline 
Conflicts:
	cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
	cave/com.raytheon.uf.viz.npp.viirs/.classpath
	cave/com.raytheon.uf.viz.npp.viirs/.project
	cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
	cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	cots/org.jboss.cache/.project
	deltaScripts/12.5.1/drop_gfe_tables.sh
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
	ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
	ncep/gov.noaa.nws.ncep.common.staticdata/.project
	ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
	ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
	ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
	ncep/gov.noaa.nws.ncep.staticdataprovider/.project
	ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
	ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
	ncep/gov.noaa.nws.ncep.viz.customProjection/.project
	ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
	rpms/awips2.core/Installer.ldm/component.spec

Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a

Former-commit-id: 687c8e9968 [formerly 072c88b382] [formerly 4a17650914] [formerly 687c8e9968 [formerly 072c88b382] [formerly 4a17650914] [formerly 53e5b7c491 [formerly 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]]]
Former-commit-id: 53e5b7c491
Former-commit-id: 84d7454642 [formerly 6d2ca51c52] [formerly cff125fdb6dd2f2050f98afac20ca59352640221 [formerly 62c7de6d3b]]
Former-commit-id: cb7d3ce5625e79bff6eb725517fbfb48c3c44620 [formerly 718062f386]
Former-commit-id: ee40decf54
 2012-06-27 15:04:34 -05:00