Max Schenkelberg
|
ad32bbd91d
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: cd88054e2b [formerly 94fa6f0e30 ] [formerly 63421a4819 ] [formerly cd88054e2b [formerly 94fa6f0e30 ] [formerly 63421a4819 ] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51 ] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e ]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f ]
Former-commit-id: 5ba50b4476
|
2013-07-15 14:26:15 -05:00 |
|
Ben Steffensmeier
|
2b26557020
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7c91a83521 [formerly dab2af2df5 ] [formerly 4209e014d8 ] [formerly 7c91a83521 [formerly dab2af2df5 ] [formerly 4209e014d8 ] [formerly 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]]
Former-commit-id: 79015595ee
Former-commit-id: 4f488940de [formerly 9cf071338e ] [formerly d2f613e06b0e271020b7c52b497bdf43641096be [formerly 1c51f0b5f2 ]]
Former-commit-id: 6ad58b90d9f06f52b93c2fbae3d6c2833346af16 [formerly 7e721fb860 ]
Former-commit-id: d9da19b7d2
|
2013-05-08 18:39:25 -05:00 |
|
Brad Gonzales
|
9ac62c4895
|
Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
added sequence delta script.
Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1
Former-commit-id: c7318522e1 [formerly 005c935be6 ] [formerly dc37712fda ] [formerly c7318522e1 [formerly 005c935be6 ] [formerly dc37712fda ] [formerly b75ef08190 [formerly dc37712fda [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]]
Former-commit-id: b75ef08190
Former-commit-id: 2c2f7f7edf [formerly a21b495206 ] [formerly a9e91f46554d9caefb1866f0820680559c325801 [formerly 16f030294d ]]
Former-commit-id: 2d564f9f951487593ec967d020cee8f30658ea64 [formerly 00c0f59b6b ]
Former-commit-id: 4a086703ea
|
2013-04-16 14:44:06 -05:00 |
|
Steve Harris
|
23ba5b6690
|
Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.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.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
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
Former-commit-id: 58848dbf11 [formerly 0d86b95f1b ] [formerly 55d9909d6d ] [formerly 58848dbf11 [formerly 0d86b95f1b ] [formerly 55d9909d6d ] [formerly 0fed14d765 [formerly 55d9909d6d [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]]
Former-commit-id: 0fed14d765
Former-commit-id: 6f691692bb [formerly 55dda49d47 ] [formerly 9971801ff7675d72352d78bac25edb59dd4b1b9c [formerly fe6a078c64 ]]
Former-commit-id: 55c3e4f9cc9b0427394c00bf35baeeaf592f669f [formerly a9d3e94b3b ]
Former-commit-id: 98fd30b0d5
|
2013-04-11 13:14:00 -05:00 |
|
Steve Harris
|
b6db7821fa
|
13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9 ] [formerly 9be238bcc4 ] [formerly 196767d525 [formerly dc9fef33a9 ] [formerly 9be238bcc4 ] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f ] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23 ]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536 ]
Former-commit-id: 7b7efd0bd1
|
2013-04-09 08:37:12 -05:00 |
|
Bryan Kowal
|
155c0efbef
|
Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch
Former-commit-id: 885dd56459 [formerly e92e2712da ] [formerly 4cc9a742c8 ] [formerly 885dd56459 [formerly e92e2712da ] [formerly 4cc9a742c8 ] [formerly c08190a586 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]]]
Former-commit-id: c08190a586
Former-commit-id: ea86a8ba59 [formerly eea02ee972 ] [formerly 0bd4d2c02ecc3f80e814b1c7593bcf9ddb429c21 [formerly 55f234c2d1 ]]
Former-commit-id: c0b00876a3491930673c6dd9710f08611caea242 [formerly 7bfabf4a4e ]
Former-commit-id: 4f8d471c5e
|
2013-04-08 14:04:05 -05:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515 ] [formerly c0c1d56f3a ] [formerly e8f4a2f031 [formerly 51208e5515 ] [formerly c0c1d56f3a ] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c ] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553 ]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858 ]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
94cd5a1388
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d ] [formerly e4bd20a515 ] [formerly 8278cac143 [formerly c2839cc86d ] [formerly e4bd20a515 ] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928 ] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63 ]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de ]
Former-commit-id: af59663a99
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
92be4d5105
|
12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca ] [formerly 03f3f3c36a ] [formerly bb8fe6e556 [formerly 362d6ffaca ] [formerly 03f3f3c36a ] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]]
Former-commit-id: a0eaf651ff
Former-commit-id: dfdf01de85 [formerly 85ad066b70 ] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba ]]
Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c ]
Former-commit-id: 13cdd55545
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
987397b2db
|
12.10.1-4 baseline
Former-commit-id: ddc923e3e0 [formerly 9cd1f3ec0f ] [formerly 791ef6cedf ] [formerly ddc923e3e0 [formerly 9cd1f3ec0f ] [formerly 791ef6cedf ] [formerly 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 27d8601fe0 [formerly f641cdd4e0 ] [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a [formerly b4d2a0e8dd ]]
Former-commit-id: 5159825bf9b81d8d0188fb4bcfd469ccb27fd393 [formerly 451459d8cb ]
Former-commit-id: f61c5114e8
|
2012-09-13 12:33:36 -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 |
|
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
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e ] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f ]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c ]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
3419f72215
|
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: fe946166ed [formerly 4ec294b525 ] [formerly 2ed7249613 ] [formerly fe946166ed [formerly 4ec294b525 ] [formerly 2ed7249613 ] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131 ] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809 ]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35 ]
Former-commit-id: 491aa53a0c
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d ] [formerly 9f8cb727a5 ] [formerly 7fa9dbd5fb [formerly 4bfbdad17d ] [formerly 9f8cb727a5 ] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82 ] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5 ]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86 ]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
0cf19dc505
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
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
Former-commit-id: 634d40a156 [formerly 63f11892e8 ] [formerly 4d7572a632 ] [formerly 634d40a156 [formerly 63f11892e8 ] [formerly 4d7572a632 ] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be ] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d ]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d ]
Former-commit-id: 9b8c6e395d
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae ] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd ]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c ]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
095b190063
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
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
Former-commit-id: b4846ce8a8 [formerly a4e4792bb5 ] [formerly d3ad6095b7 ] [formerly b4846ce8a8 [formerly a4e4792bb5 ] [formerly d3ad6095b7 ] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: c6071e24c5 [formerly 9845ef53f9 ] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6 ]]
Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4 ]
Former-commit-id: 1556e72eeb
|
2012-03-30 09:50:48 -05:00 |
|
Max Schenkelberg
|
67b1edb767
|
Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements
Former-commit-id: fe1811c167 [formerly e2cd95d3f4 ] [formerly ae47d9683e ] [formerly fe1811c167 [formerly e2cd95d3f4 ] [formerly ae47d9683e ] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8 [formerly 0554abdde0 ] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb ]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76 ]
Former-commit-id: ae389f0b57
|
2012-03-01 16:59:40 -06:00 |
|
Ben Steffensmeier
|
0eaf261186
|
Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4
Former-commit-id: 5957b76dd1 [formerly 4179defc4f ] [formerly f016be988e ] [formerly 5957b76dd1 [formerly 4179defc4f ] [formerly f016be988e ] [formerly 73f6e9e322 [formerly f016be988e [formerly 500f3f03f5260cff3417021776204ccf6c035415]]]]
Former-commit-id: 73f6e9e322
Former-commit-id: b0442fc51e [formerly cb2addec0c ] [formerly f32d9732e6d10fada260c6773e029c2f625b2454 [formerly 7bcbf3e3bc ]]
Former-commit-id: 8347c5c5399559bd7aaac0f550964352dbc5568d [formerly 3e5612ffac ]
Former-commit-id: a8fa98ff99
|
2012-02-03 17:33:32 -06:00 |
|
Ben Steffensmeier
|
e2c62ab096
|
Issue #183 change grib data catalog to use bulk requests to retrieve all coverages at once.
Change-Id: I99f3dfc7900b57b074062155a4e7a65851f70170
Former-commit-id: e76323dc97 [formerly d90356d266 ] [formerly 113722a596 ] [formerly e76323dc97 [formerly d90356d266 ] [formerly 113722a596 ] [formerly dfd869c1c1 [formerly 113722a596 [formerly 3cdfc8f73cce96c00b7ac37a1e34e9d051b628b6]]]]
Former-commit-id: dfd869c1c1
Former-commit-id: 573108f2c5 [formerly f2ff133117 ] [formerly 09449968f9cc4d3fac177bbbf9f58f412fe658c0 [formerly f082727112 ]]
Former-commit-id: 9649bd78778fa82525127c827ee65f451beab1a7 [formerly 7335f90bfb ]
Former-commit-id: 0d9cbcd09e
|
2012-01-27 14:48:40 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf ] [formerly 21d2361f00 [formerly 1faae42484 ]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59 ] [formerly 377dcd10b9 [formerly 3360eb6c5f ]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|