Ben Steffensmeier
|
73f44a1225
|
Issue #1194 change TimeMatcher so it only uses dtd in cases where dt and dtf are very different.
Former-commit-id: b01de6a051 [formerly 8400bc010b] [formerly b01de6a051 [formerly 8400bc010b] [formerly 9b19ec5b29 [formerly 1aa108da3e26e698af4ea0206ca1e7fb1ffcc588]]]
Former-commit-id: 9b19ec5b29
Former-commit-id: 884fa10618 [formerly f65f294d2a]
Former-commit-id: fce09d8c44
|
2012-10-25 13:03:41 -05:00 |
|
Lee Venable
|
76c7a3e7ea
|
Merge "Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog." into development
Former-commit-id: 076c9e55ea [formerly 900bddaab9] [formerly 076c9e55ea [formerly 900bddaab9] [formerly da5917e583 [formerly bdf06545fdf40531cf42ff29ca8d1f130a849469]]]
Former-commit-id: da5917e583
Former-commit-id: de911c657c [formerly baf9c741db]
Former-commit-id: 46b0ec1eef
|
2012-10-25 08:23:15 -05:00 |
|
Roger Ferrel
|
02b69aea45
|
Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog.
Change-Id: I22500cf5f7e3f11c16abd50b1ad5c80be81283cb
Former-commit-id: a989cceaa6 [formerly 5f016cac30] [formerly a989cceaa6 [formerly 5f016cac30] [formerly d2122ef959 [formerly 86f70d36d7eac5b472a1aa22922c30390436f880]]]
Former-commit-id: d2122ef959
Former-commit-id: 687dc18b9a [formerly fbc8331f28]
Former-commit-id: a2feba9e51
|
2012-10-25 08:08:33 -05:00 |
|
Roger Ferrel
|
be4dd4aa5b
|
Issue #1287 Changes for non-blocking SampleSetDialog.
Change-Id: I6b3eab5386418f9303190892f1a746d63a82ce65
Former-commit-id: 538ce87115 [formerly 8af2d4a404] [formerly 538ce87115 [formerly 8af2d4a404] [formerly af299023e2 [formerly 622b739d6e1352aacb96b7dd0f797f2b43fe5847]]]
Former-commit-id: af299023e2
Former-commit-id: 463e648808 [formerly 3eb28edd6c]
Former-commit-id: 6752ed4a22
|
2012-10-24 17:12:14 -05:00 |
|
Roger Ferrel
|
ead12a5908
|
Issue #1287 Changes for non-blocking SaveDeleteEditAreaGroupDialog.
Change-Id: I5be631699cb9e8c977b36c07bf1edc1d088d0877
Former-commit-id: 7555b4e075 [formerly 255213d1ec] [formerly 7555b4e075 [formerly 255213d1ec] [formerly 711e738bdd [formerly 27f8eaeb8ea82c0fbd6631c3c4ec33bf0d818bed]]]
Former-commit-id: 711e738bdd
Former-commit-id: ba9bbe3aa7 [formerly d849958e69]
Former-commit-id: 76602c775f
|
2012-10-24 14:41:50 -05:00 |
|
Roger Ferrel
|
c36e471404
|
Issue #1287 Code changes for non-blocking SaveDeleteRefDialog.
Change-Id: I6bf23b8f3d9bac171f9a296e3d47b86851a3e1e0
Former-commit-id: 6dfa000535 [formerly c2def88db1] [formerly 6dfa000535 [formerly c2def88db1] [formerly 347ad433ef [formerly 085fc755257ed8728a293d59670a79f79293dcbb]]]
Former-commit-id: 347ad433ef
Former-commit-id: 9775ab09d0 [formerly 56515fc4d6]
Former-commit-id: f0867f4c40
|
2012-10-24 12:41:33 -05:00 |
|
Roger Ferrel
|
60dfce2758
|
Issue #1287 Changes for non-blocking CreateFromScratchDialog.
Change-Id: I8a2152d834966992f8d4bbe8e4b72f7d9c7c3da0
Former-commit-id: 58ada46176 [formerly 50d65fefcb] [formerly 58ada46176 [formerly 50d65fefcb] [formerly 9fa924aecb [formerly 1cf83fa5e226f551c5d4cad3b5fa9f97b3203733]]]
Former-commit-id: 9fa924aecb
Former-commit-id: 34b84bcf2a [formerly c6752668e4]
Former-commit-id: 823e1099e9
|
2012-10-24 10:52:51 -05:00 |
|
Roger Ferrel
|
47023b93aa
|
Issue #1287 Changes for non-blocking DefineRefSetDialog.
Change-Id: I0aa3ec5b80140ae79fffd3edd230b1d8e8f68e43
Former-commit-id: 80c0d6b69e [formerly eb5aa48960] [formerly 80c0d6b69e [formerly eb5aa48960] [formerly c627c6af24 [formerly 3fd7556be39d7381c3cdc92a3b72a6ff10c2ebed]]]
Former-commit-id: c627c6af24
Former-commit-id: 5ad7545d15 [formerly be40b56d18]
Former-commit-id: 0a60b2f0ba
|
2012-10-24 10:42:33 -05:00 |
|
Lee Venable
|
30cc361acd
|
Merge "Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format." into development
Former-commit-id: bbce861df0 [formerly c9df378dc9] [formerly bbce861df0 [formerly c9df378dc9] [formerly f8b479c6af [formerly 7293ae6d122d5d7c144ba9d2ee0938b87f76f78a]]]
Former-commit-id: f8b479c6af
Former-commit-id: 2009301f91 [formerly ca4a2db82f]
Former-commit-id: 21ec980042
|
2012-10-24 10:00:07 -05:00 |
|
Roger Ferrel
|
077baaca1c
|
Issue #1287 Changes for non-blocking DefineSamplesViaLatLongDialog.
Change-Id: Id9b6d7feec00ae483f80cfa386ad31fdce3d8dea
Former-commit-id: db4f7b17cf [formerly 8d8850174e] [formerly db4f7b17cf [formerly 8d8850174e] [formerly 122012d767 [formerly a90e1b6f168e54d3a1a6581b692e84288de537f3]]]
Former-commit-id: 122012d767
Former-commit-id: 8cd67ae67d [formerly 6aab2f1d8b]
Former-commit-id: fba81ec4b0
|
2012-10-24 09:30:03 -05:00 |
|
Slav Korolev
|
c66954b14b
|
Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format.
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d
Former-commit-id: 2beb1dbc67 [formerly 52601577db] [formerly 2beb1dbc67 [formerly 52601577db] [formerly 8c1719f248 [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]]]
Former-commit-id: 8c1719f248
Former-commit-id: 14c942cf5d [formerly 0e7baf252a]
Former-commit-id: f3dfa16b3a
|
2012-10-24 09:24:02 -04:00 |
|
Roger Ferrel
|
b9d760ac42
|
Issue #1287 Changes for non-blocking but modal CopyGridsDialog.
Changes from reviewer comments.
Change-Id: I743752720d1c770e740912e2d6c3049d516c8183
Former-commit-id: c132e8cc91 [formerly 1cac983c4f] [formerly c132e8cc91 [formerly 1cac983c4f] [formerly e49535d318 [formerly ced609c6997ae3a4fc51d254218be600d5338ac2]]]
Former-commit-id: e49535d318
Former-commit-id: 084a35d697 [formerly 277c5c1a1d]
Former-commit-id: 724ddea4d2
|
2012-10-24 07:35:59 -05:00 |
|
Lee Venable
|
5ae1d62e6b
|
Merge "Issue #1287 Changes for non-blocking BreakLockDialog." into development
Former-commit-id: d264ed526a [formerly 1d0d352716] [formerly d264ed526a [formerly 1d0d352716] [formerly 9f3b0417cf [formerly cbcc82dff2b686c9b9f136563f473f5c41c15c8a]]]
Former-commit-id: 9f3b0417cf
Former-commit-id: a9dcf2ed3c [formerly 2554830cce]
Former-commit-id: f2303ba0f6
|
2012-10-23 17:02:51 -05:00 |
|
Steve Harris
|
8d94eb1e59
|
Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: d42e8373c6 [formerly b7406a55cc] [formerly d42e8373c6 [formerly b7406a55cc] [formerly 38b9c03f5e [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]]
Former-commit-id: 38b9c03f5e
Former-commit-id: ae9c6d58dd [formerly 9d038186d1]
Former-commit-id: 20e87549c0
|
2012-10-23 16:43:09 -05:00 |
|
Steve Harris
|
26badd258f
|
12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]
Former-commit-id: 79a5638de9
Former-commit-id: efba080b9c [formerly cfd228f0d7]
Former-commit-id: 572085c119
|
2012-10-23 16:40:50 -05:00 |
|
Roger Ferrel
|
4532cb8445
|
Issue #1287 Changes for non-blocking BreakLockDialog.
Change-Id: Ie2626e8960d69a200bc1b5c6ee28c6aa361f30ca
Former-commit-id: 9e2496dd0b [formerly a9dbaae595] [formerly 9e2496dd0b [formerly a9dbaae595] [formerly d33179f009 [formerly 2dc320c31ceed44bba70d6738ce40d703858be68]]]
Former-commit-id: d33179f009
Former-commit-id: 3790b5d9c4 [formerly 9f0586231f]
Former-commit-id: 627c685f42
|
2012-10-23 14:54:47 -05:00 |
|
Ron Anderson
|
09496fbe8e
|
Merge "Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times." into development
Former-commit-id: 32535286e3 [formerly aeff911d8b] [formerly 32535286e3 [formerly aeff911d8b] [formerly d942797296 [formerly 5ea502772674571298bf8801863d2711a9d201fd]]]
Former-commit-id: d942797296
Former-commit-id: 5027415c52 [formerly d9a00da60f]
Former-commit-id: 15f600afa7
|
2012-10-23 14:47:57 -05:00 |
|
Roger Ferrel
|
7f59b9efa1
|
Issue #1287 Changes for non-blocking AutoSaveIntervalDialog.
Change-Id: I5ea021d0658e68553542c88c8850fea4b9de696b
Former-commit-id: 2048a41563 [formerly 3e852fc9b5] [formerly 2048a41563 [formerly 3e852fc9b5] [formerly 17085ba699 [formerly d1601fee5b3de86e0120553d17ee18cf0b482e63]]]
Former-commit-id: 17085ba699
Former-commit-id: 1ce417b106 [formerly 6b9f409486]
Former-commit-id: 2ac417247f
|
2012-10-23 13:54:50 -05:00 |
|
Richard Peter
|
ddf41c8de6
|
Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times.
Change-Id: I4fb15e8e712155f6099bd27880fbcbdf1948fc5f
Former-commit-id: f94ba53663 [formerly 2e025e09e2] [formerly f94ba53663 [formerly 2e025e09e2] [formerly 0d10680b28 [formerly 6077558dbd06f8fdb568f03c163352b080a9eb5e]]]
Former-commit-id: 0d10680b28
Former-commit-id: 5dd0edf429 [formerly 5bc200bb88]
Former-commit-id: f53f3ea64f
|
2012-10-23 13:52:25 -05:00 |
|
Roger Ferrel
|
346e8851fb
|
Issue #1287 Changes for non-blocking FormatterLauncherDialog and code cleanup.
Change-Id: If2fbef2f2a128ff151525eed4feaf4273fa99855
Former-commit-id: 257bdcaa91 [formerly 656f582e22] [formerly 257bdcaa91 [formerly 656f582e22] [formerly 525a5bb8d1 [formerly 936092efc2f69ab3e2060334fddd630100da4157]]]
Former-commit-id: 525a5bb8d1
Former-commit-id: d82d50faf1 [formerly cc5ef23f23]
Former-commit-id: 38bc6ea4e9
|
2012-10-23 12:40:48 -05:00 |
|
Roger Ferrel
|
5843833581
|
Issue #1287 Changes for non-blocking but modal DisplayAttributesDialog.
Change-Id: I57df579cd29ffa2bb54589bf5862121857abedb0
Former-commit-id: 04053afeb7 [formerly 8152c49231] [formerly 04053afeb7 [formerly 8152c49231] [formerly b0c5e6472b [formerly 4dca1f343e38090c21e27f0470cc68042c22c811]]]
Former-commit-id: b0c5e6472b
Former-commit-id: f96c5a1e28 [formerly 8ac665a0ca]
Former-commit-id: ed86da12d7
|
2012-10-22 15:35:50 -05:00 |
|
Roger Ferrel
|
b0dd9d2d6b
|
Issue #1229 Changes for non-blocking CaveSWTWizardDlg.
Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d
Former-commit-id: 9a5a87635a [formerly ae3fb5eef5] [formerly 9a5a87635a [formerly ae3fb5eef5] [formerly 314af882c6 [formerly 30b387dc4c5392263ba3e82bca1db64099684ecf]]]
Former-commit-id: 314af882c6
Former-commit-id: d7fe430a7e [formerly 39b1fcbb01]
Former-commit-id: 729a2b227c
|
2012-10-22 14:07:18 -05:00 |
|
Roger Ferrel
|
7c38a3f040
|
Issue #1229 Changes for non-blocking ViewMessagesDialog.
Change-Id: Id1bd1e36a2d16feec60c82997891577c98296fe7
Former-commit-id: 602c6d8d2e [formerly 763c6ea58c] [formerly 602c6d8d2e [formerly 763c6ea58c] [formerly e157187c72 [formerly 02e781832ab07685baf2b353df39e156a3190c2c]]]
Former-commit-id: e157187c72
Former-commit-id: 1e6a58354c [formerly 7c63cb3495]
Former-commit-id: 7f7a51a20f
|
2012-10-22 10:25:05 -05:00 |
|
Lee Venable
|
0008ff6650
|
Merge "Issue #1229 Changes for stand along componets using non-blocking dialogs." into development
Former-commit-id: 2c52dde01c [formerly e73ceb7797] [formerly 2c52dde01c [formerly e73ceb7797] [formerly 505b0e4786 [formerly 49c70dc1f55f0456b96e69d526554be40b2e8fa7]]]
Former-commit-id: 505b0e4786
Former-commit-id: 38c2168e52 [formerly 53d1dce044]
Former-commit-id: 5ddab21cd9
|
2012-10-19 11:49:17 -05:00 |
|
Greg Armendariz
|
61189b5778
|
Removing duplicate line
Former-commit-id: a752fa4944 [formerly e456a622a5] [formerly a752fa4944 [formerly e456a622a5] [formerly b6f47d116f [formerly 6bbb49dff7c8f6c31d7053e32466695bc36d8b02]]]
Former-commit-id: b6f47d116f
Former-commit-id: e6b8019a64 [formerly 987868d8e3]
Former-commit-id: b4878c1bfb
|
2012-10-19 08:48:32 -05:00 |
|
Roger Ferrel
|
f56d19f17f
|
Issue #1229 Changes for stand along componets using non-blocking dialogs.
Change-Id: Ie394cc559501359074c15c60779331d9e922379a
Former-commit-id: 9b48ec6203 [formerly 2d9805411f] [formerly 9b48ec6203 [formerly 2d9805411f] [formerly 2c279a6704 [formerly 3f007ecd4def67cb8152f60ee0dec9656a90a03d]]]
Former-commit-id: 2c279a6704
Former-commit-id: 8f8862c014 [formerly 55bd3fcf27]
Former-commit-id: 05d654dc6a
|
2012-10-18 16:09:15 -05:00 |
|
Steve Harris
|
81154ab857
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 4823017ff1 [formerly 8a574a91cf] [formerly 4823017ff1 [formerly 8a574a91cf] [formerly 0bb64a8706 [formerly f3d80ac86697be7042fa20d52e3116e72b77f2a6]]]
Former-commit-id: 0bb64a8706
Former-commit-id: 6e89edaa37 [formerly 2a9f8eaa4d]
Former-commit-id: dac4999d0d
|
2012-10-18 16:06:05 -05:00 |
|
Steve Harris
|
35c2a8e26f
|
Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 3eff876edd [formerly a7337d9160] [formerly 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3 [formerly 892e4df811]
Former-commit-id: 8a17564ba3
|
2012-10-18 16:01:05 -05:00 |
|
Steve Harris
|
9c597c7060
|
12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
13cdd55545
|
12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70 [formerly e31c1e5bba]
Former-commit-id: dff8d5de9c
|
2012-10-18 15:46:42 -05:00 |
|
Roger Ferrel
|
acc563c2eb
|
Issue #1229 Changes for non-blocking SWTMessageBox.
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9
Former-commit-id: e17d8d4c37 [formerly 610444ee88] [formerly e17d8d4c37 [formerly 610444ee88] [formerly 38ae2b122e [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]]]
Former-commit-id: 38ae2b122e
Former-commit-id: 2ddf95c587 [formerly db1a29205a]
Former-commit-id: 71c69e504e
|
2012-10-18 14:06:02 -05:00 |
|
Jonathan Sanchez
|
0c9889d612
|
Issue #1126 Fixed refactor bugs.
Former-commit-id: a326889adc [formerly 4cf0b68aa2] [formerly a326889adc [formerly 4cf0b68aa2] [formerly d1bf86e2fe [formerly eb95e6227b229cc8d627b4ac24254c2f2c2e3023]]]
Former-commit-id: d1bf86e2fe
Former-commit-id: c2f01b17a1 [formerly 86e07328db]
Former-commit-id: aa06ef1c3a
|
2012-10-18 11:32:01 -05:00 |
|
Lee Venable
|
9aa92e0d99
|
Merge "Issue #1275 Merged code from 1225 on top of SS changes." into development
Former-commit-id: fa7a0ef83d [formerly dde9d4b802] [formerly fa7a0ef83d [formerly dde9d4b802] [formerly ea61e22d2e [formerly ca3b359ba6a8b3131f32b9341781d19378240402]]]
Former-commit-id: ea61e22d2e
Former-commit-id: c3d4eca33c [formerly fd9338320f]
Former-commit-id: db8be823fc
|
2012-10-18 11:16:37 -05:00 |
|
Roger Ferrel
|
6aa28a9ede
|
Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3
Former-commit-id: abd0476b6a [formerly 40fb3f9729] [formerly abd0476b6a [formerly 40fb3f9729] [formerly 4cd2f1c851 [formerly 5e4edda802714c236334500a12c2020386770dd2]]]
Former-commit-id: 4cd2f1c851
Former-commit-id: d51dc93248 [formerly 7a095d2d99]
Former-commit-id: 05c83289b6
|
2012-10-18 07:36:31 -05:00 |
|
Roger Ferrel
|
e676beaa66
|
Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e
Former-commit-id: 3af99829a6 [formerly 66379c3210] [formerly 3af99829a6 [formerly 66379c3210] [formerly d319101ed9 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]]
Former-commit-id: d319101ed9
Former-commit-id: 4d39ffd53d [formerly 928e9f6a1d]
Former-commit-id: fae6e2ec44
|
2012-10-17 15:12:55 -05:00 |
|
Roger Ferrel
|
e838ddc344
|
Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468
Former-commit-id: 3d15bf8be1 [formerly c73acb0c30] [formerly 3d15bf8be1 [formerly c73acb0c30] [formerly 460acb4337 [formerly 185024d06da214041273674716a7efce4b2a98f1]]]
Former-commit-id: 460acb4337
Former-commit-id: a9cb110036 [formerly b42cae4034]
Former-commit-id: b164d67e54
|
2012-10-17 13:53:29 -05:00 |
|
Jonathan Sanchez
|
523ecd30dd
|
Issue #1275 Merged code from 1225 on top of SS changes.
Former-commit-id: 5c181fede4 [formerly 36efd259d5] [formerly 5c181fede4 [formerly 36efd259d5] [formerly 9017f4b046 [formerly ace2ccf5653fcd791bc049ca17986b233a6a54cc]]]
Former-commit-id: 9017f4b046
Former-commit-id: fd0b09aa77 [formerly ecfc924a4b]
Former-commit-id: 021114b9b5
|
2012-10-17 13:30:44 -05:00 |
|
Roger Ferrel
|
382f5b234c
|
Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d
Former-commit-id: cdf5c546ab [formerly 8e86f32714] [formerly cdf5c546ab [formerly 8e86f32714] [formerly 6833c7e04c [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 1075e8ba16 [formerly d5acf40cc2]
Former-commit-id: a53f94e93d
|
2012-10-17 10:20:18 -05:00 |
|
Roger Ferrel
|
d92ccc692c
|
Fix for TextEditorDialog in merge of 12.11.1-4 baseline
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76
Former-commit-id: 6053b5fbc1 [formerly f4a2d13df1] [formerly 6053b5fbc1 [formerly f4a2d13df1] [formerly 8934186397 [formerly 1cf3c76428719ebc7f06612b8525057e9345a56e]]]
Former-commit-id: 8934186397
Former-commit-id: ab10bc88a8 [formerly 6199f7f516]
Former-commit-id: f891be22d1
|
2012-10-17 08:51:52 -05:00 |
|
Jonathan Sanchez
|
9dc3068ab8
|
Fixing DataAdaptorFactory blunder in merge of 12.11.1-4
Change-Id: Id8cc463b78e66632fd05675abdd144dccef5bb9f
Former-commit-id: af51b81d11 [formerly 1e53f0122a] [formerly af51b81d11 [formerly 1e53f0122a] [formerly f578372896 [formerly 89a30cf738bb64b26da16048f61af0585ded97e7]]]
Former-commit-id: f578372896
Former-commit-id: 6c5447b952 [formerly 9524cca5b1]
Former-commit-id: f9d20b4775
|
2012-10-17 08:50:00 -05:00 |
|
Lee Venable
|
1455dcb7bd
|
Merge "Issue #1229 Changes for non-blocking SaveColorMapDialog." into development
Former-commit-id: 6e7446c66c [formerly 526085140a] [formerly 6e7446c66c [formerly 526085140a] [formerly a256a54ab7 [formerly 191537fbfc3e1933121cf133f7b906a9f59cab3d]]]
Former-commit-id: a256a54ab7
Former-commit-id: e8195b2e52 [formerly 78eb24ee17]
Former-commit-id: 7be0bb0af6
|
2012-10-17 08:26:53 -05:00 |
|
Steve Harris
|
52409eaef5
|
Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 18ec4b5933 [formerly 34e7b3f4a3] [formerly 18ec4b5933 [formerly 34e7b3f4a3] [formerly 8703ff00c7 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]
Former-commit-id: 8703ff00c7
Former-commit-id: 31253e2949 [formerly dc5eba737d]
Former-commit-id: ea34163a1c
|
2012-10-17 08:21:19 -05:00 |
|
Roger Ferrel
|
b0f167507b
|
Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc
Former-commit-id: 086223e764 [formerly 5e79024db3] [formerly 086223e764 [formerly 5e79024db3] [formerly 7f3ab5434c [formerly b902eadfca48628bf8944d97019263e94618667a]]]
Former-commit-id: 7f3ab5434c
Former-commit-id: e4016f2f59 [formerly f77e146c65]
Former-commit-id: d9cfa1f2f6
|
2012-10-17 08:15:21 -05:00 |
|
Steve Harris
|
b7a76beea6
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 4ffbffe349 [formerly a63b40b17a] [formerly 4ffbffe349 [formerly a63b40b17a] [formerly 5e5c98b193 [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]
Former-commit-id: 5e5c98b193
Former-commit-id: a3a79a1a82 [formerly be16909d2d]
Former-commit-id: b28a8e5113
|
2012-10-16 21:44:49 -05:00 |
|
Roger Ferrel
|
a3fad37043
|
Issue #1229 Changes for non-blocking BackgroundColorDialog.
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9
Former-commit-id: ac30143335 [formerly 59a2dd6a3a] [formerly ac30143335 [formerly 59a2dd6a3a] [formerly d60b4ca396 [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]]
Former-commit-id: d60b4ca396
Former-commit-id: f253f2191b [formerly 757affcc66]
Former-commit-id: a6e13f80d4
|
2012-10-16 17:00:11 -05:00 |
|
Steve Harris
|
1e4c737ff2
|
Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
cave/com.raytheon.viz.gfe/help/localMapsConfig.html
cave/com.raytheon.viz.gfe/help/mapConfig.html
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
rpms/common/yum/arch.x86/comps.xml
Former-commit-id: da7a11fe97 [formerly 4610ecc513] [formerly da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: d0e91329b4 [formerly 0c0c1144c6]
Former-commit-id: ad78266035
|
2012-10-16 15:48:14 -05:00 |
|
Roger Ferrel
|
bb3bd24c8f
|
Issue #1229 Changes for non-blocking ProcedureListDlg.
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f
Former-commit-id: 1dc188fb3b [formerly 1a1f1a0601] [formerly 1dc188fb3b [formerly 1a1f1a0601] [formerly d51ba247d1 [formerly ea4c2898013df2107ebded11aa1561035eaf8a00]]]
Former-commit-id: d51ba247d1
Former-commit-id: 3682a16ad2 [formerly 85f8c1f282]
Former-commit-id: 840f6cd220
|
2012-10-16 15:39:12 -05:00 |
|
Steve Harris
|
35e34308c5
|
12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
|
2012-10-16 13:27:07 -05:00 |
|
Roger Ferrel
|
6f47b219fe
|
Issue #1229 Changes for non-blocking ProcedureDlg.
Change-Id: Iefdf2f8e8ceeb7af5173dd4c630b6abc2c1ce41a
Former-commit-id: 185acb8d87 [formerly 683c49fc49] [formerly 185acb8d87 [formerly 683c49fc49] [formerly d9fee38d21 [formerly 207c1dfec7f51a429c9db61258d09631ef2049c9]]]
Former-commit-id: d9fee38d21
Former-commit-id: 1572b42313 [formerly f685ac224f]
Former-commit-id: 8bf8bd190f
|
2012-10-16 12:53:39 -05:00 |
|
Steve Harris
|
5e8d96cf17
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: e8eee3ee0c [formerly 9853e8c53b] [formerly e8eee3ee0c [formerly 9853e8c53b] [formerly b4bb93a2c4 [formerly 8a2bda87f34ec3c1129429604de7344732d46017]]]
Former-commit-id: b4bb93a2c4
Former-commit-id: 11c6dd5488 [formerly 3d88dcb2b8]
Former-commit-id: 8caedc3cec
|
2012-10-16 11:50:37 -05:00 |
|