Ben Steffensmeier
745b2cd722
Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
...
Former-commit-id: 0855e117cb
[formerly 682edec2cf
] [formerly 603d48a017
[formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]
Former-commit-id: 603d48a017
Former-commit-id: 7ea36122f2
2012-06-25 15:22:35 -05:00
Max Schenkelberg
740b1c3981
Issue #665 fixed TransformFactory when getting worldToGrid to return crsToGrid
...
Amend: Updated comment for new return
Change-Id: I95151c5233898d156398760d3360de8c80b28001
Former-commit-id: f3caa3f442
[formerly 930d4569a5
] [formerly d7b326cfa6
[formerly 42fc0cbd10401a6099e571467ff112f544e525e7]]
Former-commit-id: d7b326cfa6
Former-commit-id: 4d79823f33
2012-06-21 17:54:32 -05:00
Nate Jensen
00e6701ce9
Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
...
Former-commit-id: 98fee4da65
[formerly 96c4d9301f
] [formerly 22d4de96fd
[formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]]
Former-commit-id: 22d4de96fd
Former-commit-id: 71a1826611
2012-06-21 10:04:51 -05:00
Steve Harris
efe25edfad
12.6.1-10 baseline
...
Former-commit-id: edac4d827c
[formerly 8dc4a774e2
] [formerly 3cd0902b49
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]
Former-commit-id: 3cd0902b49
Former-commit-id: eacd5aeb7f
2012-06-21 08:58:00 -05:00
Steve Harris
333fd9c64e
Revert "12.6.1-10 baseline"
...
This reverts commit f8497470fc
[formerly b33c5bdfcf
] [formerly a2c0893d1a
] [formerly 06f1c7b73c
[formerly ddde63eee0
] [formerly a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].
Former-commit-id: 62cf6a9f92
[formerly b4b1f6975f
] [formerly 25198a5cd6
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
f8497470fc
12.6.1-10 baseline
...
Former-commit-id: 06f1c7b73c
[formerly ddde63eee0
] [formerly a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
8111785587
Issue #704 fixes to random resources and optimization of radar projection transforms
...
Former-commit-id: fd6a3d3b23
[formerly 601d46661c
] [formerly 16e4fe8ce2
[formerly 7619165ce45efe9dbad045adfaaf978acee782be]]
Former-commit-id: 16e4fe8ce2
Former-commit-id: cf35d99036
2012-06-20 18:07:17 -05:00
Bryan Kowal
872a3a5f60
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
...
Former-commit-id: 11a1c4f35f
[formerly 973ceff9a7
] [formerly f79134499e
[formerly 0932e1173258d916a6a1caae5c943903d830c2af]]
Former-commit-id: f79134499e
Former-commit-id: 1acbc16759
2012-06-20 11:22:58 -05:00
Nate Jensen
6b9344db87
Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
...
Former-commit-id: bc63d08489
[formerly f74233956e
] [formerly a8af268ca1
[formerly dd1f52c8e5d36cccab98821018cb77f544529933]]
Former-commit-id: a8af268ca1
Former-commit-id: 7376a1d4ff
2012-06-19 16:47:34 -05:00
Bryan Kowal
76afa5d4b6
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: a1ba6c10be
[formerly e32406ca8a
] [formerly a4c6095b76
[formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]
Former-commit-id: a4c6095b76
Former-commit-id: 3b2d570834
2012-06-19 13:17:17 -05:00
Bryan Kowal
5db24885ba
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
...
Former-commit-id: cb16805e7e
[formerly 95a5887b06
] [formerly 25e20ad89c
[formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 25e20ad89c
Former-commit-id: fd8be91fed
2012-06-19 13:15:53 -05:00
Max Schenkelberg
15c59d6621
Issue #440 made PathManager not request data if there are no contexts to request for
...
Former-commit-id: 1e8e9db9eb
[formerly e856cfedf4
] [formerly db57eeee16
[formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]
Former-commit-id: db57eeee16
Former-commit-id: 1f10cddfa2
2012-06-19 13:00:44 -05:00
Nate Jensen
d7841cef54
Issue #765 fix so data can be retrieved with or without hdfFileId
...
Former-commit-id: 619b70f7fc
[formerly ae384ddf24
] [formerly bb1ea105d2
[formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]
Former-commit-id: bb1ea105d2
Former-commit-id: 244ca1b88b
2012-06-18 17:20:48 -05:00
Bryan Kowal
21e8618852
Merge branch '11-Collaboration' into development
...
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9361f3eb94
[formerly f528e10391
] [formerly f0e3b957e3
[formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
6e66b88dd5
Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api.
...
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23
Former-commit-id: e629fcb15b
[formerly f63d2bc7c2
] [formerly dd353747d0
[formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]
Former-commit-id: dd353747d0
Former-commit-id: af82c0a52a
2012-06-14 16:30:34 -05:00
Bryan Kowal
4a631c01ee
Issue #708 - support deploying from a separate work assignment repository - initial implementation.
...
Former-commit-id: 24627d52f2
[formerly 1c8b752063
] [formerly 14c912f215
[formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]
Former-commit-id: 14c912f215
Former-commit-id: c1b57d1de1
2012-06-14 12:43:34 -05:00
Bryan Kowal
a9c2cf4fae
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
...
Former-commit-id: 5e80c45a03
[formerly dcc5675564
] [formerly c0aaac4a07
[formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]
Former-commit-id: c0aaac4a07
Former-commit-id: c608fc959c
2012-06-14 11:35:15 -05:00
Ron Anderson
89b8a935c4
Removed activetable plugin dependencies on gfe
...
Former-commit-id: 6720a0aa77
[formerly be525f1c49
] [formerly a8d2c6b961
[formerly 1b923c335dd69dfa5a95972f1aa749cf5497bcee]]
Former-commit-id: a8d2c6b961
Former-commit-id: c241585248
2012-06-14 10:09:22 -05:00
Max Schenkelberg
f0d2893e97
Issue #697 added support for multiple editors
...
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 51c2a41e68
[formerly dd99479eeb
] [formerly fceef3c5a1
[formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]
Former-commit-id: fceef3c5a1
Former-commit-id: e5e1a4de6a
2012-06-13 17:52:11 -05:00
Steve Harris
d7a4853091
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: af6c0529ad
[formerly 2f20a86a30
] [formerly 48860df690
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
b69fa75919
12.6.1-5 baseline
...
Former-commit-id: 09f73b0601
[formerly c99afab05f
] [formerly 8947efbc7f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
32c0464d79
12.6.1-3 baseline
...
Former-commit-id: 7c5306b795
[formerly 42f3513175
] [formerly d57eb02b9e
[formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: d57eb02b9e
Former-commit-id: 1fdc0aa237
2012-06-11 16:23:47 -05:00
Steve Harris
31d7649939
12.5.1-15 baseline
...
Former-commit-id: 0ca936807e
[formerly d5c238de07
] [formerly cee20d8656
[formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]
Former-commit-id: cee20d8656
Former-commit-id: 7da9afe36a
2012-06-11 16:02:30 -05:00
Steve Harris
23c34c469a
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: c7024992a3
[formerly 37793c86b1
] [formerly d325d496f5
[formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: d325d496f5
Former-commit-id: cf3c768213
2012-06-11 15:24:03 -05:00
Steve Harris
97c4db937e
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Max Schenkelberg
86f03dfdc3
Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
...
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822
Former-commit-id: 1d9ccb6bd3
[formerly fde1e68df6
] [formerly 052cc81223
[formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]
Former-commit-id: 052cc81223
Former-commit-id: d4dcc0e12e
2012-05-31 16:05:25 -05:00
David Gillingham
f1343b9a6e
Issue #647 : Ensure insert time is updated when processing backdated
...
redbook data, address peer review comment.
Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e
Former-commit-id: ff34c58b1b
[formerly 09dcd35e4a
] [formerly db75f1860b
[formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]
Former-commit-id: db75f1860b
Former-commit-id: 6efe780ad6
2012-05-24 14:54:17 -05:00
David Gillingham
031558955d
Issue #647 : Ensure records with the same data URI get archived only
...
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.
Former-commit-id: 855745db06
[formerly 95e1582a22
] [formerly 34303477ac
[formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]
Former-commit-id: 34303477ac
Former-commit-id: 9dabcca4f8
2012-05-23 15:49:49 -05:00
Steve Harris
d23b0e4d60
12.5.1-9 baseline
...
Former-commit-id: b8de76b45e
[formerly 8f3c9ebfb7
] [formerly 1f542697cb
[formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 1f542697cb
Former-commit-id: ce0422a34a
2012-05-21 17:48:55 -05:00
David Gillingham
f58f89dce7
Issue #649 : Make compression of archived Java objects optional.
...
Former-commit-id: 513d0e6280
[formerly 05a58dadf1
] [formerly 28bdf26f2e
[formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]]
Former-commit-id: 28bdf26f2e
Former-commit-id: f5fe7e6be7
2012-05-21 16:48:02 -05:00
David Gillingham
f3ac7a8090
Issue #646 : Fix NullPointerException when decoding Level3 radar products
...
introduced by previous change.
Change-Id: I3689e003e367be2b69033f13f1744c381d597616
Former-commit-id: 32799c46d2
[formerly 94a4cbd107
] [formerly 7c84c67c67
[formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]
Former-commit-id: 7c84c67c67
Former-commit-id: 8d877d7784
2012-05-21 13:10:10 -05:00
David Gillingham
e779d44a4e
Issue #646 : Ensure radar obs use TimeTools to set reftime.
...
Former-commit-id: f12f83c80b
[formerly 4f9061fcea
] [formerly 091e0325ea
[formerly c6c83792c753be9c248e951462830983d5a3ee2e]]
Former-commit-id: 091e0325ea
Former-commit-id: ea06b163b9
2012-05-18 16:31:16 -05:00
David Gillingham
aae96ea26c
Issue #643 : Fix regression to ProfilerObs.setPointDataView() from issue
...
538.
Former-commit-id: 9106c31a45
[formerly 3b1ab25b17
] [formerly 49fe4c42a6
[formerly 353ea05b777d0a239101132abf4c869b75243b6e]]
Former-commit-id: 49fe4c42a6
Former-commit-id: 2a3b400c3c
2012-05-18 10:49:01 -05:00
Max Schenkelberg
6723e813e6
Issue #639 Cleaned up chat logging a bit
...
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32
Former-commit-id: fdcc024dd7
[formerly d9c1499311
] [formerly dce9ee1905
[formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]]
Former-commit-id: dce9ee1905
Former-commit-id: f6e74cc027
2012-05-17 13:58:33 -05:00
Brad Gonzales
aa71750482
Issue #639 added collaboration chat logging to localization.
...
Former-commit-id: 954324a221
[formerly 5935fd7091
] [formerly 892b6d83e5
[formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]]
Former-commit-id: 892b6d83e5
Former-commit-id: 06ebcfb533
2012-05-17 12:13:30 -05:00
Steve Harris
4792884ab2
12.5.1-6 baseline
...
Former-commit-id: df80148db6
[formerly 24474489f9
] [formerly fa87dc6cf1
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
2012-05-16 16:41:22 -05:00
Max Schenkelberg
25b9975bc3
Issue #239 Added IShadedShape capability to remote target
...
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad
Former-commit-id: 193bc7e249
[formerly 1ca2a9ce13
] [formerly 0e5fd5cd15
[formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: b764f03353
2012-05-16 15:01:41 -05:00
Ron Anderson
72ee9f490d
Issue #502 Fix staticTopo notifications
...
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1
Former-commit-id: 5461b92346
[formerly 902bde0f2d
] [formerly cd0fd140ad
[formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]]
Former-commit-id: cd0fd140ad
Former-commit-id: 3018275239
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
953f50718c
Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
...
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9
Former-commit-id: 272323baa6
[formerly bd0e56daaf
] [formerly 16f7fbe9cb
[formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]]
Former-commit-id: 16f7fbe9cb
Former-commit-id: acf8c7290f
2012-05-11 10:06:18 -05:00
Richard Peter
fe6dc2652c
Issue #502 : Update grib/gfe thread/memory usage for grib notification route
...
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: 7b14c9499a
[formerly e431671ff2
] [formerly 150d16b24e
[formerly a4450314db26948d531ecf80ec1455895cdb81ac]]
Former-commit-id: 150d16b24e
Former-commit-id: 33c7d4cb87
2012-05-11 10:06:04 -05:00
Max Schenkelberg
2db836b296
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 06ee0bbf6f
[formerly 78e1bd2c62
] [formerly 1f5abc6e20
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 3ca8ca6f01
2012-05-09 15:02:30 -05:00
Steve Harris
53d2822329
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: d7f7c26582
[formerly 092efd6072
] [formerly 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
9c9e01dbda
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476
[formerly 27bc369818
] [formerly 58037cb5d1
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
2012-05-09 13:14:00 -05:00
Steve Harris
f6300cd995
12.5.1-2 baseline
...
Former-commit-id: ac708c050d
[formerly 84d191e7b6
] [formerly b36c69cc67
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
7c7fc97131
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: 4ec294b525
[formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
2012-05-01 18:31:09 -05:00
Steve Harris
33a67cdd82
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Dave Hladky
a1a3a361dd
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 42a12fa7a5
[formerly 1b7473572f
] [formerly 5b7ecea866
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
2012-04-30 13:43:34 -05:00
David Gillingham
8c4eda7ae7
Merge "Issue #562 : Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge
...
Former-commit-id: 0ff2041959
[formerly 4aadd41fde
] [formerly 9878793618
[formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]
Former-commit-id: 9878793618
Former-commit-id: a1a62aa8f1
2012-04-27 13:26:37 -05:00
David Gillingham
1107eac65d
Issue #562 : Rename QPFRecord getters and setters to match Java-naming
...
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: 6497272c1d
[formerly c28bfaddee
] [formerly 292374ce21
[formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]
Former-commit-id: 292374ce21
Former-commit-id: 6f40ba77f1
2012-04-27 12:43:04 -05:00
Richard Peter
ae35c2f27c
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: c33a392a8c
[formerly 349adaeedd
] [formerly b11df888d3
[formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: b11df888d3
Former-commit-id: e3323febc5
2012-04-27 12:08:29 -05:00