Nate Jensen
|
212cfd65c3
|
Merge "Issue #1131 disable PanTool in Nsharp to avoid conflicting with nsharp mouse handlers." into development
Former-commit-id: b8001f13a7 [formerly 6c9a544d99 ] [formerly b8001f13a7 [formerly 6c9a544d99 ] [formerly e8acd359cc [formerly ed562fb9d3dbe7d43884fdefb7bc6cd04afaf5f8]]]
Former-commit-id: e8acd359cc
Former-commit-id: 89b4697fd3 [formerly e726f71edd ]
Former-commit-id: ca0325148f
|
2012-09-25 10:54:41 -05:00 |
|
Steve Harris
|
94cb625e91
|
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: 686b1756c9 [formerly 8354ca4e68 ] [formerly 686b1756c9 [formerly 8354ca4e68 ] [formerly 3827a78a7b [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 8edfe17e7d [formerly f5f59b6aa5 ]
Former-commit-id: a20533b551
|
2012-09-25 10:31:57 -05:00 |
|
Steve Harris
|
659a009c00
|
12.10.1-8 baseline
Former-commit-id: b062e4de8f [formerly dbd73151ca ] [formerly b062e4de8f [formerly dbd73151ca ] [formerly 73d29311d0 [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]
Former-commit-id: 73d29311d0
Former-commit-id: f4e218c4dd [formerly 94137c6ba1 ]
Former-commit-id: 57d4eacbb5
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
6419b3c85c
|
12.10.1-7 baseline
Former-commit-id: 2ee78eaf6d [formerly b754630136 ] [formerly 2ee78eaf6d [formerly b754630136 ] [formerly 7b37cfca85 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]]
Former-commit-id: 7b37cfca85
Former-commit-id: b18e5b5f2e [formerly 30592ab872 ]
Former-commit-id: 2a6e4b513c
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
20732fcbd5
|
12.10.1-6 baseline
Former-commit-id: 81d91a8289 [formerly cebe6534ae ] [formerly 81d91a8289 [formerly cebe6534ae ] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: 0e77eb2fe2 [formerly 5d5a61bd75 ]
Former-commit-id: e39023bb85
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
7bf94b32df
|
Merge branch 'Dialog_Refactor' into development
Former-commit-id: 403f483a93 [formerly 0bd99c3637 ] [formerly 403f483a93 [formerly 0bd99c3637 ] [formerly 702576bbac [formerly bedeaaf67ed189fa84f3f5a8399aeae5c200d1cc]]]
Former-commit-id: 702576bbac
Former-commit-id: 360bb278eb [formerly 7f9e89cc79 ]
Former-commit-id: ede743f659
|
2012-09-25 09:51:00 -05:00 |
|
Max Schenkelberg
|
471e8249b2
|
Issue #1214 Made VizGlobalsManager check for null window before calling getPage() since getInstance() still returns succesfully when null window is passed in. Change TimeMatchingJob to be shutdown when core plugin stops and cancels existing jobs.
Amend: Removed println
Change-Id: I3559b13074eb025e9bf931685cda3e804037baff
Former-commit-id: 51e565c6ff [formerly 4b2467e639 ] [formerly 51e565c6ff [formerly 4b2467e639 ] [formerly edfd7fd22f [formerly fc617c1392d9585d2e91e371af74aad4b24acfbb]]]
Former-commit-id: edfd7fd22f
Former-commit-id: f0376e0240 [formerly 63c30eafc2 ]
Former-commit-id: e021aee0c8
|
2012-09-24 15:39:18 -05:00 |
|
Ben Steffensmeier
|
ff635949c7
|
Issue #1131 disable PanTool in Nsharp to avoid conflicting with nsharp mouse handlers.
Former-commit-id: fe38c4f838 [formerly c4e1d834c1 ] [formerly fe38c4f838 [formerly c4e1d834c1 ] [formerly 50969cb7e2 [formerly efe7d92966e8d53a1f071f62c5b73576d9c6793a]]]
Former-commit-id: 50969cb7e2
Former-commit-id: be65c6cbd7 [formerly 9e0c697daf ]
Former-commit-id: c34e649e65
|
2012-09-24 15:31:15 -05:00 |
|
Nate Jensen
|
284ab4c3bf
|
Merge "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" into development
Former-commit-id: 00cc58cbb5 [formerly 78169b1bf1 ] [formerly 00cc58cbb5 [formerly 78169b1bf1 ] [formerly 6a5f700bce [formerly 9615c1149f086af6a9d8657ad4c36bcc8f5aade2]]]
Former-commit-id: 6a5f700bce
Former-commit-id: 720986610b [formerly 6d292c35c3 ]
Former-commit-id: f91a543f23
|
2012-09-24 14:26:54 -05:00 |
|
Roger Ferrel
|
04433f0fec
|
Issue #1196 Changes for WarnGenConfirmationDlg.
Change-Id: I5abb882d642e0e2c247432f87dbac0f82656c5f3
Former-commit-id: 4d50ea7c39 [formerly 4b24258c4c ] [formerly 4d50ea7c39 [formerly 4b24258c4c ] [formerly 0ef53ff1b8 [formerly 60d1f0788345be4b4212704dc7b04e575d8c0fc9]]]
Former-commit-id: 0ef53ff1b8
Former-commit-id: cb20e61daf [formerly ce8bf085af ]
Former-commit-id: ec17241f51
|
2012-09-24 12:03:59 -05:00 |
|
Max Schenkelberg
|
8a68ac417e
|
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: 7a53736cf3 [formerly 22be9bee2e ] [formerly 7a53736cf3 [formerly 22be9bee2e ] [formerly adbeffbb25 [formerly 5397776e07902b1deb68259128ae536fafa1d844]]]
Former-commit-id: adbeffbb25
Former-commit-id: 03146b0a16 [formerly ab58fcb601 ]
Former-commit-id: 4b2023b359
|
2012-09-24 11:33:03 -05:00 |
|
Roger Ferrel
|
d4e01bcfad
|
Issue #1196 Changes for AlarmAlertDlg
Change-Id: Icfaf604b064119548898dd100cbd3fba2d1303f7
Former-commit-id: 22fa512d23 [formerly 619acbe333 ] [formerly 22fa512d23 [formerly 619acbe333 ] [formerly 7280dc6167 [formerly c68e9d4f7cfb0e0e9e46c789c69e40e931b2ee2e]]]
Former-commit-id: 7280dc6167
Former-commit-id: 771676c51d [formerly 020bcd91ea ]
Former-commit-id: 9d87d39ca0
|
2012-09-24 09:31:00 -05:00 |
|
Roger Ferrel
|
fc2f106f29
|
Issue #1196 Changes for NewAlarmDlg.
Change-Id: I6dd6b3a2984bc0e1590ca199d16adc574c2fbae4
Former-commit-id: 6f2804a40a [formerly d21f3fff14 ] [formerly 6f2804a40a [formerly d21f3fff14 ] [formerly 7efd9fa9fe [formerly 3bb158124bceac8cb10b96bb09423ffee0674ba3]]]
Former-commit-id: 7efd9fa9fe
Former-commit-id: 74400d5347 [formerly 98d685f675 ]
Former-commit-id: 2be355e672
|
2012-09-24 08:44:01 -05:00 |
|
Ben Steffensmeier
|
9c23c42218
|
Issue #1208 change density and mag handlers in d2d to not throw exceptions.
Former-commit-id: 0bc73bb5aa [formerly f20812bc11 ] [formerly 0bc73bb5aa [formerly f20812bc11 ] [formerly 3f4bfb8efe [formerly b7c0ef15d9e8c27cd3ce646b393c6c44315eabef]]]
Former-commit-id: 3f4bfb8efe
Former-commit-id: 3256de1093 [formerly 6e8bca348f ]
Former-commit-id: 4372a4e0d6
|
2012-09-21 11:11:24 -05:00 |
|
Ben Steffensmeier
|
c43b7c1dd7
|
Issue #1131 merge multipane nsharp into D2D.
Former-commit-id: cb6b9dda23 [formerly c04649842a ] [formerly cb6b9dda23 [formerly c04649842a ] [formerly 2606f968cb [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]]
Former-commit-id: 2606f968cb
Former-commit-id: b83ca44d6b [formerly 036aa08f2c ]
Former-commit-id: 8fc544b44f
|
2012-09-20 17:28:54 -05:00 |
|
Roger Ferrel
|
5a3f210a14
|
Issue #1196 Changes for HelpRequestDlg.
Change-Id: I676a49fc36f88426fd5c2b2b42d0551c2d6e4e6d
Former-commit-id: a78b955770 [formerly 496cb65adf ] [formerly a78b955770 [formerly 496cb65adf ] [formerly c77ed46ddc [formerly 8463663d1c1bb569dc091f2886633832bdf45ffa]]]
Former-commit-id: c77ed46ddc
Former-commit-id: e277ccf9b5 [formerly 408b7ae031 ]
Former-commit-id: 162d1272fc
|
2012-09-20 16:28:01 -05:00 |
|
Roger Ferrel
|
a561d7d601
|
Issue #1196 Changes for AlarmAlertSaveLoadDlg.
Change-Id: I9baab44a7c5c97af86ea7446e265a873444fc47e
Former-commit-id: 34cd5b61cf [formerly fd248ac744 ] [formerly 34cd5b61cf [formerly fd248ac744 ] [formerly 407bd9f25e [formerly 80b29e5da16e908ed2855ee5c645b911e054e7f7]]]
Former-commit-id: 407bd9f25e
Former-commit-id: 79f1dff095 [formerly cdd02b9000 ]
Former-commit-id: 9440bbced2
|
2012-09-20 15:17:27 -05:00 |
|
Roger Ferrel
|
116a5993ec
|
Issue #1196 Changes for RemoteSiteRequestDlg.
Change-Id: I1ba3b9b4239c8d2a4e44912628013cba48471f40
Former-commit-id: 56c28012a5 [formerly 8f892d7f80 ] [formerly 56c28012a5 [formerly 8f892d7f80 ] [formerly 4f0ab091a4 [formerly d05224479c8ca8ea9730253785eafb99e64d52da]]]
Former-commit-id: 4f0ab091a4
Former-commit-id: 7b73a0f166 [formerly 5fe74144a9 ]
Former-commit-id: 4d0ef5a437
|
2012-09-20 14:45:10 -05:00 |
|
Roger Ferrel
|
7324b572f2
|
Issue #1196 Changes for AfosIdSelectionDialog.
Change-Id: Ic25b78840899ec5bb0f00272004c683535afc992
Former-commit-id: e3c8314d62 [formerly a1e7271a63 ] [formerly e3c8314d62 [formerly a1e7271a63 ] [formerly 5687572616 [formerly 5e2aa722f39f38bf70331ad161d8740e84bb4af2]]]
Former-commit-id: 5687572616
Former-commit-id: e9300d2799 [formerly aa0a8ce32c ]
Former-commit-id: 1bce82f551
|
2012-09-20 12:34:47 -05:00 |
|
Lee Venable
|
60ac65de7d
|
Merge "Issue #1162 - Fix the NCEP/Hydro RFC FFG Mosaic displays. Fixed the grid resource and created FFGVizGroupResource." into development
Former-commit-id: a8dc9da191 [formerly 48f4ce9a30 ] [formerly a8dc9da191 [formerly 48f4ce9a30 ] [formerly eadc14a804 [formerly 66916cc9c7c007b8f613b16c98074971395b4ba5]]]
Former-commit-id: eadc14a804
Former-commit-id: bd04fa6923 [formerly 53f4395c91 ]
Former-commit-id: 5b422128b3
|
2012-09-20 12:29:41 -05:00 |
|
Roger Ferrel
|
1478cc1d81
|
Issue #1196 Changes for WmoIdSelectiondialog and modification to CaveJFACEDialog's setBlockOnOpen.
Change-Id: I3b9cc2bdc32a8f82a2d9ca6927c7fcda02254e9a
Former-commit-id: 6fa8e82174 [formerly 6cd9792f46 ] [formerly 6fa8e82174 [formerly 6cd9792f46 ] [formerly 471bab8172 [formerly 54e670d97751f1f78d472d742c4f362c7deee625]]]
Former-commit-id: 471bab8172
Former-commit-id: d28e0d8560 [formerly 3bf89d2240 ]
Former-commit-id: f34bb941c0
|
2012-09-20 12:14:42 -05:00 |
|
Nate Jensen
|
ac1ac8eee2
|
Merge "Issue #1194 make time matching more lenient for latest live data." into development
Former-commit-id: 005082dfef [formerly 0341a27900 ] [formerly 005082dfef [formerly 0341a27900 ] [formerly 6332549702 [formerly e0f013bb51f9d974f1554237b22739cf20ef0c56]]]
Former-commit-id: 6332549702
Former-commit-id: 0f6ea23c5c [formerly c0ff0c5801 ]
Former-commit-id: 398c9e2345
|
2012-09-20 11:46:22 -05:00 |
|
David Gillingham
|
c7085ff04c
|
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: 414bb05da6 [formerly eca0d00313 ] [formerly 414bb05da6 [formerly eca0d00313 ] [formerly 8f532d2900 [formerly bd8cd6a08b1a2db61d75cc822ec3541279416e0d]]]
Former-commit-id: 8f532d2900
Former-commit-id: ca6c1bdeec [formerly 03d5b9e7f9 ]
Former-commit-id: 1a4d07ad87
|
2012-09-20 10:52:00 -05:00 |
|
Ben Steffensmeier
|
16a74ae3cb
|
Issue #1194 make time matching more lenient for latest live data.
Former-commit-id: c53d884710 [formerly 575b5f9b71 ] [formerly c53d884710 [formerly 575b5f9b71 ] [formerly 45ecb93bae [formerly 0012646250f74b6361f57f7a8b08e919cbaee2ce]]]
Former-commit-id: 45ecb93bae
Former-commit-id: ec5d661489 [formerly 621260a7ac ]
Former-commit-id: 6ced1b116b
|
2012-09-20 10:37:46 -05:00 |
|
Mike Duff
|
c73de757df
|
Issue #1162 - Fix the NCEP/Hydro RFC FFG Mosaic displays.
Fixed the grid resource and created FFGVizGroupResource.
Change-Id: I4e90fb77c9a27da049e6c06d091076961e7f304c
Former-commit-id: ec28f8f28f [formerly 643eaea29d ] [formerly ec28f8f28f [formerly 643eaea29d ] [formerly 9fe028c438 [formerly d99d895daeaa049c6b4e683b7fbd37186f5ef1dc]]]
Former-commit-id: 9fe028c438
Former-commit-id: 2e0b64277c [formerly ff2bb36d39 ]
Former-commit-id: 6163f14f6b
|
2012-09-20 10:19:46 -05:00 |
|
Nate Jensen
|
6c01684d8e
|
Merge "Issue #1091 Added localMaps.py capability" into development
Former-commit-id: d0fa730f08 [formerly 998b7fc209 ] [formerly d0fa730f08 [formerly 998b7fc209 ] [formerly c1defed68e [formerly 05bf20edb5d43f2a78af0ce8a7c595226ca4cd43]]]
Former-commit-id: c1defed68e
Former-commit-id: 2939da32d7 [formerly c9269ed3d0 ]
Former-commit-id: 7bac64faf6
|
2012-09-19 17:45:26 -05:00 |
|
Ron Anderson
|
43f30abdf3
|
Issue #1091 Added localMaps.py capability
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f
Former-commit-id: dbe4f8f9b8 [formerly 6e2130a790 ] [formerly dbe4f8f9b8 [formerly 6e2130a790 ] [formerly 776214bf24 [formerly 21db6a603d237716744d7cac93482c9a51952403]]]
Former-commit-id: 776214bf24
Former-commit-id: f5463c2e83 [formerly e917b45f38 ]
Former-commit-id: af7cac638e
|
2012-09-19 17:41:48 -05:00 |
|
Nate Jensen
|
4dd479f65f
|
Merge "Issue #1193 Fixed sampling resource input handler so it is added at higher priority than tools" into development
Former-commit-id: 5acf54de5f [formerly ec3895d13b ] [formerly 5acf54de5f [formerly ec3895d13b ] [formerly fdebede263 [formerly 975f01ff27b51ddc618154206a820749daf88bf9]]]
Former-commit-id: fdebede263
Former-commit-id: c35d1f600e [formerly 966332deab ]
Former-commit-id: 315ed1b4c9
|
2012-09-19 16:16:35 -05:00 |
|
Ron Anderson
|
86b4f399bf
|
Merge "Issue #1148 - the resources used by the gfesuite component in CAVE are now configurable." into development
Former-commit-id: 9e432bdc6f [formerly ebe2da8387 ] [formerly 9e432bdc6f [formerly ebe2da8387 ] [formerly 92d38e8d1d [formerly 605d00e89c56c794e00105edbd044bf6528e6e0a]]]
Former-commit-id: 92d38e8d1d
Former-commit-id: cab08ce01d [formerly cd63496131 ]
Former-commit-id: 4d8cfda761
|
2012-09-19 14:12:46 -05:00 |
|
Lee Venable
|
72c8d132d1
|
Merge "Issue #1179 fix radar imagery to not display when there is no dual pol precip." into development
Former-commit-id: dac502a722 [formerly 4c9ce244ec ] [formerly dac502a722 [formerly 4c9ce244ec ] [formerly a40db200e2 [formerly af028223a42adf831f774bac9903d546e1bfc5b6]]]
Former-commit-id: a40db200e2
Former-commit-id: 4bfa3b5c64 [formerly 12b89102a4 ]
Former-commit-id: efa83534a9
|
2012-09-19 13:18:35 -05:00 |
|
Max Schenkelberg
|
76f68d8b03
|
Issue #1193 Fixed sampling resource input handler so it is added at higher priority than tools
Change-Id: I3818eefaf756f049173664a70286af057bfa33e8
Former-commit-id: cfce157801 [formerly a1857c6a43 ] [formerly cfce157801 [formerly a1857c6a43 ] [formerly c4e97cfdde [formerly 8914baa18e7a95a999dc56f3eef0496d513e255c]]]
Former-commit-id: c4e97cfdde
Former-commit-id: f037ea4ed9 [formerly 0335a3e7cf ]
Former-commit-id: e60574d9f1
|
2012-09-19 13:12:15 -05:00 |
|
Bryan Kowal
|
5379fa670d
|
Issue #1148 - the resources used by the gfesuite component in CAVE are now configurable.
Change-Id: Id0d2ae388ddd7c4a27c4fbae19de9c53ae8b718d
Former-commit-id: fef603df01 [formerly e0eeb865a1 ] [formerly fef603df01 [formerly e0eeb865a1 ] [formerly 59dba27c24 [formerly 73e4cd41a465984eeba2dbf8d52be3682624a27d]]]
Former-commit-id: 59dba27c24
Former-commit-id: 6068e5ee89 [formerly 66db0593fe ]
Former-commit-id: 8310e9ebc9
|
2012-09-19 10:55:59 -05:00 |
|
Ron Anderson
|
ae7dedcbaf
|
Issue #436 Fix deleting zones
Change-Id: I03f07f8a5a7a06c4c96128de25b17204392cc466
Former-commit-id: fc48cdc5e7 [formerly 2d7c80b0cf ] [formerly fc48cdc5e7 [formerly 2d7c80b0cf ] [formerly 9cbabdb8f4 [formerly a925e1432a059d4bfe1582a82c3d4e13caedbff9]]]
Former-commit-id: 9cbabdb8f4
Former-commit-id: d233192037 [formerly fcf0c35471 ]
Former-commit-id: 471147029d
|
2012-09-19 09:37:05 -05:00 |
|
Ben Steffensmeier
|
ec3c42526a
|
Issue #1179 fix radar imagery to not display when there is no dual pol precip.
Former-commit-id: 3c5497f87f [formerly 798e28b218 ] [formerly 3c5497f87f [formerly 798e28b218 ] [formerly 71391cdb59 [formerly 5eb3c4d62bcbdb458bc2895172601cb3fa38fa4b]]]
Former-commit-id: 71391cdb59
Former-commit-id: fd04a5be35 [formerly 918e74fe20 ]
Former-commit-id: a6374581ba
|
2012-09-18 18:05:09 -05:00 |
|
Ben Steffensmeier
|
d400af3b00
|
Issue #1178 fix a bug in graph interpolation when data falls exactly on a grid row.
Former-commit-id: 4da7776a7d [formerly 1176d5efd3 ] [formerly 4da7776a7d [formerly 1176d5efd3 ] [formerly 106a55319c [formerly f8d072aaeb56a7a27db913f47d7cfe08d2ff86ff]]]
Former-commit-id: 106a55319c
Former-commit-id: 1a4c7a760e [formerly b8792e78ae ]
Former-commit-id: 17782f1f68
|
2012-09-18 15:20:15 -05:00 |
|
Mike Duff
|
20704be0e2
|
Issue #1156 - Fix ts ordering so TS values are alpha sorted
Change-Id: I9cc441d4a435b300d82a98095864371aeea26e9f
Former-commit-id: ba929fc086 [formerly 0e04543f38 ] [formerly ba929fc086 [formerly 0e04543f38 ] [formerly e1dfeaa452 [formerly 1d1347b3f87ffe1df5726b5d1f15cc43fbbe6c44]]]
Former-commit-id: e1dfeaa452
Former-commit-id: 806130db4c [formerly 85d5e20f12 ]
Former-commit-id: fdd2b69c7f
|
2012-09-18 13:55:18 -05:00 |
|
Lee Venable
|
3dbec60a03
|
Merge "Issue #1177 implement hashCode and equals for cross section" into development
Former-commit-id: 5f83853925 [formerly d0d18a14c3 ] [formerly 5f83853925 [formerly d0d18a14c3 ] [formerly 0623f35781 [formerly 1f9ba730d1c895e4442a2ac2bba1dd0a647ff122]]]
Former-commit-id: 0623f35781
Former-commit-id: 3e4c63a215 [formerly 027b3ca769 ]
Former-commit-id: 830744fc06
|
2012-09-18 11:16:02 -05:00 |
|
Ben Steffensmeier
|
aac177a52a
|
Issue #1177 implement hashCode and equals for cross section
Former-commit-id: ceb54978d1 [formerly 77965aaee6 ] [formerly ceb54978d1 [formerly 77965aaee6 ] [formerly 25a935f2e0 [formerly cc91594ca8f82f322e36ab6feebe7f2ddeef60d1]]]
Former-commit-id: 25a935f2e0
Former-commit-id: 9ff8b48b10 [formerly 692c46fcce ]
Former-commit-id: 2d9aef2805
|
2012-09-17 17:32:41 -05:00 |
|
Lee Venable
|
0ecf1d9608
|
Merge "Issue #1048 re-commit code cleanup changes from other branch" into development
Former-commit-id: f375af2f63 [formerly c4485fd4ac ] [formerly f375af2f63 [formerly c4485fd4ac ] [formerly acf062aa3e [formerly 1ca6642169c3541e3bbcddf3fc57fd1c84fba65b]]]
Former-commit-id: acf062aa3e
Former-commit-id: b227c496be [formerly 0f0f5aaa32 ]
Former-commit-id: 079ddba174
|
2012-09-17 16:25:28 -05:00 |
|
Steve Harris
|
dfed3eb43f
|
Merge branch 'ss_builds' (12.10.1-5) into Dialog_Refactor
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
Former-commit-id: b7ba804e23 [formerly ee328a8050 ] [formerly b7ba804e23 [formerly ee328a8050 ] [formerly c915928580 [formerly adf0432a221aaa9b62eaeae5cc7aaecbe1262de2]]]
Former-commit-id: c915928580
Former-commit-id: bd276f06d2 [formerly 202302cb5c ]
Former-commit-id: e08a3af27e
|
2012-09-17 15:53:09 -05:00 |
|
Steve Harris
|
9966493ff3
|
Merge branch 'ss_builds' (12.10.1-5) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
Former-commit-id: 15a625adb7 [formerly dd6ac67e17 ] [formerly 15a625adb7 [formerly dd6ac67e17 ] [formerly 39f15fe032 [formerly 4e988dde641d01295134080111e738f25a110e6d]]]
Former-commit-id: 39f15fe032
Former-commit-id: 7abc080c21 [formerly 9de7b02008 ]
Former-commit-id: beb08c98ce
|
2012-09-17 15:46:11 -05:00 |
|
Steve Harris
|
288d4afff5
|
12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa ] [formerly 82feb4de50 [formerly a96d35a1fa ] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: a903893a09 [formerly deed84c1a2 ]
Former-commit-id: 430a11f72b
|
2012-09-17 15:42:31 -05:00 |
|
Nate Jensen
|
7ad8585310
|
Issue #1048 re-commit code cleanup changes from other branch
Change-Id: I2789e2c268f802c004f1594d7d2e5636065b5740
Former-commit-id: fa0043a012 [formerly bdfb01c501 ] [formerly fa0043a012 [formerly bdfb01c501 ] [formerly 8f7dbdb619 [formerly da4f41b2627e52bde097ab331e1f99c169a7e494]]]
Former-commit-id: 8f7dbdb619
Former-commit-id: 846158f252 [formerly 00abcef8a0 ]
Former-commit-id: a94642d620
|
2012-09-17 15:29:52 -05:00 |
|
Steve Harris
|
ff96578fb4
|
Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: c64e9b0ad9 [formerly 72ecefa9ee ] [formerly c64e9b0ad9 [formerly 72ecefa9ee ] [formerly fe92909f53 [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]]
Former-commit-id: fe92909f53
Former-commit-id: 91f26b6c0e [formerly b8d2ff47ca ]
Former-commit-id: f9166b9d83
|
2012-09-17 14:58:23 -05:00 |
|
Roger Ferrel
|
85cf1738ef
|
Issue #875 Added tri-state for Point fields movable and hidden.
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964
Former-commit-id: 4978b5305d [formerly 70217e1556 ] [formerly 4978b5305d [formerly 70217e1556 ] [formerly 66d98d068c [formerly 15833c5ca3b8415b3a2fef1da98c42e95721331d]]]
Former-commit-id: 66d98d068c
Former-commit-id: 8d21873f2f [formerly 7bbcb004be ]
Former-commit-id: ed3663b145
|
2012-09-17 09:02:26 -05:00 |
|
Bryan Kowal
|
eaca9d0306
|
Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: 9915d4c006 [formerly 77d12d0275 ] [formerly 9915d4c006 [formerly 77d12d0275 ] [formerly 3a037ffd49 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]]
Former-commit-id: 3a037ffd49
Former-commit-id: 9dc8747553 [formerly f516e61f20 ]
Former-commit-id: 219c939169
|
2012-09-14 12:25:41 -05:00 |
|
Nate Jensen
|
f1f38899c8
|
Merge "Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections." into development
Former-commit-id: 71f5f75f22 [formerly b1a6ff5396 ] [formerly 71f5f75f22 [formerly b1a6ff5396 ] [formerly 614c0f4248 [formerly 31538baa1db02a946b2cec63e349025cd1f4676c]]]
Former-commit-id: 614c0f4248
Former-commit-id: 9d873ef27d [formerly e8ec45cb18 ]
Former-commit-id: d7070a6ddf
|
2012-09-14 11:04:04 -05:00 |
|
Brad Gonzales
|
f2edc819fd
|
Issue #1171 updated TimeSeriesDisplayCanvas.findGraphMinMax(GraphData) to check the latest only setting before including historical traces in the calculation. Replaced System.err logging in TimeSeriesDlg with UFStatus handler logging. Since show latest forcast is always checked initially by default, removed some changes that were unncessary.
Change-Id: I68f80d5c1ffff9993bb9e2fb870a89426dca15aa
Former-commit-id: 3fc699002f [formerly f52f218813 ] [formerly 3fc699002f [formerly f52f218813 ] [formerly 09abbee8e9 [formerly 8bb318d9e42e855ccaab60dc763b42040c098e3e]]]
Former-commit-id: 09abbee8e9
Former-commit-id: a23e190b3e [formerly 5552fe34a2 ]
Former-commit-id: e8e07b3d59
|
2012-09-14 10:56:28 -05:00 |
|
David Gillingham
|
d8e181911e
|
Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections.
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30
Former-commit-id: f14efdfd7b [formerly cd1acff953 ] [formerly f14efdfd7b [formerly cd1acff953 ] [formerly a6d5f67f7a [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: c7f3c50a35 [formerly 4a2ebe8218 ]
Former-commit-id: 9c0d31db01
|
2012-09-14 10:50:44 -05:00 |
|
Nate Jensen
|
0ced243e18
|
Merge "Issue #1172 - Corrected update problem" into development
Former-commit-id: d24cc4440c [formerly 9daaa199ea ] [formerly d24cc4440c [formerly 9daaa199ea ] [formerly 3ae061edf8 [formerly d04a01d963a40711e7ed78b0767b699adfd75b2b]]]
Former-commit-id: 3ae061edf8
Former-commit-id: b6305cfea7 [formerly 7343b1a998 ]
Former-commit-id: 81699c719d
|
2012-09-14 10:42:59 -05:00 |
|